Date: Wed, 20 May 2015 19:39:28 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Garrett Cooper <ngie@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r283152 - head Message-ID: <20150520173927.GK52236@ivaldir.etoilebsd.net> In-Reply-To: <201505201305.t4KD5Ybx063464@svn.freebsd.org> References: <201505201305.t4KD5Ybx063464@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--qDymnuGqqhW10CwH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 >=20 > Log: > Unbreak the arm64/sparc64 tinderbox by only compiling lib/libproc and > lib/librtld_db on architectures where they're supported > =20 > Reported by: bz, Jenkins > Pointyhat to: bapt >=20 > Modified: > head/Makefile.inc1 >=20 > Modified: head/Makefile.inc1 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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=3D ${_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=3D 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} =3D=3D "amd64" || ${MACHINE_ARCH} =3D=3D "i386" || \ > + ${MACHINE_CPUARCH} =3D=3D "mips" || ${MACHINE_CPUARCH} =3D=3D "powerpc"= || \ > + ${MACHINE_CPUARCH} =3D=3D "arm" > +_prebuild_libs+=3D lib/libproc lib/librtld_db > +.endif > .endif Thanks I was about to commit this one just waiting for make universe to fin= ish. Best regards, Bapt --qDymnuGqqhW10CwH Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlVcxs8ACgkQ8kTtMUmk6EwsJwCgpReXGekE6vweKIOlAVp3uPZ6 60YAn2aE0llp7Np3tSpPdpvGhQEI4fQT =NfYT -----END PGP SIGNATURE----- --qDymnuGqqhW10CwH--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150520173927.GK52236>