d48191929d
* .gitignore, sources: Update to v0.14.0
* bpkg-openssl-3-pkeyutl.patch, libbutl-openssl-info-overloads.patch: add patches for OpenSSL v3.0 support [1]
* build2-disable-test-cc-modules-ppc64le.patch: add patch to disable failing C++ modules tests on PPC64LE
* build2.spec:
- Update to v0.14.0
- Re-enable bootstrap required for this releas
- Update comments on libbutl license
- Use config.install.etc for specifying system configuration file directory
- Use config.install.scope to prevent installing statically built, bundled libodb [2,3]
* libbuild2-config.install.scope-no-update-for-install.patch: add patch to make config.install.scope not apply during update-for-install pre-operation [3]
* macros.build2:
- Use config.install.legal for specifying system configuration file directory
[1] https://lists.build2.org/archives/users/2021-November/000923.html
[2] https://lists.build2.org/archives/announce/2021/000021.html
[3] https://lists.build2.org/archives/users/2021-November/000919.html
117 lines
3.1 KiB
Diff
117 lines
3.1 KiB
Diff
diff --git a/tests/cc/modules/modules.testscript b/tests/cc/modules/modules.testscript
|
|
index 681238a..054ecd9 100644
|
|
--- a/tests/cc/modules/modules.testscript
|
|
+++ b/tests/cc/modules/modules.testscript
|
|
@@ -190,16 +190,16 @@ $* test &*.d &?*.ii* <'exe{test}: cxx{driver} mxx{core}' 2>>EOE != 0
|
|
info: consider specifying module name with cxx.module_name
|
|
EOE
|
|
|
|
-: library
|
|
-:
|
|
-: Test importing a module from a library.
|
|
-:
|
|
-ln -s ../core.mxx ../core.cxx ../driver.cxx ./;
|
|
-$* test clean <<EOI
|
|
- ./: lib{foo} exe{test} # Full build.
|
|
- exe{test}: cxx{driver} lib{foo}
|
|
- lib{foo}: {mxx cxx}{core}
|
|
- EOI
|
|
+# : library
|
|
+# :
|
|
+# : Test importing a module from a library.
|
|
+# :
|
|
+# ln -s ../core.mxx ../core.cxx ../driver.cxx ./;
|
|
+# $* test clean <<EOI
|
|
+# ./: lib{foo} exe{test} # Full build.
|
|
+# exe{test}: cxx{driver} lib{foo}
|
|
+# lib{foo}: {mxx cxx}{core}
|
|
+# EOI
|
|
|
|
: module-marker
|
|
:
|
|
@@ -286,17 +286,17 @@ $* test clean <<EOI
|
|
EOI
|
|
$* test clean <'exe{test}: cxx{driver core} mxx{core base extra foo}'
|
|
|
|
- : library
|
|
- :
|
|
- ln -s ../base.mxx ../extra.mxx ../foo.mxx ../../core.mxx ../../core.cxx ./;
|
|
- cat <<EOI >=driver.cxx;
|
|
- import foo;
|
|
- int main (int argc, char*[]) {return f (g (argc));}
|
|
- EOI
|
|
- $* test clean <<EOI
|
|
- exe{test}: cxx{driver} mxx{foo} lib{foo}
|
|
- lib{foo}: mxx{core base extra} cxx{core}
|
|
- EOI
|
|
+ # : library
|
|
+ # :
|
|
+ # ln -s ../base.mxx ../extra.mxx ../foo.mxx ../../core.mxx ../../core.cxx ./;
|
|
+ # cat <<EOI >=driver.cxx;
|
|
+ # import foo;
|
|
+ # int main (int argc, char*[]) {return f (g (argc));}
|
|
+ # EOI
|
|
+ # $* test clean <<EOI
|
|
+ # exe{test}: cxx{driver} mxx{foo} lib{foo}
|
|
+ # lib{foo}: mxx{core base extra} cxx{core}
|
|
+ # EOI
|
|
}
|
|
|
|
: import
|
|
@@ -364,29 +364,29 @@ $* test clean <<EOI
|
|
bmie{foo-core}: mxx{foo-core}
|
|
EOI
|
|
|
|
-: symexport
|
|
-:
|
|
-: Test the __symexport feature.
|
|
-:
|
|
-cat <<EOI >=core.mxx;
|
|
- export module foo.core;
|
|
-
|
|
- export __symexport int f (int);
|
|
-
|
|
- __symexport int g_impl (int i) {return i - 1;}
|
|
- export __symexport inline int g (int i) {return g_impl (i);}
|
|
- EOI
|
|
-ln -s ../core.cxx core-f.cxx;
|
|
-cat <<EOI >=core-g.cxx;
|
|
- module foo.core;
|
|
- int g_impl (int i) {return i - 1;}
|
|
- EOI
|
|
-cat <<EOI >=driver.cxx;
|
|
- import foo.core;
|
|
- int main (int argc, char*[]) {return f (argc) + g (argc);}
|
|
- EOI
|
|
-$* test clean <<EOI
|
|
- ./: lib{foo} exe{test} # Full build.
|
|
- exe{test}: cxx{driver} lib{foo}
|
|
- lib{foo}: mxx{core} cxx{core-f} # @@ VC: core-g
|
|
- EOI
|
|
+# : symexport
|
|
+# :
|
|
+# : Test the __symexport feature.
|
|
+# :
|
|
+# cat <<EOI >=core.mxx;
|
|
+# export module foo.core;
|
|
+
|
|
+# export __symexport int f (int);
|
|
+
|
|
+# __symexport int g_impl (int i) {return i - 1;}
|
|
+# export __symexport inline int g (int i) {return g_impl (i);}
|
|
+# EOI
|
|
+# ln -s ../core.cxx core-f.cxx;
|
|
+# cat <<EOI >=core-g.cxx;
|
|
+# module foo.core;
|
|
+# int g_impl (int i) {return i - 1;}
|
|
+# EOI
|
|
+# cat <<EOI >=driver.cxx;
|
|
+# import foo.core;
|
|
+# int main (int argc, char*[]) {return f (argc) + g (argc);}
|
|
+# EOI
|
|
+# $* test clean <<EOI
|
|
+# ./: lib{foo} exe{test} # Full build.
|
|
+# exe{test}: cxx{driver} lib{foo}
|
|
+# lib{foo}: mxx{core} cxx{core-f} # @@ VC: core-g
|
|
+# EOI
|