Date: Thu, 17 Jun 2010 09:31:39 GMT From: Garrett Cooper <gcooper@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 179697 for review Message-ID: <201006170931.o5H9Vdbl078265@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@179697?ac=10 Change 179697 by gcooper@gcooper-bayonetta on 2010/06/17 09:31:37 Fix parallel compiles with high -j values in perforce workspace using jamming data provided by tools/make_libdeps.sh back into Makefile.inc; this doesn't fix lower level makes and build dependencies, but that's something else to research another day. Tested with -j24 using a memory backed /usr/obj without build failures (compared to before). Recommended-by: imp@. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/Makefile.inc1#8 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/Makefile.inc1#8 (text+ko) ==== @@ -1110,16 +1110,15 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ - lib/libbz2 lib/libcom_err lib/libcrypt \ - lib/libexpat \ - ${_lib_libgssapi} ${_lib_libipx} \ + lib/libarchive lib/libbz2 lib/libcom_err lib/libcrypt \ + lib/libexpat lib/libfetch ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/liblzma lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam ${_lib_libthr} \ + lib/libopie lib/libpam ${_lib_libpkg} ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} + ${_secure_lib_libssl} \ .if ${MK_LIBTHR} != "no" _lib_libthr= lib/libthr @@ -1127,6 +1126,13 @@ _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib +.if ${MK_CRYPT} == no +lib/libarchive__L: lib/libbz2__L lib/liblzma__L lib/libmd__L lib/libz__L +.else +lib/libarchive__L: lib/libbz2__L lib/liblzma__L lib/libmd__L lib/libz__L \ + secure/lib/libcrypto__L +.endif + lib/libopie__L lib/libtacplus__L: lib/libmd__L .if ${MK_CDDL} != "no" @@ -1177,6 +1183,12 @@ lib/libfetch__L lib/libradius__L: lib/libmd__L .endif +.if ${MK_PKGTOOLS} != "no" +_lib_libpkg= lib/libpkg +# Only listing direct dependencies of libpkg. +lib/libpkg__L: lib/libarchive__L lib/libfetch__L lib/libmd__L lib/libutil__L +.endif + .for _lib in ${_prereq_libs} ${_lib}__PL: .PHONY .if exists(${.CURDIR}/${_lib})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006170931.o5H9Vdbl078265>