diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-26 12:41:55 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-26 12:41:55 +0000 |
| commit | 23cac41c5715fa8adcfeb75a8d38fddc26f6bdfc (patch) | |
| tree | 8cdae37503b25101ad2929f0a95e5f5f1ad8f9c1 /sys-freebsd/freebsd-lib | |
| parent | Stable on x86 wrt bug #132213. (diff) | |
| download | gentoo-2-23cac41c5715fa8adcfeb75a8d38fddc26f6bdfc.tar.gz gentoo-2-23cac41c5715fa8adcfeb75a8d38fddc26f6bdfc.tar.bz2 gentoo-2-23cac41c5715fa8adcfeb75a8d38fddc26f6bdfc.zip | |
Don't mess up dependencies when cross-compiling.
(Portage version: 2.1_rc2-r3)
Diffstat (limited to 'sys-freebsd/freebsd-lib')
| -rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild | 22 |
2 files changed, 16 insertions, 11 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index ddc1c353aff6..e23ca46939e6 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-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.18 2006/05/24 23:26:02 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.19 2006/05/26 12:41:55 flameeyes Exp $ + + 26 May 2006; Diego Pettenò <flameeyes@gentoo.org> freebsd-lib-6.1.ebuild: + Don't mess up dependencies when cross-compiling. 24 May 2006; Diego Pettenò <flameeyes@gentoo.org> freebsd-lib-6.1.ebuild: Add compatibility symlinks for 5.x. diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild index f2d7602937e9..19923597845e 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.4 2006/05/24 23:26:02 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild,v 1.5 2006/05/26 12:41:55 flameeyes Exp $ inherit bsdmk freebsd flag-o-matic toolchain-funcs @@ -23,19 +23,21 @@ SRC_URI="mirror://gentoo/${LIB}.tar.bz2 !kernel_FreeBSD? ( mirror://gentoo/${SYS}.tar.bz2 )" -RDEPEND="ssl? ( dev-libs/openssl ) - kerberos? ( virtual/krb5 ) - !sys-freebsd/freebsd-headers" -DEPEND="${RDEPEND} - >=sys-devel/flex-2.5.31-r2 - =sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sources-${RV}*" - if [[ ${CATEGORY/cross-} == {CATEGORY} ]]; then + RDEPEND="ssl? ( dev-libs/openssl ) + kerberos? ( virtual/krb5 ) + !sys-freebsd/freebsd-headers" + DEPEND="${RDEPEND} + >=sys-devel/flex-2.5.31-r2 + =sys-freebsd/freebsd-sources-${RV}*" + PROVIDE="virtual/libc virtual/os-headers" fi +DEPEND="${DEPEND} + =sys-freebsd/freebsd-mk-defs-${RV}*" + S="${WORKDIR}/lib" export CTARGET=${CTARGET:-${CHOST}} @@ -121,6 +123,7 @@ src_compile() { # Don't use ssp until properly fixed append-flags -fno-stack-protector -fno-stack-protector-all + strip-flags if [[ ${CTARGET} != ${CHOST} ]]; then export YACC='yacc -by' CHOST=${CTARGET} tc-export CC LD CXX @@ -147,7 +150,6 @@ src_compile() { cd "${S}/msun" $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed" else - strip-flags # Forces to use the local copy of headers as they might be outdated in # the system append-flags "-isystem '${WORKDIR}/sys' -isystem '${WORKDIR}/include'" |