diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-10-05 20:57:29 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-10-05 20:57:29 +0000 |
commit | a435c7ac6042a31459442e9597f2d14d0ef3c379 (patch) | |
tree | 65708b539f412594e5cc30694e46db503e2af7c8 /sys-freebsd/freebsd-lib | |
parent | Remove old version (diff) | |
download | gentoo-2-a435c7ac6042a31459442e9597f2d14d0ef3c379.tar.gz gentoo-2-a435c7ac6042a31459442e9597f2d14d0ef3c379.tar.bz2 gentoo-2-a435c7ac6042a31459442e9597f2d14d0ef3c379.zip |
Add a build useflag that uses a downloaded tarball of sys rather than symlinking it.
(Portage version: 2.1.2_pre2-r3)
Diffstat (limited to 'sys-freebsd/freebsd-lib')
-rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 7 | ||||
-rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild | 12 | ||||
-rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild | 12 |
3 files changed, 22 insertions, 9 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index bcd2c0711bb6..62f5c531f14a 100644 --- a/sys-freebsd/freebsd-lib/ChangeLog +++ b/sys-freebsd/freebsd-lib/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-freebsd/freebsd-lib # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.29 2006/10/05 09:09:08 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.30 2006/10/05 20:57:29 flameeyes Exp $ + + 05 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> freebsd-lib-6.1.ebuild, + freebsd-lib-6.2_beta2.ebuild: + Add a build useflag that uses a downloaded tarball of sys rather than + symlinking it. *freebsd-lib-6.2_beta2 (05 Oct 2006) diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild index ca24f17f3226..5d11a3215366 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild,v 1.10 2006/09/03 11:25:22 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild,v 1.11 2006/10/05 20:57:29 flameeyes Exp $ inherit bsdmk freebsd flag-o-matic toolchain-funcs @@ -8,7 +8,7 @@ DESCRIPTION="FreeBSD's base system libraries" SLOT="6.0" KEYWORDS="~x86-fbsd" -IUSE="atm bluetooth ssl ipv6 kerberos nis gpib" +IUSE="atm bluetooth ssl ipv6 kerberos nis gpib build" # Crypto is needed to have an internal OpenSSL header # sys is needed for libalias, probably we can just extract that instead of @@ -21,6 +21,8 @@ SRC_URI="mirror://gentoo/${LIB}.tar.bz2 mirror://gentoo/${INCLUDE}.tar.bz2 nis? ( mirror://gentoo/${USBIN}.tar.bz2 ) !kernel_FreeBSD? ( + mirror://gentoo/${SYS}.tar.bz2 ) + build? ( mirror://gentoo/${SYS}.tar.bz2 )" if [[ ${CATEGORY/cross-} == ${CATEGORY} ]]; then @@ -102,6 +104,10 @@ REMOVE_SUBDIRS="libncurses libform libmenu libpanel \ src_unpack() { freebsd_src_unpack + sed -i -e 's:-o/dev/stdout:-t:' ${S}/libc/net/Makefile.inc + + use build && return 0 + if [[ ${CTARGET} == ${CHOST} ]]; then ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" else @@ -111,8 +117,6 @@ src_unpack() { [[ -n $(install --version 2> /dev/null | grep GNU) ]] && \ sed -i -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile" - - sed -i -e 's:-o/dev/stdout:-t:' ${S}/libc/net/Makefile.inc } src_compile() { diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild index 8bb882e9855d..5a9bbf100081 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild,v 1.1 2006/10/05 09:09:08 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild,v 1.2 2006/10/05 20:57:29 flameeyes Exp $ inherit bsdmk freebsd flag-o-matic toolchain-funcs @@ -8,7 +8,7 @@ DESCRIPTION="FreeBSD's base system libraries" SLOT="6.0" KEYWORDS="~x86-fbsd" -IUSE="atm bluetooth ssl ipv6 kerberos nis gpib" +IUSE="atm bluetooth ssl ipv6 kerberos nis gpib build" # Crypto is needed to have an internal OpenSSL header # sys is needed for libalias, probably we can just extract that instead of @@ -21,6 +21,8 @@ SRC_URI="mirror://gentoo/${LIB}.tar.bz2 mirror://gentoo/${INCLUDE}.tar.bz2 nis? ( mirror://gentoo/${USBIN}.tar.bz2 ) !kernel_FreeBSD? ( + mirror://gentoo/${SYS}.tar.bz2 ) + build? ( mirror://gentoo/${SYS}.tar.bz2 )" if [[ ${CATEGORY/cross-} == ${CATEGORY} ]]; then @@ -103,6 +105,10 @@ REMOVE_SUBDIRS="libncurses libform libmenu libpanel \ src_unpack() { freebsd_src_unpack + sed -i -e 's:-o/dev/stdout:-t:' ${S}/libc/net/Makefile.inc + + use build && return 0 + if [[ ${CTARGET} == ${CHOST} ]]; then ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" else @@ -113,8 +119,6 @@ src_unpack() { [[ -n $(install --version 2> /dev/null | grep GNU) ]] && \ sed -i -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile" - sed -i -e 's:-o/dev/stdout:-t:' ${S}/libc/net/Makefile.inc - # Let arch-specific includes to be found local machine machine=$(tc-arch-kernel ${CTARGET}) |