Changes in Makefile

f5e04876 - MFC r345203,r345205,r345353,r345645,r345708,r345709,r345735,r345770,r346081,r346270,r346574,r346576:

Thu, 23 May 2019 01:09:10 +0000

MFC r345203,r345205,r345353,r345645,r345708,r345709,r345735,r345770,r346081,r346270,r346574,r346576:r345203:Initial googlemock/googletest integration into the build/FreeBSD test suiteThis initial integration takes googlemock/googletest release 1.8.1, integratesthe library, tests, and sample unit tests into the build.googlemock/googletest's inclusion is optionally available via `MK_GOOGLETEST`.`MK_GOOGLETEST` is dependent on `MK_TESTS` and is enabled by default whenbuilt with a C++11 capable toolchain.Google tests can be specified via the `GTESTS` variable, which, in comparisonwith the other test drivers, is more simplified/streamlined, as Googletest onlysupports C++ tests; not raw C or shell tests (C tests can be written in C++using the standard embedding methods).No dependent libraries are assumed for the tests. One must specify `gmock`,`gmock_main`, `gtest`, or `gtest_main`, via `LIBADD` for the program.More information about googlemock and googletest can be found on theGoogletest [project page](https://github.com/google/googletest), and the[GoogleMock](https://github.com/google/googletest/blob/v1.8.x/googlemock/docs/Documentation.md)and[GoogleTest](https://github.com/google/googletest/tree/v1.8.x/googletest/docs)docs.These tests are originally integrated into the build as plain driver tests, butwill be natively integrated into Kyua in a later version.Known issues/Errata:* [WhenDynamicCastToTest.AmbiguousCast fails on FreeBSD](https://github.com/google/googletest/issues/2172)r345205:Integrate cddl/usr.sbin/zfds/tests into the FreeBSD test suiteThis change integrates the unit tests for zfsd into the test suite using theintegration method described in r345203.This change removes the `LOCALBASE` includes added for the port version ofgooglemock/googletest, as well as unnecessary `LIBADD`/`DPADD` and `CXXFLAGS`defines, which are included in the `GTEST_CXXFLAGS` variable, as part ofr345203.r345353 (by asomers):googletest: backport GTEST_SKIP to googletest 1.8.1This commit backports revisions 00938b2b228f3b70d3d9e51f29a1505bdad43f1e and59f90a338bce2376b540ee239cf4e269bf6d68ad from googletest's master branch toour included version of googletest, which is based on 1.8.1. It adds theGTEST_SKIP feature, which is very useful for a project like FreeBSD wheresome tests depend on particular system configurations.Obtained from: github.com/google/googletestr345645:Spam CXXFLAGS with `-I${DESTDIR}/usr/include/private`, instead of GTEST_CXXFLAGSThis makes it easier for googletest users to leverage googletest, instead offorcing them to plug GTEST_CXXFLAGS into CXXFLAGS manually (resulting inunnecessary duplication).I will be following this up with a more proper fix in src.libnames.mk, assrc.libnames.mk should be automatically adding this directory toCFLAGS/CXXFLAGS when private libraries are referenced. Not doing so can resultin mismatches between base-provided private library's and ports-providedlibrary's headers.While here, tweak the comment to clarify what the intent is behind spammingCXXFLAGS.r345708:Standardize `-std=c++* as `CXXSTD`CXXSTD was added as the C++ analogue to CSTD.CXXSTD defaults to `-std=c++11` with supporting compilers; `-std=gnu++98`,otherwise for older versions of g++.This change standardizes the CXXSTD variable, originally added togoogletest.test.inc.mk as part of r345203.As part of this effort, convert all `CXXFLAGS+= -std=*` calls to use `CXXSTD`.Notes:This value is not sanity checked in bsd.sys.mk, however, given the twomost used C++ compilers on FreeBSD (clang++ and g++) support both modes, it islikely to work with both toolchains. This method will be refined in the futureto support more variants of C++, as not all versions of clang++ and g++ (forinstance) support C++14, C++17, etc.Any manual appending of `-std=*` to `CXXFLAGS` should be replaced with CXXSTD.Example:Before this commit:```CXXFLAGS+= -std=c++14```After this commit:```CXXSTD= c++14```Relnotes: yesTested with: make tinderboxr345709:Allow users to override CSTD/CXXSTD on a per-prog basisThe current logic for CSTD/CXXSTD requires homogenity as far as thesupported C/C++ standards, which is a sensible default. However, whendealing with differing versions of C++, some code may compile with C++11, butnot C++17 (for instance). So in order to avoid having people convert over theircode to the new standard, give the users the ability to specify the standard ona per-program basis.This will allow a user to override the supporting standard for a set ofprograms, mixing C++11 with C++14 (for instance).Apprved by: emaste (mentor)r345735:Allow programs to set `NO_SHARED` on a per-PROG basisThis is particularly useful when installing programs for tests that need to belinked statically, e.g., mini-me from capsicum-test, which is linked staticallyto avoid the dynamic library lookup in the upstream project.r345770:Import proof-of-concept for handling `GTEST_SKIP()` in `Environment::SetUp`Per the upstream pull-request [1]:``` gtest prior to this change would completely ignore `GTEST_SKIP()` if called in `Environment::SetUp()`, instead of bailing out early, unlike `Test::SetUp()`, which would cause the tests themselves to be skipped. The only way (prior to this change) to skip the tests would be to trigger a fatal error via `GTEST_FAIL()`. Desirable behavior, in this case, when dealing with `Environment::SetUp()` is to check for prerequisites on a system (example, kernel supports a particular featureset, e.g., capsicum), and skip the tests. The alternatives prior to this change would be undesirable: - Failing sends the wrong message to the test user, as the result of the tests is indeterminate, not failed. - Having to add per-test class abstractions that override `SetUp()` to test for the capsicum feature set, then skip all of the tests in their respective SetUp fixtures, would be a lot of human and computational work; checking for the feature would need to be done for all of the tests, instead of once for all of the tests. For those reasons, making `Environment::SetUp()` handle `GTEST_SKIP()`, by not executing the testcases, is the most desirable solution. In order to properly diagnose what happened when running the tests if they are skipped, print out the diagnostics in an ad hoc manner. Update the documentation to note this change and integrate a new test, gtest_skip_in_environment_setup_test, into the test suite. This change addresses #2189. Signed-off-by: Enji Cooper ```The goal with my merging in this change is to avoid requiring extensiverefactoring/retesting of test suites when ensuring prerequisites are met,e.g., checking for a CAPABILITIES-enabled kernel before running capsicum-test(see D19758 for more details).The proof-of-concept is being imported before accepted by the upstreamproject due to the fact that the upstream project is undergoing a potentialdevelopment freeze and the maintainers aren't responding to my PR.1. https://github.com/google/googletest/pull/2203r346081 (by trasz):Make zfsd(8) build obey CFLAGS.Obtained from: CheriBSDr346270 (by trasz):Drop -g from CFLAGS for zfsd(8). No idea why it was ever there.r346574:Rework CXXSTD setting via r345708This change allows the user to once again override the C++ standard, restoringhigh-level pre-r345708 behavior.This also unbreaks building lib/ofed/libibnetdisc/Makefile with a non-C++11capable compiler, e.g., g++ 4.2.1, as the library supported being built witholder C++ standards.r346576:Fix up CXXSTD support originally added in r345708r345708 worked for the base system, but unfortunately, caused a lot ofdisruption for third-party packages that relied on C++, since bsd.sys.mk isused by applications outside the base system. The defaults picked didn't matchthe compiler's defaults and broke some builds that didn't specify a standard,as well as some that overrode the value by setting `-std=gnu++14` (forexample) manually.This change takes a more relaxed approach to appending `-std=${CXXSTD}` toCXXFLAGS, by only doing so when the value is specified, as opposed tooverriding the standard set by an end-user. This avoids the need for havingto bake NOP default into bsd.sys.mk for supported compiler-toolchainversions.In order to make this change possible, add CXXSTD to Makefile snippets whichrelied on the default value (c++11) added in r345708. List of files: /freebsd-12.1/lib/libomp/Makefile

