diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-05-25 14:58:59 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-05-25 14:58:59 +0000 |
| commit | c7c3f9ff742dc6e4eba8f69de1b6e589d6fda8b6 (patch) | |
| tree | 3c308f00d534297fb048a3e1fa923c7f323bc0df | |
| parent | x11-libs/xbae: Moved to EAPI=4 and autotools.eclas to handle static-libs (diff) | |
| download | historical-c7c3f9ff742dc6e4eba8f69de1b6e589d6fda8b6.tar.gz historical-c7c3f9ff742dc6e4eba8f69de1b6e589d6fda8b6.tar.bz2 historical-c7c3f9ff742dc6e4eba8f69de1b6e589d6fda8b6.zip | |
Do not build libssp, we really only need libssp_nonshared.
Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64
| -rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/Manifest | 10 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild | 13 |
3 files changed, 13 insertions, 15 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index 7be764ec475f..d72996df36b4 100644 --- a/sys-freebsd/freebsd-lib/ChangeLog +++ b/sys-freebsd/freebsd-lib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-freebsd/freebsd-lib # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.146 2012/05/25 14:11:31 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.147 2012/05/25 14:58:59 aballier Exp $ + + 25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild: + Do not build libssp, we really only need libssp_nonshared. 25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild: drop noop sed diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest index 5de838363fc1..f6760b049d6d 100644 --- a/sys-freebsd/freebsd-lib/Manifest +++ b/sys-freebsd/freebsd-lib/Manifest @@ -63,13 +63,13 @@ EBUILD freebsd-lib-7.2-r1.ebuild 12031 RMD160 7ed76ca70dbca490d9e222c6200a825b82 EBUILD freebsd-lib-8.0.ebuild 14711 RMD160 546c0e959156a4138331b6ba6ca0d55a53fb3a18 SHA1 c316876d83231db0d225e5b2fb49762903fee037 SHA256 a2f84d09876185ce43467375362842642a00a9400c846fa2ce587f8ec2dce981 EBUILD freebsd-lib-8.2-r1.ebuild 15781 RMD160 6b636dac242c89a203e3bb532c6413df1614a2ab SHA1 cee76f7c3a2302a98d7fc7a3d384d9bb93ec9e70 SHA256 77b9417b08a2cecb3411284d284a7374190573fb70c7d4e540db9704d10e5083 EBUILD freebsd-lib-9.0-r1.ebuild 16053 RMD160 5f16e81224019df01c9babb5b1dd49f76201b109 SHA1 3ce8266e607e5cc06e4b6c3581a98609f764bde3 SHA256 de7d0a8f471f0c56650bd282e570e3426f5e836df9f2181124b10e13d2ff6781 -EBUILD freebsd-lib-9.0-r2.ebuild 17172 RMD160 9214fa9a55e84470b3ab7bc3de1a4db4351f4743 SHA1 f7d3e1b13e767bfaf924cb1f46d7819315fe460f SHA256 fbbd45dbf266e8f412234f24e2397193332c8b5b8030f4d89650fd30cd67c869 -MISC ChangeLog 30458 RMD160 091f985931bb69a5a289364f2d87873bebd6c255 SHA1 eccc7621c68aec01c17e9df55a301ba9ff036576 SHA256 91b658a4324beb7379016b1a214bce2f139045a491e982462c8092c54cace773 +EBUILD freebsd-lib-9.0-r2.ebuild 17023 RMD160 461df96b6a467a2ec1a11c4aff56b0707f3400a4 SHA1 b1b738e50be904c3606ea2b1d05a0201591a2eb7 SHA256 69d1ea4bd7cf1397f7141396eed5bfe9165dde3bb765d135b956b365b8dc20e6 +MISC ChangeLog 30599 RMD160 48663fc31b19abd6b84b91322d0cbd6e3558e01a SHA1 b6e0f664821b50a0ae6364d326a2de8fd62f0c7f SHA256 3b0a80d1146b73b1cc3f81623bd5547f33b4056ffb0c8cf00da3f10b7674844f MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAk+/kxgACgkQvFcC4BYPU0oVXQCghuq1RcFfU/wpdB3zuElQPIA0 -VRwAn31CLMSLX0dWc7G/BmUubkBMka2K -=yEbU +iEYEARECAAYFAk+/njkACgkQvFcC4BYPU0rsGwCghLY8kik1YcNDEo4vE4mLVvsx +yTAAn0IBsA/He6v0N5MkZ0j3pFhULPlU +=VJ4L -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild index 7a6ff3b09228..7e77b8dc7dc9 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.32 2012/05/25 14:11:31 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.33 2012/05/25 14:58:59 aballier Exp $ EAPI=2 @@ -226,10 +226,10 @@ bootstrap_libssp_nonshared() { # What to build for a non-native build: cross-compiler, non-native abi in # multilib. We also need the csu but this has to be handled separately. -NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil" +NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil" # Subdirs for a native build: -NATIVE_SUBDIRS="lib gnu/lib/libssp gnu/lib/libregex" +NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex" # Is my $ABI native ? is_native_abi() { @@ -501,11 +501,6 @@ install_includes() BINGRP="${GROUPS}" fi - # This is for ssp/ssp.h. - einfo "Building ssp.h" - cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp" - $(freebsd_get_bmake) ssp.h || die "problem building ssp.h" - # Must exist before we use it. [[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes." cd "${WORKDIR}/include" @@ -519,7 +514,7 @@ install_includes() INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ BINGRP="${BINGRP}" || die "install_includes() failed" einfo "includes installed ok." - EXTRA_INCLUDES="gnu/lib/libssp lib/librtld_db lib/libutil lib/msun gnu/lib/libregex" + EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex" for i in $EXTRA_INCLUDES; do einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." cd "${WORKDIR}/$i" || die |