* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: freebsd-lib-9.1-r8.ebuild ChangeLog
@ 2013-06-18 22:26 Alexis Ballier (aballier)
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier (aballier) @ 2013-06-18 22:26 UTC (permalink / raw
To: gentoo-commits
aballier 13/06/18 22:26:23
Modified: freebsd-lib-9.1-r8.ebuild ChangeLog
Log:
Simplify a bit get_subdirs and do not treat differently USE=build/-build for non-native ABIs since we bootstrap when needed anyway.
(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.3 sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild?r1=1.2&r2=1.3
Index: freebsd-lib-9.1-r8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freebsd-lib-9.1-r8.ebuild 18 Jun 2013 22:20:51 -0000 1.2
+++ freebsd-lib-9.1-r8.ebuild 18 Jun 2013 22:26:23 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.1-r8.ebuild,v 1.2 2013/06/18 22:20:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild,v 1.3 2013/06/18 22:26:23 aballier Exp $
EAPI=5
@@ -251,9 +251,12 @@
append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libgcc"
}
-# What to build for a non-native build: cross-compiler, non-native abi in
-# multilib. We also need the csu but this has to be handled separately.
-NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil"
+# What to build for a cross-compiler.
+# We also need the csu but this has to be handled separately.
+CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil"
+
+# What to build for non-default ABIs.
+NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt"
# Subdirs for a native build:
NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc"
@@ -278,27 +281,16 @@
ret="${NATIVE_SUBDIRS}"
elif is_crosscompile ; then
# With a cross-compiler we only build the very core parts.
- ret="${NON_NATIVE_SUBDIRS}"
+ ret="${CROSS_SUBDIRS}"
if [ "${EBUILD_PHASE}" = "install" ]; then
# Add the csu dir first when installing. We treat it separately for
# compiling.
ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
fi
- elif use build ; then
+ else
# For the non-native ABIs we only build the csu parts and very core
# libraries for now.
- ret="gnu/lib/libssp/libssp_nonshared gnu/lib/csu"
- if [ "${EBUILD_PHASE}" = "install" ]; then
- ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
- fi
- else
- # Finally, with a non-native ABI without USE=build, we build the most
- # important libraries.
- ret="${NON_NATIVE_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt"
-
- if [ "${EBUILD_PHASE}" = "install" ]; then
- ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
- fi
+ ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))"
fi
echo "${ret}"
}
1.181 sys-freebsd/freebsd-lib/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.181&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.181&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.180&r2=1.181
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- ChangeLog 18 Jun 2013 22:20:51 -0000 1.180
+++ ChangeLog 18 Jun 2013 22:26:23 -0000 1.181
@@ -1,6 +1,10 @@
# ChangeLog for sys-freebsd/freebsd-lib
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.180 2013/06/18 22:20:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.181 2013/06/18 22:26:23 aballier Exp $
+
+ 18 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r8.ebuild:
+ Simplify a bit get_subdirs and do not treat differently USE=build/-build for
+ non-native ABIs since we bootstrap when needed anyway.
18 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r8.ebuild:
Make a full bootstrap only when needed for multilib.
^ permalink raw reply [flat|nested] 5+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: freebsd-lib-9.1-r8.ebuild ChangeLog
@ 2013-06-27 19:39 Alexis Ballier (aballier)
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier (aballier) @ 2013-06-27 19:39 UTC (permalink / raw
To: gentoo-commits
aballier 13/06/27 19:39:44
Modified: freebsd-lib-9.1-r8.ebuild ChangeLog
Log:
drop now useless patch (gccfloat)
(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.6 sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild?r1=1.5&r2=1.6
Index: freebsd-lib-9.1-r8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- freebsd-lib-9.1-r8.ebuild 20 Jun 2013 22:06:06 -0000 1.5
+++ freebsd-lib-9.1-r8.ebuild 27 Jun 2013 19:39:44 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.1-r8.ebuild,v 1.5 2013/06/20 22:06:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild,v 1.6 2013/06/27 19:39:44 aballier Exp $
EAPI=5
@@ -86,7 +86,6 @@
PATCHES=(
"${FILESDIR}/${PN}-6.0-pmc.patch"
- "${FILESDIR}/${PN}-6.0-gccfloat.patch"
"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
"${FILESDIR}/${PN}-6.1-csu.patch"
"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
1.185 sys-freebsd/freebsd-lib/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.185&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.185&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.184&r2=1.185
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- ChangeLog 20 Jun 2013 22:06:06 -0000 1.184
+++ ChangeLog 27 Jun 2013 19:39:44 -0000 1.185
@@ -1,6 +1,9 @@
# ChangeLog for sys-freebsd/freebsd-lib
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.184 2013/06/20 22:06:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.185 2013/06/27 19:39:44 aballier Exp $
+
+ 27 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r8.ebuild:
+ drop now useless patch (gccfloat)
20 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r8.ebuild:
go back to -isystem from -I for include proper, bug #473934 by Yuta SATOH. I
^ permalink raw reply [flat|nested] 5+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: freebsd-lib-9.1-r8.ebuild ChangeLog
@ 2013-06-20 22:06 Alexis Ballier (aballier)
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier (aballier) @ 2013-06-20 22:06 UTC (permalink / raw
To: gentoo-commits
aballier 13/06/20 22:06:06
Modified: freebsd-lib-9.1-r8.ebuild ChangeLog
Log:
go back to -isystem from -I for include proper, bug #473934 by Yuta SATOH. I will get this right on a first shoot some day.
(Portage version: 2.2.0_alpha183/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.5 sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild?r1=1.4&r2=1.5
Index: freebsd-lib-9.1-r8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- freebsd-lib-9.1-r8.ebuild 18 Jun 2013 23:18:11 -0000 1.4
+++ freebsd-lib-9.1-r8.ebuild 20 Jun 2013 22:06:06 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.1-r8.ebuild,v 1.4 2013/06/18 23:18:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild,v 1.5 2013/06/20 22:06:06 aballier Exp $
EAPI=5
@@ -306,7 +306,7 @@
einfo "Pre-installing includes in include_proper_${ABI}"
mkdir "${WORKDIR}/include_proper_${ABI}" || die
CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
- CFLAGS="${CFLAGS} -I ${WORKDIR}/include_proper_${ABI}"
+ CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
fi
bootstrap_csu
bootstrap_libssp_nonshared
1.184 sys-freebsd/freebsd-lib/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.184&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.184&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.183&r2=1.184
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- ChangeLog 18 Jun 2013 23:45:22 -0000 1.183
+++ ChangeLog 20 Jun 2013 22:06:06 -0000 1.184
@@ -1,6 +1,10 @@
# ChangeLog for sys-freebsd/freebsd-lib
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.183 2013/06/18 23:45:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.184 2013/06/20 22:06:06 aballier Exp $
+
+ 20 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r8.ebuild:
+ go back to -isystem from -I for include proper, bug #473934 by Yuta SATOH. I
+ will get this right on a first shoot some day.
18 Jun 2013; Alexis Ballier <aballier@gentoo.org> -freebsd-lib-7.2-r1.ebuild,
-freebsd-lib-8.0.ebuild, -files/freebsd-lib-7.0-CVE-2008-1391.patch,
^ permalink raw reply [flat|nested] 5+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: freebsd-lib-9.1-r8.ebuild ChangeLog
@ 2013-06-18 23:18 Alexis Ballier (aballier)
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier (aballier) @ 2013-06-18 23:18 UTC (permalink / raw
To: gentoo-commits
aballier 13/06/18 23:18:11
Modified: freebsd-lib-9.1-r8.ebuild ChangeLog
Log:
Do not built libstand anymore and remove the now useless bootstrap useflag
(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.4 sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild?r1=1.3&r2=1.4
Index: freebsd-lib-9.1-r8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- freebsd-lib-9.1-r8.ebuild 18 Jun 2013 22:26:23 -0000 1.3
+++ freebsd-lib-9.1-r8.ebuild 18 Jun 2013 23:18:11 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.1-r8.ebuild,v 1.3 2013/06/18 22:26:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild,v 1.4 2013/06/18 23:18:11 aballier Exp $
EAPI=5
@@ -37,8 +37,7 @@
!sys-freebsd/freebsd-headers"
DEPEND="${RDEPEND}
>=sys-devel/flex-2.5.31-r2
- =sys-freebsd/freebsd-sources-${RV}*
- !bootstrap? ( app-arch/bzip2 )"
+ =sys-freebsd/freebsd-sources-${RV}*"
else
SRC_URI="${SRC_URI}
mirror://gentoo/${SYS}.tar.bz2"
@@ -56,7 +55,7 @@
fi
IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
- build bootstrap crosscompile_opts_headers-only zfs
+ build crosscompile_opts_headers-only zfs
userland_GNU userland_BSD multilib"
pkg_setup() {
@@ -106,6 +105,8 @@
# - archiving libraries (have their own ebuild)
# - sendmail libraries (they are installed by sendmail)
# - SNMP library and dependency (have their own ebuilds)
+# - libstand: static library, 32bits on amd64 used for boot0, we build it from
+# boot0 instead.
#
# The rest are libraries we already have somewhere else because
# they are contribution.
@@ -119,7 +120,8 @@
libbegemot libbsnmp \
libpam libpcap bind libwrap libmagic \
libcom_err libtelnet
- libelf libedit"
+ libelf libedit
+ libstand"
# For doing multilib over multibuild.eclass
MULTIBUILD_VARIANTS=( $(get_all_abis) )
@@ -191,10 +193,9 @@
sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
fi
- cd "${S}"
- use bootstrap && dummy_mk libstand
# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
# BSD's sed on BSD.
+ cd "${S}"
if use userland_GNU; then
find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
fi
1.182 sys-freebsd/freebsd-lib/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.182&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.182&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.181&r2=1.182
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- ChangeLog 18 Jun 2013 22:26:23 -0000 1.181
+++ ChangeLog 18 Jun 2013 23:18:11 -0000 1.182
@@ -1,6 +1,9 @@
# ChangeLog for sys-freebsd/freebsd-lib
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.181 2013/06/18 22:26:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.182 2013/06/18 23:18:11 aballier Exp $
+
+ 18 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r8.ebuild:
+ Do not built libstand anymore and remove the now useless bootstrap useflag
18 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r8.ebuild:
Simplify a bit get_subdirs and do not treat differently USE=build/-build for
^ permalink raw reply [flat|nested] 5+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: freebsd-lib-9.1-r8.ebuild ChangeLog
@ 2013-06-18 22:20 Alexis Ballier (aballier)
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier (aballier) @ 2013-06-18 22:20 UTC (permalink / raw
To: gentoo-commits
aballier 13/06/18 22:20:51
Modified: freebsd-lib-9.1-r8.ebuild ChangeLog
Log:
Make a full bootstrap only when needed for multilib.
(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.2 sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild?r1=1.1&r2=1.2
Index: freebsd-lib-9.1-r8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freebsd-lib-9.1-r8.ebuild 18 Jun 2013 19:15:46 -0000 1.1
+++ freebsd-lib-9.1-r8.ebuild 18 Jun 2013 22:20:51 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.1-r8.ebuild,v 1.1 2013/06/18 19:15:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild,v 1.2 2013/06/18 22:20:51 aballier Exp $
EAPI=5
@@ -191,12 +191,6 @@
sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
fi
- # Let arch-specific includes to be found
- local machine
- machine=$(tc-arch-kernel ${CTARGET})
- ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
- die "Couldn't make ${machine}/include symlink."
-
cd "${S}"
use bootstrap && dummy_mk libstand
# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
@@ -273,7 +267,7 @@
# Do we need to bootstrap the csu and libssp_nonshared?
need_bootstrap() {
- is_crosscompile || use build || ! is_native_abi || has_version "<${CATEGORY}/${P}"
+ is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' ; } || has_version "<${CATEGORY}/${P}"
}
# Get the subdirs we are building.
@@ -333,7 +327,11 @@
do_compile() {
# Bootstrap if needed, otherwise assume the system headers are in
# /usr/include.
- need_bootstrap && do_bootstrap
+ if need_bootstrap ; then
+ do_bootstrap
+ else
+ CFLAGS="${CFLAGS} -isystem /usr/include"
+ fi
export RAW_LDFLAGS=$(raw-ldflags)
1.180 sys-freebsd/freebsd-lib/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.180&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.180&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.179&r2=1.180
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- ChangeLog 18 Jun 2013 19:15:46 -0000 1.179
+++ ChangeLog 18 Jun 2013 22:20:51 -0000 1.180
@@ -1,6 +1,9 @@
# ChangeLog for sys-freebsd/freebsd-lib
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.179 2013/06/18 19:15:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.180 2013/06/18 22:20:51 aballier Exp $
+
+ 18 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r8.ebuild:
+ Make a full bootstrap only when needed for multilib.
*freebsd-lib-9.1-r8 (18 Jun 2013)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-06-27 19:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-18 22:26 [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: freebsd-lib-9.1-r8.ebuild ChangeLog Alexis Ballier (aballier)
-- strict thread matches above, loose matches on Subject: below --
2013-06-27 19:39 Alexis Ballier (aballier)
2013-06-20 22:06 Alexis Ballier (aballier)
2013-06-18 23:18 Alexis Ballier (aballier)
2013-06-18 22:20 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