df407fbc - Revert r348136

Thu, 23 May 2019 00:59:05 +0000

Revert r348136I accidentally committed some unrelated local changes to`.../tests/sys/opencrypto` along with this MFC set. List of files: /freebsd-12.1/lib/libomp/Makefile

e787ffab - MFC r345203,r345205,r345353,r345645,r345708,r345709,r345735,r345770,r346574,r346576:

Thu, 23 May 2019 00:55:28 +0000

MFC r345203,r345205,r345353,r345645,r345708,r345709,r345735,r345770,r346574,r346576:r345203:Initial googlemock/googletest integration into the build/FreeBSD test suiteThis initial integration takes googlemock/googletest release 1.8.1, integratesthe library, tests, and sample unit tests into the build.googlemock/googletest's inclusion is optionally available via `MK_GOOGLETEST`.`MK_GOOGLETEST` is dependent on `MK_TESTS` and is enabled by default whenbuilt with a C++11 capable toolchain.Google tests can be specified via the `GTESTS` variable, which, in comparisonwith the other test drivers, is more simplified/streamlined, as Googletest onlysupports C++ tests; not raw C or shell tests (C tests can be written in C++using the standard embedding methods).No dependent libraries are assumed for the tests. One must specify `gmock`,`gmock_main`, `gtest`, or `gtest_main`, via `LIBADD` for the program.More information about googlemock and googletest can be found on theGoogletest [project page](https://github.com/google/googletest), and the[GoogleMock](https://github.com/google/googletest/blob/v1.8.x/googlemock/docs/Documentation.md)and[GoogleTest](https://github.com/google/googletest/tree/v1.8.x/googletest/docs)docs.These tests are originally integrated into the build as plain driver tests, butwill be natively integrated into Kyua in a later version.Known issues/Errata:* [WhenDynamicCastToTest.AmbiguousCast fails on FreeBSD](https://github.com/google/googletest/issues/2172)r345205:Integrate cddl/usr.sbin/zfds/tests into the FreeBSD test suiteThis change integrates the unit tests for zfsd into the test suite using theintegration method described in r345203.This change removes the `LOCALBASE` includes added for the port version ofgooglemock/googletest, as well as unnecessary `LIBADD`/`DPADD` and `CXXFLAGS`defines, which are included in the `GTEST_CXXFLAGS` variable, as part ofr345203.r345353 (by asomers):googletest: backport GTEST_SKIP to googletest 1.8.1This commit backports revisions 00938b2b228f3b70d3d9e51f29a1505bdad43f1e and59f90a338bce2376b540ee239cf4e269bf6d68ad from googletest's master branch toour included version of googletest, which is based on 1.8.1. It adds theGTEST_SKIP feature, which is very useful for a project like FreeBSD wheresome tests depend on particular system configurations.Obtained from: github.com/google/googletestr345645:Spam CXXFLAGS with `-I${DESTDIR}/usr/include/private`, instead of GTEST_CXXFLAGSThis makes it easier for googletest users to leverage googletest, instead offorcing them to plug GTEST_CXXFLAGS into CXXFLAGS manually (resulting inunnecessary duplication).I will be following this up with a more proper fix in src.libnames.mk, assrc.libnames.mk should be automatically adding this directory toCFLAGS/CXXFLAGS when private libraries are referenced. Not doing so can resultin mismatches between base-provided private library's and ports-providedlibrary's headers.While here, tweak the comment to clarify what the intent is behind spammingCXXFLAGS.r345708:Standardize `-std=c++* as `CXXSTD`CXXSTD was added as the C++ analogue to CSTD.CXXSTD defaults to `-std=c++11` with supporting compilers; `-std=gnu++98`,otherwise for older versions of g++.This change standardizes the CXXSTD variable, originally added togoogletest.test.inc.mk as part of r345203.As part of this effort, convert all `CXXFLAGS+= -std=*` calls to use `CXXSTD`.Notes:This value is not sanity checked in bsd.sys.mk, however, given the twomost used C++ compilers on FreeBSD (clang++ and g++) support both modes, it islikely to work with both toolchains. This method will be refined in the futureto support more variants of C++, as not all versions of clang++ and g++ (forinstance) support C++14, C++17, etc.Any manual appending of `-std=*` to `CXXFLAGS` should be replaced with CXXSTD.Example:Before this commit:```CXXFLAGS+= -std=c++14```After this commit:```CXXSTD= c++14```Relnotes: yesTested with: make tinderboxr345709:Allow users to override CSTD/CXXSTD on a per-prog basisThe current logic for CSTD/CXXSTD requires homogenity as far as thesupported C/C++ standards, which is a sensible default. However, whendealing with differing versions of C++, some code may compile with C++11, butnot C++17 (for instance). So in order to avoid having people convert over theircode to the new standard, give the users the ability to specify the standard ona per-program basis.This will allow a user to override the supporting standard for a set ofprograms, mixing C++11 with C++14 (for instance).Approved by: emaste (mentor)r345735:Allow programs to set `NO_SHARED` on a per-PROG basisThis is particularly useful when installing programs for tests that need to belinked statically, e.g., mini-me from capsicum-test, which is linked staticallyto avoid the dynamic library lookup in the upstream project.r345770:Import proof-of-concept for handling `GTEST_SKIP()` in `Environment::SetUp`Per the upstream pull-request [1]:``` gtest prior to this change would completely ignore `GTEST_SKIP()` if called in `Environment::SetUp()`, instead of bailing out early, unlike `Test::SetUp()`, which would cause the tests themselves to be skipped. The only way (prior to this change) to skip the tests would be to trigger a fatal error via `GTEST_FAIL()`. Desirable behavior, in this case, when dealing with `Environment::SetUp()` is to check for prerequisites on a system (example, kernel supports a particular featureset, e.g., capsicum), and skip the tests. The alternatives prior to this change would be undesirable: - Failing sends the wrong message to the test user, as the result of the tests is indeterminate, not failed. - Having to add per-test class abstractions that override `SetUp()` to test for the capsicum feature set, then skip all of the tests in their respective SetUp fixtures, would be a lot of human and computational work; checking for the feature would need to be done for all of the tests, instead of once for all of the tests. For those reasons, making `Environment::SetUp()` handle `GTEST_SKIP()`, by not executing the testcases, is the most desirable solution. In order to properly diagnose what happened when running the tests if they are skipped, print out the diagnostics in an ad hoc manner. Update the documentation to note this change and integrate a new test, gtest_skip_in_environment_setup_test, into the test suite. This change addresses #2189. Signed-off-by: Enji Cooper ```The goal with my merging in this change is to avoid requiring extensiverefactoring/retesting of test suites when ensuring prerequisites are met,e.g., checking for a CAPABILITIES-enabled kernel before running capsicum-test(see D19758 for more details).The proof-of-concept is being imported before accepted by the upstreamproject due to the fact that the upstream project is undergoing a potentialdevelopment freeze and the maintainers aren't responding to my PR.1. https://github.com/google/googletest/pull/2203r346574:Rework CXXSTD setting via r345708This change allows the user to once again override the C++ standard, restoringhigh-level pre-r345708 behavior.This also unbreaks building lib/ofed/libibnetdisc/Makefile with a non-C++11capable compiler, e.g., g++ 4.2.1, as the library supported being built witholder C++ standards.r346576:Fix up CXXSTD support originally added in r345708r345708 worked for the base system, but unfortunately, caused a lot ofdisruption for third-party packages that relied on C++, since bsd.sys.mk isused by applications outside the base system. The defaults picked didn't matchthe compiler's defaults and broke some builds that didn't specify a standard,as well as some that overrode the value by setting `-std=gnu++14` (forexample) manually.This change takes a more relaxed approach to appending `-std=${CXXSTD}` toCXXFLAGS, by only doing so when the value is specified, as opposed tooverriding the standard set by an end-user. This avoids the need for havingto bake NOP default into bsd.sys.mk for supported compiler-toolchainversions.In order to make this change possible, add CXXSTD to Makefile snippets whichrelied on the default value (c++11) added in r345708. List of files: /freebsd-12.1/lib/libomp/Makefile

