diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-05-25 12:37:04 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-05-25 12:37:04 +0000 |
| commit | e68a7717f0aa1cd3fbe233d05f74a0c9deeeadee (patch) | |
| tree | e4284b060607120078e5ce773f16d4f539a18495 /sys-freebsd | |
| parent | replace -isystem path by -Ipath as append-flags seems not to like the former ... (diff) | |
| download | historical-e68a7717f0aa1cd3fbe233d05f74a0c9deeeadee.tar.gz historical-e68a7717f0aa1cd3fbe233d05f74a0c9deeeadee.tar.bz2 historical-e68a7717f0aa1cd3fbe233d05f74a0c9deeeadee.zip | |
fix paths I broke by the addition of MAKEOBJDIRPREFIX
Package-Manager: portage-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/Manifest | 10 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild | 10 |
3 files changed, 14 insertions, 11 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index a0a4575ad9ed..294c23dddd5b 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.143 2012/05/25 12:27:00 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.144 2012/05/25 12:37:04 aballier Exp $ + + 25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild: + fix paths I broke by the addition of MAKEOBJDIRPREFIX 25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild: replace -isystem path by -Ipath as append-flags seems not to like the former diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest index 3e04b2491428..29e10fb83f4c 100644 --- a/sys-freebsd/freebsd-lib/Manifest +++ b/sys-freebsd/freebsd-lib/Manifest @@ -62,13 +62,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 17103 RMD160 584a130f2e7ddcfab8046485ce941a3a4c863827 SHA1 8836e6bf9d66c590433815198192faf9eb15866f SHA256 6c18714294b8602d59bae6a90079f8600e2322539022903a0024e0fa2505e165 -MISC ChangeLog 30063 RMD160 fbb56e10c5a5545739d0dff5553158b20a83c494 SHA1 4ee8ecdf03d70597b6f3598ddacaa3274226ef2e SHA256 60e36d24b97f13b09537e5269782d10f142996eb535b26981bccf796bceab38e +EBUILD freebsd-lib-9.0-r2.ebuild 17183 RMD160 3e5ccf256ba16497a21e4e781513667b8b30495d SHA1 0dd5c08115f26127835ab7d655829299f421fc4d SHA256 8e2c17a8739200bc199514ce4d771a58acd9bbe633ae6ecb21662264b6390b7e +MISC ChangeLog 30199 RMD160 aefe99f854908bb7b05288acedf8458710acedbe SHA1 de6f42379fd36b471a6b1305c0a3aae7a0ec5861 SHA256 0383ea2f8dc4c85cdc4c5b9a9e052b4d03b864b7362b7d5e122ad52dca2db151 MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAk+/epkACgkQvFcC4BYPU0pzkACfcqaPzuNyrowTYAMtGZq9gjQZ -hxwAnRv4WOduXGaH45z3H4bNzMqViwr5 -=TiL3 +iEYEARECAAYFAk+/fPYACgkQvFcC4BYPU0oILgCgg4JxlQ7I3MQRUXu2AZcGMWb0 +0GsAnAwCYmpLdwqeA/5VsTV00AMmLMYL +=RVnr -----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 b41859e9114c..e9b19067ef4e 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.29 2012/05/25 12:27:00 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.30 2012/05/25 12:37:04 aballier Exp $ EAPI=2 @@ -212,15 +212,15 @@ bootstrap_csu() { cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}." freebsd_src_compile - append-flags "-B ${WORKDIR}/${csudir}" - append-ldflags "-B ${WORKDIR}/${csudir}" + append-flags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" + append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" } # Compile libssp_nonshared.a and add it's path to LDFLAGS. bootstrap_libssp_nonshared() { cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp." freebsd_src_compile - append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" + append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" export LDADD="-lssp_nonshared" } @@ -329,7 +329,7 @@ src_compile() { CHOST=${CTARGET} tc-export CC LD CXX RANLIB mymakeopts="${mymakeopts} NLS=" append-flags "-I/usr/${CTARGET}/usr/include" - append-ldflags "-L${WORKDIR}/lib/libc" + append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc" fi if is_crosscompile ; then |