| 1 |
aballier 12/05/30 12:25:14 |
| 2 |
|
| 3 |
Modified: ChangeLog freebsd-lib-9.0-r3.ebuild |
| 4 |
Log: |
| 5 |
Treat multilib and non multilib builds the same way as multilib.eclass does the right thing. Go back to -isystem for system includes and force to use ours as otherwise we may pick gcc ones and it got that wrong. Bypass append-flags and append cflags directly as flag-o-matic eclass maintainers think it wise to add broken checks that break with flags with spaces. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.153 sys-freebsd/freebsd-lib/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.153&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.153&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.152&r2=1.153 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v |
| 19 |
retrieving revision 1.152 |
| 20 |
retrieving revision 1.153 |
| 21 |
diff -u -r1.152 -r1.153 |
| 22 |
--- ChangeLog 28 May 2012 03:17:39 -0000 1.152 |
| 23 |
+++ ChangeLog 30 May 2012 12:25:14 -0000 1.153 |
| 24 |
@@ -1,6 +1,13 @@ |
| 25 |
# ChangeLog for sys-freebsd/freebsd-lib |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.152 2012/05/28 03:17:39 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.153 2012/05/30 12:25:14 aballier Exp $ |
| 29 |
+ |
| 30 |
+ 30 May 2012; Alexis Ballier <aballier@g.o> freebsd-lib-9.0-r3.ebuild: |
| 31 |
+ Treat multilib and non multilib builds the same way as multilib.eclass does |
| 32 |
+ the right thing. Go back to -isystem for system includes and force to use |
| 33 |
+ ours as otherwise we may pick gcc ones and it got that wrong. Bypass |
| 34 |
+ append-flags and append cflags directly as flag-o-matic eclass maintainers |
| 35 |
+ think it wise to add broken checks that break with flags with spaces. |
| 36 |
|
| 37 |
28 May 2012; Alexis Ballier <aballier@g.o> freebsd-lib-9.0-r3.ebuild: |
| 38 |
fix broken logic in is_native_abi, by Naohiro Aota, bug #417863 |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.4 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?rev=1.4&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?rev=1.4&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?r1=1.3&r2=1.4 |
| 47 |
|
| 48 |
Index: freebsd-lib-9.0-r3.ebuild |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v |
| 51 |
retrieving revision 1.3 |
| 52 |
retrieving revision 1.4 |
| 53 |
diff -u -r1.3 -r1.4 |
| 54 |
--- freebsd-lib-9.0-r3.ebuild 28 May 2012 03:17:39 -0000 1.3 |
| 55 |
+++ freebsd-lib-9.0-r3.ebuild 30 May 2012 12:25:14 -0000 1.4 |
| 56 |
@@ -1,6 +1,6 @@ |
| 57 |
# Copyright 1999-2012 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v 1.3 2012/05/28 03:17:39 aballier Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v 1.4 2012/05/30 12:25:14 aballier Exp $ |
| 61 |
|
| 62 |
EAPI=2 |
| 63 |
|
| 64 |
@@ -337,11 +337,6 @@ |
| 65 |
|
| 66 |
if is_crosscompile ; then |
| 67 |
do_compile |
| 68 |
- elif ! use multilib ; then |
| 69 |
- # Forces to use the local copy of headers with USE=build as they might |
| 70 |
- # be outdated in the system. Assume they are fine otherwise. |
| 71 |
- use build && append-flags "-I${WORKDIR}/include_proper" |
| 72 |
- do_compile |
| 73 |
else |
| 74 |
for ABI in $(get_all_abis) ; do |
| 75 |
# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts. |
| 76 |
@@ -353,17 +348,19 @@ |
| 77 |
|
| 78 |
local target="$(tc-arch-kernel ${CHOST})" |
| 79 |
mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target}" |
| 80 |
+ CFLAGADD="" |
| 81 |
if ! is_native_abi ; then |
| 82 |
mymakeopts="${mymakeopts} COMPAT_32BIT=" |
| 83 |
einfo "Pre-installing includes in include_proper_${ABI}" |
| 84 |
mkdir "${WORKDIR}/include_proper_${ABI}" || die |
| 85 |
CTARGET="${CHOST}" install_includes "/include_proper_${ABI}" |
| 86 |
- CC="${CC} -I${WORKDIR}/include_proper_${ABI}" |
| 87 |
+ CFLAGADD="-isystem ${WORKDIR}/include_proper_${ABI}" |
| 88 |
else |
| 89 |
- use build && append-flags "-I${WORKDIR}/include_proper" ; |
| 90 |
+ use build && CFLAGADD="-isystem ${WORKDIR}/include_proper" || CFLAGADD="-isystem /usr/include"; |
| 91 |
fi |
| 92 |
|
| 93 |
einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})" |
| 94 |
+ CFLAGS="${CFLAGS} ${CFLAGADD}" |
| 95 |
|
| 96 |
CTARGET="${CHOST}" do_compile |
Archives