0fc88f27 - MFC r347978:

Wed, 22 May 2019 17:42:22 +0000

MFC r347978:Fix OptionalObsoleteFiles copy/paste mistake from r345236, whichconnected libomp to the build. The comparison should not have beenagainst ${MK_OPENSSH}, but against ${MK_OPENMP}, obviously.MFC r347979:To avoid unnecessarily modifying ports, add a -lgomp symlink, since GCCdoes not ship a -lomp symlink. Also update OptionalObsoleteFiles forthis, and add 32-bit variants while here.Submitted by: jbeichPR: 237975 List of files: /freebsd-12.1/lib/libomp/Makefile

bdc0c74b - After r346168, also merge build infrastructure for LLVM libomp.

Wed, 17 Apr 2019 20:08:01 +0000

After r346168, also merge build infrastructure for LLVM libomp.MFC r345235:Add lib/libomp, with a Makefile, and generated configuration headers.Not connected to the main build yet, as there is still the issue of theGNU omp.h header conflicting with the LLVM one. (That is, if MK_GCC isenabled.)PR: 236062MFC r345236:Connect lib/libomp to the build.* Set MK_OPENMP to yes by default only on amd64, for now.* Bump __FreeBSD_version to signal this addition.* Ensure gcc's conflicting omp.h is not installed if MK_OPENMP is yes.* Update OptionalObsoleteFiles.inc to cope with the conflicting omp.h.* Regenerate src.conf(5) with new WITH/WITHOUT fragments.Relnotes: yesPR: 236062MFC r345242:Explicitly link libomp.so against -lpthread, as it depends on pthreadfunctionality. This should make example OpenMP programs work out of thebox.Reported by: jbeichPR: 236062, 236581MFC r345278:Also explicitly link libomp.so against -lm, as it transitively dependson scalbn and a few other math functions, via libcompiler-rt. Thisshould allow OpenMP programs to link with BFD linkers too.Reported by: jbeichPR: 236062, 236581MFC r345282:Remove --as-needed from the linker flags for libomp.so, as theseactually prevent the transitive dependency on libm.Reported by: jbeichPR: 236062, 236581MFC r345291:Turn on MK_OPENMP for i386 by default, now that it can build.Noticed by: jbeichPR: 236062, 236582 List of files: /freebsd-12.1/lib/libomp/Makefile