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 | c6efb8a88b1eecd31b44b0a587e55ae44b59dfbe (patch) | |
| tree | e4f7c8488b1921ead812aaa2e772aa137f9fcb93 /sys-freebsd | |
| parent | x11-libs/xbae: Moved to EAPI=4 and autotools.eclas to handle static-libs (diff) | |
| download | gentoo-2-c6efb8a88b1eecd31b44b0a587e55ae44b59dfbe.tar.gz gentoo-2-c6efb8a88b1eecd31b44b0a587e55ae44b59dfbe.tar.bz2 gentoo-2-c6efb8a88b1eecd31b44b0a587e55ae44b59dfbe.zip | |
Do not build libssp, we really only need libssp_nonshared.
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd')
| -rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild | 13 |
2 files changed, 8 insertions, 10 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/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 |