From owner-svn-src-all@FreeBSD.ORG Wed May 20 17:39:33 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AF3E167D; Wed, 20 May 2015 17:39:33 +0000 (UTC) Received: from mail-wi0-x22b.google.com (mail-wi0-x22b.google.com [IPv6:2a00:1450:400c:c05::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 43E1E1980; Wed, 20 May 2015 17:39:33 +0000 (UTC) Received: by wizk4 with SMTP id k4so163561262wiz.1; Wed, 20 May 2015 10:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=lWKRlk95rSUl3OnO0JpIuOlhAnES5ojqEAn6ckPthhI=; b=L0pHJoCFYLLbNp0m9nl2gNiYH2CgTK7Q+l0FKI37g5C+KU8XW9zlGjMD4UyG6zuC+r fE4HcolomEhArfMvyockb7k0601r8u3c4JxtNqyN66uMMwSgTGnteGM1KktIqwYyaLAO wVJi2Y1ZLJh3cBh1J1vKEtIkcCOkDjIgw7XBCGaBL9uxOWuJCbURea2cvSe8rWReFfqE mfHTdcgpkk+e4GlihfOLUuik6USzFzEnfyZ2vVjsivrwACb+ucapTYimLaeVC1K9X9mx yRM3s0dab8HmcUZMqKc4b8bMRMzbW/JUy0yfj+QwxLKXv/+7fX8Gyt8au0c4D9C36mxg n2Jw== X-Received: by 10.194.2.16 with SMTP id 16mr65620438wjq.46.1432143571305; Wed, 20 May 2015 10:39:31 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id k2sm4567779wif.3.2015.05.20.10.39.29 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 May 2015 10:39:30 -0700 (PDT) Sender: Baptiste Daroussin Date: Wed, 20 May 2015 19:39:28 +0200 From: Baptiste Daroussin To: Garrett Cooper 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> References: <201505201305.t4KD5Ybx063464@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="qDymnuGqqhW10CwH" Content-Disposition: inline In-Reply-To: <201505201305.t4KD5Ybx063464@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2015 17:39:33 -0000 --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--