Date: Wed, 22 Oct 2014 03:39:12 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r273449 - in head: . lib share/mk Message-ID: <201410220339.s9M3dCKZ079733@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Wed Oct 22 03:39:11 2014 New Revision: 273449 URL: https://svnweb.freebsd.org/changeset/base/273449 Log: My previous commit exposed an issue as it fixed a different issue. lib/atf isn't a prereq_lib, since it isn't required for other libraries to build. Remove it. The old kludge of always building it had effectively been retired. Since we don't want to build the libraries with the tests when we're bootstrapping, invent MK_TESTS_SUPPORT which normally defaults to the current MK_TESTS value, except when explicitly defined. Make lib/atf depend on it being yes. When building the libraries set MK_TESTS to no, and MK_TESTS_SUPPORT to the current value of MK_TESTS so that later stages of the build work correctly. This should fix (and does for me) people's issues with parallel builds racing between lib/atf and libexec/atf. Since lib/atf is built during the libraries phase, the race disappears. Modified: head/Makefile.inc1 head/lib/Makefile head/share/mk/src.opts.mk Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Wed Oct 22 03:32:27 2014 (r273448) +++ head/Makefile.inc1 Wed Oct 22 03:39:11 2014 (r273449) @@ -574,7 +574,7 @@ _libraries: @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; \ ${WMAKE} -DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \ - MK_PROFILE=no MK_TESTS=no libraries + MK_PROFILE=no MK_TESTS=no MK_TESTS_SUPPORT=${MK_TESTS} libraries _depend: @echo @echo "--------------------------------------------------------------" @@ -1535,7 +1535,6 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ ${_kerberos5_lib_libwind} \ - ${_lib_atf} \ lib/libbz2 ${_libcom_err} lib/libcrypt \ lib/libelf lib/libexpat \ ${_lib_libgssapi} \ @@ -1561,10 +1560,6 @@ gnu/lib/libsupc++__L: gnu/lib/libstdc++_ lib/libgeom__L: lib/libexpat__L -.if ${MK_TESTS} != "no" -_lib_atf= lib/atf -.endif - .if ${MK_LIBTHR} != "no" _lib_libthr= lib/libthr .endif Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Wed Oct 22 03:32:27 2014 (r273448) +++ head/lib/Makefile Wed Oct 22 03:39:11 2014 (r273449) @@ -276,8 +276,10 @@ _libsmutil= libsmutil _libtelnet= libtelnet .endif -.if ${MK_TESTS} != "no" +.if ${MK_TESTS_SUPPORT} != "no" _atf= atf +.endif +.if ${MK_TESTS} != "no" _tests= tests .endif Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Wed Oct 22 03:32:27 2014 (r273448) +++ head/share/mk/src.opts.mk Wed Oct 22 03:39:11 2014 (r273449) @@ -330,6 +330,7 @@ MK_CLANG_FULL:= no KVM \ NETGRAPH \ PAM \ + TESTS \ WIRELESS .if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no" MK_${var}_SUPPORT:= no
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410220339.s9M3dCKZ079733>