On Wed, May 20, 2015 at 01:05:34PM +0000, Garrett Cooper wrote: > Author: ngie > Date: Wed May 20 13:05:33 2015 > New Revision: 283152 > URL: https://svnweb.freebsd.org/changeset/base/283152 > > Log: > Unbreak the arm64/sparc64 tinderbox by only compiling lib/libproc and > lib/librtld_db on architectures where they're supported > > Reported by: bz, Jenkins > Pointyhat to: bapt > > Modified: > head/Makefile.inc1 > > Modified: head/Makefile.inc1 > ============================================================================== > --- head/Makefile.inc1 Wed May 20 13:04:00 2015 (r283151) > +++ head/Makefile.inc1 Wed May 20 13:05:33 2015 (r283152) > @@ -1694,8 +1694,6 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 > lib/libopie lib/libpam ${_lib_libthr} \ > ${_lib_libradius} lib/libsbuf lib/libtacplus \ > lib/libgeom \ > - lib/libproc \ > - lib/librtld_db \ > ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ > ${_cddl_lib_libuutil} \ > ${_cddl_lib_libavl} \ > @@ -1767,6 +1765,13 @@ _cddl_lib= cddl/lib > cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L > cddl/lib/libzfs__L: lib/libgeom__L > cddl/lib/libctf__L: lib/libz__L > +# cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built > +# on select architectures though (see cddl/lib/Makefile) > +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ > + ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \ > + ${MACHINE_CPUARCH} == "arm" > +_prebuild_libs+= lib/libproc lib/librtld_db > +.endif > .endif
Thanks I was about to commit this one just waiting for make universe to finish. Best regards, Bapt
pgpkA0Sirl8SY.pgp
Description: PGP signature
