* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r3.ebuild
@ 2012-05-26 19:51 Alexis Ballier (aballier)
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-26 19:51 UTC (permalink / raw
To: gentoo-commits
aballier 12/05/26 19:51:26
Modified: ChangeLog freebsd-lib-9.0-r3.ebuild
Log:
remove libcompiler_rt and libblocksruntime as they are clang libraries
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Revision Changes Path
1.151 sys-freebsd/freebsd-lib/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.151&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.151&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.150&r2=1.151
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- ChangeLog 25 May 2012 15:53:40 -0000 1.150
+++ ChangeLog 26 May 2012 19:51:26 -0000 1.151
@@ -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.150 2012/05/25 15:53:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.151 2012/05/26 19:51:26 aballier Exp $
+
+ 26 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
+ remove libcompiler_rt and libblocksruntime as they are clang libraries
*freebsd-lib-9.0-r3 (25 May 2012)
1.2 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?r1=1.1&r2=1.2
Index: freebsd-lib-9.0-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freebsd-lib-9.0-r3.ebuild 25 May 2012 15:53:40 -0000 1.1
+++ freebsd-lib-9.0-r3.ebuild 26 May 2012 19:51:26 -0000 1.2
@@ -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-r3.ebuild,v 1.1 2012/05/25 15:53:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v 1.2 2012/05/26 19:51:26 aballier Exp $
EAPI=2
@@ -100,6 +100,7 @@
# - archiving libraries (have their own ebuild)
# - sendmail libraries (they are installed by sendmail)
# - SNMP library and dependency (have their own ebuilds)
+# - Clang (compiler_rt and blocksruntime)
#
# The rest are libraries we already have somewhere else because
# they are contribution.
@@ -111,6 +112,7 @@
libz libbz2 libarchive liblzma \
libsm libsmdb libsmutil \
libbegemot libbsnmp \
+ libcompiler_rt libblocksruntime \
libpam libpcap bind libwrap libmagic \
libcom_err libtelnet
libelf libedit"
@@ -261,13 +263,13 @@
elif use build ; then
# For the non-native ABIs we only build the csu parts and very core
# libraries for now.
- ret="lib/libcompiler_rt gnu/lib/libssp/libssp_nonshared"
+ ret="gnu/lib/libssp/libssp_nonshared"
if [ "${EBUILD_PHASE}" = "install" ]; then
ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
fi
else
# Only build the csu parts and core libraries for now.
- ret="lib/libcompiler_rt gnu/lib/libssp/libssp_nonshared"
+ ret="gnu/lib/libssp/libssp_nonshared"
if [ "${EBUILD_PHASE}" = "install" ]; then
ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
fi
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r3.ebuild
@ 2012-05-28 3:17 Alexis Ballier (aballier)
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-28 3:17 UTC (permalink / raw
To: gentoo-commits
aballier 12/05/28 03:17:39
Modified: ChangeLog freebsd-lib-9.0-r3.ebuild
Log:
fix broken logic in is_native_abi, by Naohiro Aota, bug #417863
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Revision Changes Path
1.152 sys-freebsd/freebsd-lib/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.152&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.152&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.151&r2=1.152
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- ChangeLog 26 May 2012 19:51:26 -0000 1.151
+++ ChangeLog 28 May 2012 03:17:39 -0000 1.152
@@ -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.151 2012/05/26 19:51:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.152 2012/05/28 03:17:39 aballier Exp $
+
+ 28 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
+ fix broken logic in is_native_abi, by Naohiro Aota, bug #417863
26 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
remove libcompiler_rt and libblocksruntime as they are clang libraries
1.3 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?r1=1.2&r2=1.3
Index: freebsd-lib-9.0-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freebsd-lib-9.0-r3.ebuild 26 May 2012 19:51:26 -0000 1.2
+++ freebsd-lib-9.0-r3.ebuild 28 May 2012 03:17:39 -0000 1.3
@@ -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-r3.ebuild,v 1.2 2012/05/26 19:51:26 aballier Exp $
+# $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 $
EAPI=2
@@ -236,8 +236,8 @@
# Is my $ABI native ?
is_native_abi() {
- is_crosscompile && return 0
- use multilib || return 1
+ is_crosscompile && return 1
+ use multilib || return 0
[ "${ABI}" = "${DEFAULT_ABI}" ]
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r3.ebuild
@ 2012-05-30 12:25 Alexis Ballier (aballier)
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-30 12:25 UTC (permalink / raw
To: gentoo-commits
aballier 12/05/30 12:25:14
Modified: ChangeLog freebsd-lib-9.0-r3.ebuild
Log:
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.
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Revision Changes Path
1.153 sys-freebsd/freebsd-lib/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.153&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.153&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.152&r2=1.153
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- ChangeLog 28 May 2012 03:17:39 -0000 1.152
+++ ChangeLog 30 May 2012 12:25:14 -0000 1.153
@@ -1,6 +1,13 @@
# 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.152 2012/05/28 03:17:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.153 2012/05/30 12:25:14 aballier Exp $
+
+ 30 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
+ 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.
28 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
fix broken logic in is_native_abi, by Naohiro Aota, bug #417863
1.4 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?rev=1.4&view=markup
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
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
Index: freebsd-lib-9.0-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- freebsd-lib-9.0-r3.ebuild 28 May 2012 03:17:39 -0000 1.3
+++ freebsd-lib-9.0-r3.ebuild 30 May 2012 12:25:14 -0000 1.4
@@ -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-r3.ebuild,v 1.3 2012/05/28 03:17:39 aballier Exp $
+# $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 $
EAPI=2
@@ -337,11 +337,6 @@
if is_crosscompile ; then
do_compile
- elif ! use multilib ; then
- # Forces to use the local copy of headers with USE=build as they might
- # be outdated in the system. Assume they are fine otherwise.
- use build && append-flags "-I${WORKDIR}/include_proper"
- do_compile
else
for ABI in $(get_all_abis) ; do
# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts.
@@ -353,17 +348,19 @@
local target="$(tc-arch-kernel ${CHOST})"
mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target}"
+ CFLAGADD=""
if ! is_native_abi ; then
mymakeopts="${mymakeopts} COMPAT_32BIT="
einfo "Pre-installing includes in include_proper_${ABI}"
mkdir "${WORKDIR}/include_proper_${ABI}" || die
CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
- CC="${CC} -I${WORKDIR}/include_proper_${ABI}"
+ CFLAGADD="-isystem ${WORKDIR}/include_proper_${ABI}"
else
- use build && append-flags "-I${WORKDIR}/include_proper" ;
+ use build && CFLAGADD="-isystem ${WORKDIR}/include_proper" || CFLAGADD="-isystem /usr/include";
fi
einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"
+ CFLAGS="${CFLAGS} ${CFLAGADD}"
CTARGET="${CHOST}" do_compile
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r3.ebuild
@ 2012-06-11 13:33 Alexis Ballier (aballier)
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2012-06-11 13:33 UTC (permalink / raw
To: gentoo-commits
aballier 12/06/11 13:33:52
Modified: ChangeLog freebsd-lib-9.0-r3.ebuild
Log:
drop another append-flags usage, being too clever it strips and breaks the cflags we added before, by Yuta SATOH, bug #419153
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Revision Changes Path
1.154 sys-freebsd/freebsd-lib/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.153&r2=1.154
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ChangeLog 30 May 2012 12:25:14 -0000 1.153
+++ ChangeLog 11 Jun 2012 13:33:52 -0000 1.154
@@ -1,6 +1,10 @@
# 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.153 2012/05/30 12:25:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.154 2012/06/11 13:33:52 aballier Exp $
+
+ 11 Jun 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
+ drop another append-flags usage, being too clever it strips and breaks the
+ cflags we added before, by Yuta SATOH, bug #419153
30 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
Treat multilib and non multilib builds the same way as multilib.eclass does
1.5 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?r1=1.4&r2=1.5
Index: freebsd-lib-9.0-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- freebsd-lib-9.0-r3.ebuild 30 May 2012 12:25:14 -0000 1.4
+++ freebsd-lib-9.0-r3.ebuild 11 Jun 2012 13:33:52 -0000 1.5
@@ -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-r3.ebuild,v 1.4 2012/05/30 12:25:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v 1.5 2012/06/11 13:33:52 aballier Exp $
EAPI=2
@@ -215,7 +215,7 @@
cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
freebsd_src_compile
- append-flags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
+ CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r3.ebuild
@ 2012-06-11 13:52 Alexis Ballier (aballier)
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2012-06-11 13:52 UTC (permalink / raw
To: gentoo-commits
aballier 12/06/11 13:52:38
Modified: ChangeLog freebsd-lib-9.0-r3.ebuild
Log:
factorize pre-installation of headers in the bootstrap function
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Revision Changes Path
1.155 sys-freebsd/freebsd-lib/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.155&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.155&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.154&r2=1.155
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- ChangeLog 11 Jun 2012 13:33:52 -0000 1.154
+++ ChangeLog 11 Jun 2012 13:52:38 -0000 1.155
@@ -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.154 2012/06/11 13:33:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.155 2012/06/11 13:52:38 aballier Exp $
+
+ 11 Jun 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
+ factorize pre-installation of headers in the bootstrap function
11 Jun 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
drop another append-flags usage, being too clever it strips and breaks the
1.6 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?r1=1.5&r2=1.6
Index: freebsd-lib-9.0-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- freebsd-lib-9.0-r3.ebuild 11 Jun 2012 13:33:52 -0000 1.5
+++ freebsd-lib-9.0-r3.ebuild 11 Jun 2012 13:52:38 -0000 1.6
@@ -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-r3.ebuild,v 1.5 2012/06/11 13:33:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v 1.6 2012/06/11 13:52:38 aballier Exp $
EAPI=2
@@ -168,9 +168,6 @@
# shouldn't be a symlink to /usr/src/sys (which should be already patched)
epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
- # Preinstall includes so we don't use the system's ones.
- mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper"
- install_includes "/include_proper"
return 0
fi
@@ -284,6 +281,14 @@
# build against it.
do_bootstrap() {
einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
+ if ! is_crosscompile ; then
+ # Pre-install headers, but not when building a cross-compiler since we
+ # assume they have been installed in the previous pass.
+ einfo "Pre-installing includes in include_proper_${ABI}"
+ mkdir "${WORKDIR}/include_proper_${ABI}" || die
+ CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
+ CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
+ fi
bootstrap_csu
bootstrap_libssp_nonshared
}
@@ -351,16 +356,11 @@
CFLAGADD=""
if ! is_native_abi ; then
mymakeopts="${mymakeopts} COMPAT_32BIT="
- einfo "Pre-installing includes in include_proper_${ABI}"
- mkdir "${WORKDIR}/include_proper_${ABI}" || die
- CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
- CFLAGADD="-isystem ${WORKDIR}/include_proper_${ABI}"
else
- use build && CFLAGADD="-isystem ${WORKDIR}/include_proper" || CFLAGADD="-isystem /usr/include";
+ use build || CFLAGS="${CFLAGS} -isystem /usr/include";
fi
einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"
- CFLAGS="${CFLAGS} ${CFLAGADD}"
CTARGET="${CHOST}" do_compile
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r3.ebuild
@ 2012-06-11 13:57 Alexis Ballier (aballier)
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2012-06-11 13:57 UTC (permalink / raw
To: gentoo-commits
aballier 12/06/11 13:57:31
Modified: ChangeLog freebsd-lib-9.0-r3.ebuild
Log:
force a bootstrap with major updates
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Revision Changes Path
1.156 sys-freebsd/freebsd-lib/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.155&r2=1.156
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- ChangeLog 11 Jun 2012 13:52:38 -0000 1.155
+++ ChangeLog 11 Jun 2012 13:57:31 -0000 1.156
@@ -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.155 2012/06/11 13:52:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.156 2012/06/11 13:57:31 aballier Exp $
+
+ 11 Jun 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
+ force a bootstrap with major updates
11 Jun 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
factorize pre-installation of headers in the bootstrap function
1.7 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild?r1=1.6&r2=1.7
Index: freebsd-lib-9.0-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freebsd-lib-9.0-r3.ebuild 11 Jun 2012 13:52:38 -0000 1.6
+++ freebsd-lib-9.0-r3.ebuild 11 Jun 2012 13:57:31 -0000 1.7
@@ -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-r3.ebuild,v 1.6 2012/06/11 13:52:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v 1.7 2012/06/11 13:57:31 aballier Exp $
EAPI=2
@@ -240,7 +240,7 @@
# Do we need to bootstrap the csu and libssp_nonshared?
need_bootstrap() {
- is_crosscompile || use build || ! is_native_abi
+ is_crosscompile || use build || ! is_native_abi || has_version "<${CATEGORY}/${P}"
}
# Get the subdirs we are building.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-06-11 13:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-30 12:25 [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r3.ebuild Alexis Ballier (aballier)
-- strict thread matches above, loose matches on Subject: below --
2012-06-11 13:57 Alexis Ballier (aballier)
2012-06-11 13:52 Alexis Ballier (aballier)
2012-06-11 13:33 Alexis Ballier (aballier)
2012-05-28 3:17 Alexis Ballier (aballier)
2012-05-26 19:51 Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox