* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-07-03 7:48 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-07-03 7:48 UTC (permalink / raw
To: gentoo-commits
mgorny 14/07/03 07:48:49
Modified: ChangeLog multilib-build.eclass
Log:
Re-enable multilib flags for s390.
Revision Changes Path
1.1307 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1307&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1307&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1306&r2=1.1307
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1306
retrieving revision 1.1307
diff -u -r1.1306 -r1.1307
--- ChangeLog 29 Jun 2014 14:24:22 -0000 1.1306
+++ ChangeLog 3 Jul 2014 07:48:49 -0000 1.1307
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1306 2014/06/29 14:24:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1307 2014/07/03 07:48:49 mgorny Exp $
+
+ 03 Jul 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Re-enable multilib flags for s390.
29 Jun 2014; Mike Gilbert <floppym@gentoo.org> distutils-r1.eclass,
python-utils-r1.eclass:
1.60 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.59&r2=1.60
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- multilib-build.eclass 29 Jun 2014 08:32:46 -0000 1.59
+++ multilib-build.eclass 3 Jul 2014 07:48:49 -0000 1.60
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.59 2014/06/29 08:32:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.60 2014/07/03 07:48:49 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -46,6 +46,8 @@
abi_mips_o32:o32
abi_ppc_32:ppc
abi_ppc_64:ppc64
+ abi_s390_32:s390
+ abi_s390_64:s390x
)
# @ECLASS-VARIABLE: MULTILIB_COMPAT
^ permalink raw reply [flat|nested] 53+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2015-06-26 20:43 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2015-06-26 20:43 UTC (permalink / raw
To: gentoo-commits
mgorny 15/06/26 20:43:13
Modified: ChangeLog multilib-build.eclass
Log:
Remove emul-linux-x86 hack, since emul-linux-x86 is no more.
Revision Changes Path
1.1685 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1685&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1685&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1684&r2=1.1685
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1684
retrieving revision 1.1685
diff -u -r1.1684 -r1.1685
--- ChangeLog 24 Jun 2015 17:04:53 -0000 1.1684
+++ ChangeLog 26 Jun 2015 20:43:13 -0000 1.1685
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1684 2015/06/24 17:04:53 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1685 2015/06/26 20:43:13 mgorny Exp $
+
+ 26 Jun 2015; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Remove emul-linux-x86 hack, since emul-linux-x86 is no more.
24 Jun 2015; William Hubbs <williamh@gentoo.org> golang-build.eclass:
typo fix, use double brackets
1.66 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.66&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.66&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.65&r2=1.66
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- multilib-build.eclass 13 Dec 2014 08:41:37 -0000 1.65
+++ multilib-build.eclass 26 Jun 2015 20:43:13 -0000 1.66
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.65 2014/12/13 08:41:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.66 2015/06/26 20:43:13 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -513,14 +513,6 @@
sed -e "/${MULTILIB_ABI_FLAG} /s&error.*&include <${CHOST}${f}>&" \
-i "${wrapper}" || die
- # Hack for emul-linux-x86 compatibility.
- # It assumes amd64 will come after x86, and will use amd64
- # headers if no specific x86 headers were installed.
- if [[ ${ABI} == amd64 ]]; then
- sed -e "/abi_x86_32 /s&error.*&include <${CHOST}${f}>&" \
- -i "${wrapper}" || die
- fi
-
# Needed for swig.
if multilib_is_native_abi; then
sed -e "/Native ABI/s&error.*&include <${CHOST}${f}>&" \
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-08-17 3:34 Jonathan Callen (jcallen)
0 siblings, 0 replies; 53+ messages in thread
From: Jonathan Callen (jcallen) @ 2014-08-17 3:34 UTC (permalink / raw
To: gentoo-commits
jcallen 14/08/17 03:34:32
Modified: ChangeLog multilib-build.eclass
Log:
Add new multilib_native_enable and multilib_native_with functions; fix documentation
Revision Changes Path
1.1352 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1352&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1352&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1351&r2=1.1352
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1351
retrieving revision 1.1352
diff -u -r1.1351 -r1.1352
--- ChangeLog 12 Aug 2014 14:58:40 -0000 1.1351
+++ ChangeLog 17 Aug 2014 03:34:32 -0000 1.1352
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1351 2014/08/12 14:58:40 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1352 2014/08/17 03:34:32 jcallen Exp $
+
+ 17 Aug 2014; Jonathan Callen <jcallen@gentoo.org> multilib-build.eclass:
+ Add new multilib_native_enable and multilib_native_with functions; fix
+ documentation
12 Aug 2014; Michael Palimaka <kensington@gentoo.org> cmake-utils.eclass:
Sync with KDE overlay, including a large number of cosmetic changes and
1.64 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.63&r2=1.64
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- multilib-build.eclass 4 Jul 2014 13:02:21 -0000 1.63
+++ multilib-build.eclass 17 Aug 2014 03:34:32 -0000 1.64
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.63 2014/07/04 13:02:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.64 2014/08/17 03:34:32 jcallen Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -567,9 +567,6 @@
# @DESCRIPTION:
# Determine whether the currently built ABI is the profile native.
# Return true status (0) if that is true, otherwise false (1).
-#
-# This function is not intended to be used directly. Please use
-# multilib_build_binaries instead.
multilib_is_native_abi() {
debug-print-function ${FUNCNAME} "${@}"
@@ -580,14 +577,7 @@
# @FUNCTION: multilib_build_binaries
# @DESCRIPTION:
-# Determine whether to build binaries for the currently built ABI.
-# Returns true status (0) if the currently built ABI is the profile
-# native or COMPLETE_MULTILIB variable is set to 'yes', otherwise
-# false (1).
-#
-# This is often useful for configure calls when some of the options are
-# supposed to be disabled for multilib ABIs (like those used for
-# executables only).
+# Deprecated synonym for multilib_is_native_abi
multilib_build_binaries() {
debug-print-function ${FUNCNAME} "${@}"
@@ -615,7 +605,7 @@
# @FUNCTION: multilib_native_use_enable
# @USAGE: <flag> [<opt-name> [<opt-value>]]
# @DESCRIPTION:
-# Output --enable configure option alike use_with if USE <flag>
+# Output --enable configure option alike use_enable if USE <flag>
# is enabled and executables are being built (multilib_is_native_abi
# is true). Otherwise, outputs --disable configure option. Arguments are
# the same as for use_enable in the EAPI.
@@ -627,6 +617,34 @@
fi
}
+# @FUNCTION: multilib_native_enable
+# @USAGE: <opt-name> [<opt-value>]
+# @DESCRIPTION:
+# Output --enable configure option if executables are being built
+# (multilib_is_native_abi is true). Otherwise, output --disable configure
+# option.
+multilib_native_enable() {
+ if multilib_is_native_abi; then
+ echo "--enable-${1}${2+=${2}}"
+ else
+ echo "--disable-${1}"
+ fi
+}
+
+# @FUNCTION: multilib_native_with
+# @USAGE: <opt-name> [<opt-value>]
+# @DESCRIPTION:
+# Output --with configure option if executables are being built
+# (multilib_is_native_abi is true). Otherwise, output --without configure
+# option.
+multilib_native_with() {
+ if multilib_is_native_abi; then
+ echo "--with-${1}${2+=${2}}"
+ else
+ echo "--without-${1}"
+ fi
+}
+
# @FUNCTION: multilib_native_usex
# @USAGE: <flag> [<true1> [<false1> [<true2> [<false2>]]]]
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-07-04 13:02 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-07-04 13:02 UTC (permalink / raw
To: gentoo-commits
mgorny 14/07/04 13:02:21
Modified: ChangeLog multilib-build.eclass
Log:
Declare REQUIRED_USE inside MULTILIB_COMPAT conditional, reported by steev.
Revision Changes Path
1.1310 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1310&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1310&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1309&r2=1.1310
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1309
retrieving revision 1.1310
diff -u -r1.1309 -r1.1310
--- ChangeLog 3 Jul 2014 17:45:26 -0000 1.1309
+++ ChangeLog 4 Jul 2014 13:02:21 -0000 1.1310
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1309 2014/07/03 17:45:26 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1310 2014/07/04 13:02:21 mgorny Exp $
+
+ 04 Jul 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Declare REQUIRED_USE inside MULTILIB_COMPAT conditional, reported by steev.
03 Jul 2014; Fabian Groffen <grobian@gentoo.org> multilib-build.eclass:
Add some Prefix hosts to _MULTILIB_FLAGS
1.63 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.62&r2=1.63
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- multilib-build.eclass 3 Jul 2014 17:45:26 -0000 1.62
+++ multilib-build.eclass 4 Jul 2014 13:02:21 -0000 1.63
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.62 2014/07/03 17:45:26 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.63 2014/07/04 13:02:21 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -116,13 +116,13 @@
done
flags=( "${MULTILIB_COMPAT[@]}" )
+
+ REQUIRED_USE="|| ( ${flags[*]} )"
fi
local usedeps=${flags[@]/%/(-)?}
IUSE=${flags[*]}
- REQUIRED_USE="|| ( ${flags[*]} )"
-
MULTILIB_USEDEP=${usedeps// /,}
}
_multilib_build_set_globals
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-07-03 17:45 Fabian Groffen (grobian)
0 siblings, 0 replies; 53+ messages in thread
From: Fabian Groffen (grobian) @ 2014-07-03 17:45 UTC (permalink / raw
To: gentoo-commits
grobian 14/07/03 17:45:26
Modified: ChangeLog multilib-build.eclass
Log:
Add some Prefix hosts to _MULTILIB_FLAGS
Revision Changes Path
1.1309 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1309&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1309&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1308&r2=1.1309
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1308
retrieving revision 1.1309
diff -u -r1.1308 -r1.1309
--- ChangeLog 3 Jul 2014 08:27:01 -0000 1.1308
+++ ChangeLog 3 Jul 2014 17:45:26 -0000 1.1309
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1308 2014/07/03 08:27:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1309 2014/07/03 17:45:26 grobian Exp $
+
+ 03 Jul 2014; Fabian Groffen <grobian@gentoo.org> multilib-build.eclass:
+ Add some Prefix hosts to _MULTILIB_FLAGS
03 Jul 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Explain MULTILIB_COMPAT a bit more verbosely, and add a REQUIRED_USE for it.
1.62 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.61&r2=1.62
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- multilib-build.eclass 3 Jul 2014 08:27:01 -0000 1.61
+++ multilib-build.eclass 3 Jul 2014 17:45:26 -0000 1.62
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.61 2014/07/03 08:27:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.62 2014/07/03 17:45:26 grobian Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -38,13 +38,13 @@
# ensure that every *preliminary* work is done and the multilib can be
# extended safely.
_MULTILIB_FLAGS=(
- abi_x86_32:x86,x86_fbsd
- abi_x86_64:amd64,amd64_fbsd
+ abi_x86_32:x86,x86_fbsd,x86_freebsd,x86_linux,x86_macos,x86_solaris
+ abi_x86_64:amd64,amd64_fbsd,x64_freebsd,amd64_linux,x64_macos,x64_solaris
abi_x86_x32:x32
abi_mips_n32:n32
abi_mips_n64:n64
abi_mips_o32:o32
- abi_ppc_32:ppc
+ abi_ppc_32:ppc,ppc_aix,ppc_macos
abi_ppc_64:ppc64
abi_s390_32:s390
abi_s390_64:s390x
^ permalink raw reply [flat|nested] 53+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-07-03 8:27 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-07-03 8:27 UTC (permalink / raw
To: gentoo-commits
mgorny 14/07/03 08:27:01
Modified: ChangeLog multilib-build.eclass
Log:
Explain MULTILIB_COMPAT a bit more verbosely, and add a REQUIRED_USE for it.
Revision Changes Path
1.1308 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1308&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1308&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1307&r2=1.1308
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1307
retrieving revision 1.1308
diff -u -r1.1307 -r1.1308
--- ChangeLog 3 Jul 2014 07:48:49 -0000 1.1307
+++ ChangeLog 3 Jul 2014 08:27:01 -0000 1.1308
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1307 2014/07/03 07:48:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1308 2014/07/03 08:27:01 mgorny Exp $
+
+ 03 Jul 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Explain MULTILIB_COMPAT a bit more verbosely, and add a REQUIRED_USE for it.
03 Jul 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Re-enable multilib flags for s390.
1.61 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.60&r2=1.61
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- multilib-build.eclass 3 Jul 2014 07:48:49 -0000 1.60
+++ multilib-build.eclass 3 Jul 2014 08:27:01 -0000 1.61
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.60 2014/07/03 07:48:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.61 2014/07/03 08:27:01 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -58,8 +58,15 @@
#
# This variable is intended for use in prebuilt multilib packages that
# can provide binaries only for a limited set of ABIs. If ABIs need to
-# be limited due to a bug in source code, package.use.mask is
-# recommended instead.
+# be limited due to a bug in source code, package.use.mask is to be used
+# instead. Along with MULTILIB_COMPAT, KEYWORDS should contain '-*'.
+#
+# Note that setting this variable effectively disables support for all
+# other ABIs, including other architectures. For example, specifying
+# abi_x86_{32,64} disables support for MIPS as well.
+#
+# The value of MULTILIB_COMPAT determines the value of IUSE. If set, it
+# also enables REQUIRED_USE constraints.
#
# Example use:
# @CODE
@@ -114,6 +121,8 @@
local usedeps=${flags[@]/%/(-)?}
IUSE=${flags[*]}
+ REQUIRED_USE="|| ( ${flags[*]} )"
+
MULTILIB_USEDEP=${usedeps// /,}
}
_multilib_build_set_globals
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-06-29 8:32 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-06-29 8:32 UTC (permalink / raw
To: gentoo-commits
mgorny 14/06/29 08:32:46
Modified: ChangeLog multilib-build.eclass
Log:
Fix handling empty MULTILIB_COMPAT.
Revision Changes Path
1.1305 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1305&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1305&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1304&r2=1.1305
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1304
retrieving revision 1.1305
diff -u -r1.1304 -r1.1305
--- ChangeLog 29 Jun 2014 07:53:33 -0000 1.1304
+++ ChangeLog 29 Jun 2014 08:32:46 -0000 1.1305
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1304 2014/06/29 07:53:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1305 2014/06/29 08:32:46 mgorny Exp $
+
+ 29 Jun 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Fix handling empty MULTILIB_COMPAT.
29 Jun 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Check MULTILIB_COMPAT before querying USE flags. Bug #515642, thanks to Greg
1.59 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.59&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.59&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.58&r2=1.59
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- multilib-build.eclass 29 Jun 2014 07:53:33 -0000 1.58
+++ multilib-build.eclass 29 Jun 2014 08:32:46 -0000 1.59
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.58 2014/06/29 07:53:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.59 2014/06/29 08:32:46 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -154,7 +154,7 @@
# for the split is more complex than cheating like this
for m_abi in ${m_abis//,/ }; do
if [[ ${m_abi} == ${abi} ]] \
- && has "${m_flag}" "${MULTILIB_COMPAT[@]}" \
+ && { [[ ! "${MULTILIB_COMPAT[@]}" ]] || has "${m_flag}" "${MULTILIB_COMPAT[@]}"; } \
&& use "${m_flag}"
then
echo "${m_flag}.${abi}"
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-06-29 7:53 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-06-29 7:53 UTC (permalink / raw
To: gentoo-commits
mgorny 14/06/29 07:53:33
Modified: ChangeLog multilib-build.eclass
Log:
Check MULTILIB_COMPAT before querying USE flags. Bug #515642, thanks to Greg Turner.
Revision Changes Path
1.1304 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1304&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1304&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1303&r2=1.1304
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1303
retrieving revision 1.1304
diff -u -r1.1303 -r1.1304
--- ChangeLog 28 Jun 2014 09:56:25 -0000 1.1303
+++ ChangeLog 29 Jun 2014 07:53:33 -0000 1.1304
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1303 2014/06/28 09:56:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1304 2014/06/29 07:53:33 mgorny Exp $
+
+ 29 Jun 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Check MULTILIB_COMPAT before querying USE flags. Bug #515642, thanks to Greg
+ Turner.
28 Jun 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Enable multilib flags for ppc. Since ppc profiles are not multilib at the
1.58 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.57&r2=1.58
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- multilib-build.eclass 28 Jun 2014 09:56:26 -0000 1.57
+++ multilib-build.eclass 29 Jun 2014 07:53:33 -0000 1.58
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.57 2014/06/28 09:56:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.58 2014/06/29 07:53:33 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -153,7 +153,10 @@
# paludis is broken (bug #486592), and switching it locally
# for the split is more complex than cheating like this
for m_abi in ${m_abis//,/ }; do
- if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then
+ if [[ ${m_abi} == ${abi} ]] \
+ && has "${m_flag}" "${MULTILIB_COMPAT[@]}" \
+ && use "${m_flag}"
+ then
echo "${m_flag}.${abi}"
found=1
break 2
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-06-28 9:56 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-06-28 9:56 UTC (permalink / raw
To: gentoo-commits
mgorny 14/06/28 09:56:26
Modified: ChangeLog multilib-build.eclass
Log:
Enable multilib flags for ppc. Since ppc profiles are not multilib at the moment, this should not create any new issues.
Revision Changes Path
1.1303 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1303&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1303&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1302&r2=1.1303
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1302
retrieving revision 1.1303
diff -u -r1.1302 -r1.1303
--- ChangeLog 27 Jun 2014 07:26:18 -0000 1.1302
+++ ChangeLog 28 Jun 2014 09:56:25 -0000 1.1303
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1302 2014/06/27 07:26:18 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1303 2014/06/28 09:56:25 mgorny Exp $
+
+ 28 Jun 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Enable multilib flags for ppc. Since ppc profiles are not multilib at the
+ moment, this should not create any new issues.
27 Jun 2014; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
Disable QA warning on '--with-compiler' passed by 'dev-haskell/cabal' (bug
1.57 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.56&r2=1.57
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- multilib-build.eclass 8 Jun 2014 13:57:02 -0000 1.56
+++ multilib-build.eclass 28 Jun 2014 09:56:26 -0000 1.57
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.56 2014/06/08 13:57:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.57 2014/06/28 09:56:26 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -44,6 +44,8 @@
abi_mips_n32:n32
abi_mips_n64:n64
abi_mips_o32:o32
+ abi_ppc_32:ppc
+ abi_ppc_64:ppc64
)
# @ECLASS-VARIABLE: MULTILIB_COMPAT
^ permalink raw reply [flat|nested] 53+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-06-08 13:57 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-06-08 13:57 UTC (permalink / raw
To: gentoo-commits
mgorny 14/06/08 13:57:02
Modified: ChangeLog multilib-build.eclass
Log:
Work around lack of arch defines in swig, bug #509792.
Revision Changes Path
1.1283 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1283&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1283&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1282&r2=1.1283
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1282
retrieving revision 1.1283
diff -u -r1.1282 -r1.1283
--- ChangeLog 7 Jun 2014 10:28:16 -0000 1.1282
+++ ChangeLog 8 Jun 2014 13:57:02 -0000 1.1283
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1282 2014/06/07 10:28:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1283 2014/06/08 13:57:02 mgorny Exp $
+
+ 08 Jun 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Work around lack of arch defines in swig, bug #509792.
07 Jun 2014; Ulrich Müller <ulm@gentoo.org> elisp.eclass:
Increase minimum Emacs version to 23, versions 21 and 22 have been removed.
1.56 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.55&r2=1.56
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- multilib-build.eclass 28 May 2014 18:53:20 -0000 1.55
+++ multilib-build.eclass 8 Jun 2014 13:57:02 -0000 1.56
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.55 2014/05/28 18:53:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.56 2014/06/08 13:57:02 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -476,6 +476,8 @@
# else
# error "abi_ppc_32 not supported by the package."
# endif
+#elif defined(SWIG) /* https://sourceforge.net/p/swig/bugs/799/ */
+# error "Native ABI not supported by the package."
#else
# error "No ABI matched, please report a bug to bugs.gentoo.org"
#endif
@@ -502,6 +504,12 @@
sed -e "/abi_x86_32 /s&error.*&include <${CHOST}${f}>&" \
-i "${wrapper}" || die
fi
+
+ # Needed for swig.
+ if multilib_is_native_abi; then
+ sed -e "/Native ABI/s&error.*&include <${CHOST}${f}>&" \
+ -i "${wrapper}" || die
+ fi
fi
done
fi
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-05-28 18:53 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-05-28 18:53 UTC (permalink / raw
To: gentoo-commits
mgorny 14/05/28 18:53:20
Modified: ChangeLog multilib-build.eclass
Log:
Fix ABI flag stripping in multilib_get_enabled_abis(), bug #511682.
Revision Changes Path
1.1277 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1277&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1277&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1276&r2=1.1277
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1276
retrieving revision 1.1277
diff -u -r1.1276 -r1.1277
--- ChangeLog 28 May 2014 09:48:01 -0000 1.1276
+++ ChangeLog 28 May 2014 18:53:20 -0000 1.1277
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1276 2014/05/28 09:48:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1277 2014/05/28 18:53:20 mgorny Exp $
+
+ 28 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Fix ABI flag stripping in multilib_get_enabled_abis(), bug #511682.
28 May 2014; Justin Lecher <jlec@gentoo.org> portability.eclass:
Add documentation for man page; add missing die
1.55 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.54&r2=1.55
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- multilib-build.eclass 23 May 2014 17:11:10 -0000 1.54
+++ multilib-build.eclass 28 May 2014 18:53:20 -0000 1.55
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.54 2014/05/23 17:11:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.55 2014/05/28 18:53:20 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -125,7 +125,7 @@
debug-print-function ${FUNCNAME} "${@}"
local pairs=( $(multilib_get_enabled_abi_pairs) )
- echo "${pairs[@]#*:}"
+ echo "${pairs[@]#*.}"
}
# @FUNCTION: multilib_get_enabled_abi_pairs
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-05-23 17:11 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-05-23 17:11 UTC (permalink / raw
To: gentoo-commits
mgorny 14/05/23 17:11:10
Modified: ChangeLog multilib-build.eclass
Log:
Change ABI-flag separator from ":" to "." to avoid issues with Makefile rules and PATH separator.
Revision Changes Path
1.1271 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1271&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1271&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1270&r2=1.1271
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1270
retrieving revision 1.1271
diff -u -r1.1270 -r1.1271
--- ChangeLog 23 May 2014 07:53:22 -0000 1.1270
+++ ChangeLog 23 May 2014 17:11:10 -0000 1.1271
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1270 2014/05/23 07:53:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1271 2014/05/23 17:11:10 mgorny Exp $
+
+ 23 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Change ABI-flag separator from ":" to "." to avoid issues with Makefile rules
+ and PATH separator.
23 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Add remaining potential multilib arches to header wrapping template.
1.54 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.53&r2=1.54
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- multilib-build.eclass 23 May 2014 07:53:22 -0000 1.53
+++ multilib-build.eclass 23 May 2014 17:11:10 -0000 1.54
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.53 2014/05/23 07:53:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.54 2014/05/23 17:11:10 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -130,7 +130,7 @@
# @FUNCTION: multilib_get_enabled_abi_pairs
# @DESCRIPTION:
-# Return the ordered list of enabled <use-flag>:<ABI> pairs
+# Return the ordered list of enabled <use-flag>.<ABI> pairs
# if multilib builds are enabled. The best (most preferred)
# ABI will come last.
#
@@ -152,7 +152,7 @@
# for the split is more complex than cheating like this
for m_abi in ${m_abis//,/ }; do
if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then
- echo "${m_flag}:${abi}"
+ echo "${m_flag}.${abi}"
found=1
break 2
fi
@@ -167,7 +167,7 @@
debug-print "${FUNCNAME}: no ABIs enabled, fallback to ${abi}"
debug-print "${FUNCNAME}: ABI=${ABI}, DEFAULT_ABI=${DEFAULT_ABI}"
- echo ":${abi}"
+ echo ".${abi}"
fi
}
@@ -179,8 +179,8 @@
_multilib_multibuild_wrapper() {
debug-print-function ${FUNCNAME} "${@}"
- local ABI=${MULTIBUILD_VARIANT#*:}
- local MULTILIB_ABI_FLAG=${MULTIBUILD_VARIANT%:*}
+ local ABI=${MULTIBUILD_VARIANT#*.}
+ local MULTILIB_ABI_FLAG=${MULTIBUILD_VARIANT%.*}
multilib_toolchain_setup "${ABI}"
"${@}"
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-05-23 7:53 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-05-23 7:53 UTC (permalink / raw
To: gentoo-commits
mgorny 14/05/23 07:53:22
Modified: ChangeLog multilib-build.eclass
Log:
Add remaining potential multilib arches to header wrapping template.
Revision Changes Path
1.1270 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1270&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1270&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1269&r2=1.1270
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1269
retrieving revision 1.1270
diff -u -r1.1269 -r1.1270
--- ChangeLog 23 May 2014 07:47:39 -0000 1.1269
+++ ChangeLog 23 May 2014 07:53:22 -0000 1.1270
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1269 2014/05/23 07:47:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1270 2014/05/23 07:53:22 mgorny Exp $
+
+ 23 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Add remaining potential multilib arches to header wrapping template.
23 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Use MULTILIB_ABI_FLAG for header wrapping. Also, use explicit error when ABI
1.53 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.52&r2=1.53
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- multilib-build.eclass 23 May 2014 07:47:39 -0000 1.52
+++ multilib-build.eclass 23 May 2014 07:53:22 -0000 1.53
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.52 2014/05/23 07:47:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.53 2014/05/23 07:53:22 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -458,6 +458,24 @@
# elif(_MIPS_SIM == _ABIO32) /* o32 */
# error "abi_mips_o32 not supported by the package."
# endif
+#elif defined(__sparc__)
+# if defined(__arch64__)
+# error "abi_sparc_64 not supported by the package."
+# else
+# error "abi_sparc_32 not supported by the package."
+# endif
+#elif defined(__s390__)
+# if defined(__s390x__)
+# error "abi_s390_64 not supported by the package."
+# else
+# error "abi_s390_32 not supported by the package."
+# endif
+#elif defined(__powerpc__)
+# if defined(__powerpc64__)
+# error "abi_ppc_64 not supported by the package."
+# else
+# error "abi_ppc_32 not supported by the package."
+# endif
#else
# error "No ABI matched, please report a bug to bugs.gentoo.org"
#endif
^ permalink raw reply [flat|nested] 53+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-05-23 7:47 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-05-23 7:47 UTC (permalink / raw
To: gentoo-commits
mgorny 14/05/23 07:47:40
Modified: ChangeLog multilib-build.eclass
Log:
Use MULTILIB_ABI_FLAG for header wrapping. Also, use explicit error when ABI is omitted in wrapper template.
Revision Changes Path
1.1269 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1269&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1269&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1268&r2=1.1269
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1268
retrieving revision 1.1269
diff -u -r1.1268 -r1.1269
--- ChangeLog 23 May 2014 07:39:26 -0000 1.1268
+++ ChangeLog 23 May 2014 07:47:39 -0000 1.1269
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1268 2014/05/23 07:39:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1269 2014/05/23 07:47:39 mgorny Exp $
+
+ 23 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Use MULTILIB_ABI_FLAG for header wrapping. Also, use explicit error when ABI
+ is omitted in wrapper template.
23 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Deprecate multilib_for_best_abi() to decrease confusion.
1.52 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.51&r2=1.52
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- multilib-build.eclass 23 May 2014 07:39:26 -0000 1.51
+++ multilib-build.eclass 23 May 2014 07:47:39 -0000 1.52
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.51 2014/05/23 07:39:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.52 2014/05/23 07:47:39 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -411,35 +411,12 @@
done
if [[ ${MULTILIB_WRAPPED_HEADERS[@]} ]]; then
- # XXX: get abi_* directly
- local abi_flag
- case "${ABI}" in
- amd64|amd64_fbsd)
- abi_flag=abi_x86_64;;
- x86|x86_fbsd)
- abi_flag=abi_x86_32;;
- x32)
- abi_flag=abi_x86_x32;;
- n32)
- abi_flag=abi_mips_n32;;
- n64)
- abi_flag=abi_mips_n64;;
- o32)
- abi_flag=abi_mips_o32;;
- esac
-
- # If abi_flag is unset, then header wrapping is unsupported
- # on this ABI. This could mean either that:
- #
- # 1) the arch doesn't support multilib at all -- in this case,
- # the headers are not wrapped and everything works as expected,
- #
- # 2) someone added new ABI and forgot to update the function --
- # in this case, the header consistency check will notice one of
- # those ABIs has an extra header (compared to the header moved
- # for wrapping) and will fail.
+ # If abi_flag is unset, then header wrapping is unsupported on
+ # this ABI. This means the arch doesn't support multilib at all
+ # -- in this case, the headers are not wrapped and everything
+ # works as expected.
- if [[ ${abi_flag} ]]; then
+ if [[ ${MULTILIB_ABI_FLAG} ]]; then
for f in "${MULTILIB_WRAPPED_HEADERS[@]}"; do
# drop leading slash if it's there
f=${f#/}
@@ -454,10 +431,12 @@
# Some ABIs may have install less files than others.
if [[ -f ${root}/usr/include${f} ]]; then
+ local wrapper=${ED}/tmp/multilib-include${f}
+
if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then
dodir "/tmp/multilib-include${dir}"
# a generic template
- cat > "${ED}/tmp/multilib-include${f}" <<_EOF_
+ cat > "${wrapper}" <<_EOF_
/* This file is auto-generated by multilib-build.eclass
* as a multilib-friendly wrapper. For the original content,
* please see the files that are #included below.
@@ -485,20 +464,25 @@
_EOF_
fi
+ if ! grep -q "${MULTILIB_ABI_FLAG} " "${wrapper}"
+ then
+ die "Flag ${MULTILIB_ABI_FLAG} not listed in wrapper template. Please report a bug to https://bugs.gentoo.org."
+ fi
+
# $CHOST shall be set by multilib_toolchain_setup
dodir "/tmp/multilib-include/${CHOST}${dir}"
mv "${root}/usr/include${f}" "${ED}/tmp/multilib-include/${CHOST}${dir}/" || die
# Note: match a space afterwards to avoid collision potential.
- sed -e "/${abi_flag} /s&error.*&include <${CHOST}${f}>&" \
- -i "${ED}/tmp/multilib-include${f}" || die
+ sed -e "/${MULTILIB_ABI_FLAG} /s&error.*&include <${CHOST}${f}>&" \
+ -i "${wrapper}" || die
# Hack for emul-linux-x86 compatibility.
# It assumes amd64 will come after x86, and will use amd64
# headers if no specific x86 headers were installed.
if [[ ${ABI} == amd64 ]]; then
sed -e "/abi_x86_32 /s&error.*&include <${CHOST}${f}>&" \
- -i "${ED}/tmp/multilib-include${f}" || die
+ -i "${wrapper}" || die
fi
fi
done
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-05-23 7:39 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-05-23 7:39 UTC (permalink / raw
To: gentoo-commits
mgorny 14/05/23 07:39:26
Modified: ChangeLog multilib-build.eclass
Log:
Deprecate multilib_for_best_abi() to decrease confusion.
Revision Changes Path
1.1268 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1268&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1268&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1267&r2=1.1268
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1267
retrieving revision 1.1268
diff -u -r1.1267 -r1.1268
--- ChangeLog 23 May 2014 07:38:36 -0000 1.1267
+++ ChangeLog 23 May 2014 07:39:26 -0000 1.1268
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1267 2014/05/23 07:38:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1268 2014/05/23 07:39:26 mgorny Exp $
+
+ 23 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Deprecate multilib_for_best_abi() to decrease confusion.
23 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Export MULTILIB_ABI_FLAG for ebuild/eclass use. Bug #509478.
1.51 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.50&r2=1.51
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- multilib-build.eclass 23 May 2014 07:38:36 -0000 1.50
+++ multilib-build.eclass 23 May 2014 07:39:26 -0000 1.51
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.50 2014/05/23 07:38:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.51 2014/05/23 07:39:26 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -228,6 +228,9 @@
multilib_for_best_abi() {
debug-print-function ${FUNCNAME} "${@}"
+ eqawarn "QA warning: multilib_for_best_abi() function is deprecated and should"
+ eqawarn "not be used. The multilib_is_native_abi() check may be used instead."
+
local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) )
multibuild_for_best_variant _multilib_multibuild_wrapper "${@}"
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-05-23 7:38 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-05-23 7:38 UTC (permalink / raw
To: gentoo-commits
mgorny 14/05/23 07:38:36
Modified: ChangeLog multilib-build.eclass
Log:
Export MULTILIB_ABI_FLAG for ebuild/eclass use. Bug #509478.
Revision Changes Path
1.1267 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1267&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1267&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1266&r2=1.1267
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1266
retrieving revision 1.1267
diff -u -r1.1266 -r1.1267
--- ChangeLog 23 May 2014 07:11:53 -0000 1.1266
+++ ChangeLog 23 May 2014 07:38:36 -0000 1.1267
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1266 2014/05/23 07:11:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1267 2014/05/23 07:38:36 mgorny Exp $
+
+ 23 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Export MULTILIB_ABI_FLAG for ebuild/eclass use. Bug #509478.
23 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Introduce multilib_get_enabled_abi_pairs() to obtain list containing both ABI
1.50 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.49&r2=1.50
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- multilib-build.eclass 23 May 2014 07:11:53 -0000 1.49
+++ multilib-build.eclass 23 May 2014 07:38:36 -0000 1.50
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.49 2014/05/23 07:11:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.50 2014/05/23 07:38:36 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -74,6 +74,24 @@
# net-libs/libbar[ssl,${MULTILIB_USEDEP}]"
# @CODE
+# @ECLASS-VARIABLE: MULTILIB_ABI_FLAG
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# The complete ABI name. Resembles the USE flag name.
+#
+# This is set within multilib_foreach_abi(),
+# multilib_parallel_foreach_abi() and multilib-minimal sub-phase
+# functions.
+#
+# It may be null (empty) when the build is done on ABI not controlled
+# by a USE flag (e.g. on non-multilib arch or when using multilib
+# portage). The build will always be done for a single ABI then.
+#
+# Example value:
+# @CODE
+# abi_x86_64
+# @CODE
+
_multilib_build_set_globals() {
local flags=( "${_MULTILIB_FLAGS[@]%:*}" )
@@ -161,7 +179,9 @@
_multilib_multibuild_wrapper() {
debug-print-function ${FUNCNAME} "${@}"
- local ABI=${MULTIBUILD_VARIANT}
+ local ABI=${MULTIBUILD_VARIANT#*:}
+ local MULTILIB_ABI_FLAG=${MULTIBUILD_VARIANT%:*}
+
multilib_toolchain_setup "${ABI}"
"${@}"
}
@@ -178,7 +198,7 @@
multilib_foreach_abi() {
debug-print-function ${FUNCNAME} "${@}"
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) )
multibuild_foreach_variant _multilib_multibuild_wrapper "${@}"
}
@@ -197,7 +217,7 @@
multilib_parallel_foreach_abi() {
debug-print-function ${FUNCNAME} "${@}"
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) )
multibuild_parallel_foreach_variant _multilib_multibuild_wrapper "${@}"
}
@@ -208,7 +228,7 @@
multilib_for_best_abi() {
debug-print-function ${FUNCNAME} "${@}"
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) )
multibuild_for_best_variant _multilib_multibuild_wrapper "${@}"
}
@@ -262,7 +282,7 @@
multilib_copy_sources() {
debug-print-function ${FUNCNAME} "${@}"
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) )
multibuild_copy_sources
}
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-05-23 7:11 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-05-23 7:11 UTC (permalink / raw
To: gentoo-commits
mgorny 14/05/23 07:11:53
Modified: ChangeLog multilib-build.eclass
Log:
Introduce multilib_get_enabled_abi_pairs() to obtain list containing both ABI values and USE flag names.
Revision Changes Path
1.1266 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1266&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1266&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1265&r2=1.1266
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1265
retrieving revision 1.1266
diff -u -r1.1265 -r1.1266
--- ChangeLog 23 May 2014 07:09:07 -0000 1.1265
+++ ChangeLog 23 May 2014 07:11:53 -0000 1.1266
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1265 2014/05/23 07:09:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1266 2014/05/23 07:11:53 mgorny Exp $
+
+ 23 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Introduce multilib_get_enabled_abi_pairs() to obtain list containing both ABI
+ values and USE flag names.
23 May 2014; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Give an explanatory error when trying to fetch https:// with
1.49 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.48&r2=1.49
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- multilib-build.eclass 12 May 2014 21:56:17 -0000 1.48
+++ multilib-build.eclass 23 May 2014 07:11:53 -0000 1.49
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.48 2014/05/12 21:56:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.49 2014/05/23 07:11:53 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -106,6 +106,21 @@
multilib_get_enabled_abis() {
debug-print-function ${FUNCNAME} "${@}"
+ local pairs=( $(multilib_get_enabled_abi_pairs) )
+ echo "${pairs[@]#*:}"
+}
+
+# @FUNCTION: multilib_get_enabled_abi_pairs
+# @DESCRIPTION:
+# Return the ordered list of enabled <use-flag>:<ABI> pairs
+# if multilib builds are enabled. The best (most preferred)
+# ABI will come last.
+#
+# If multilib is disabled, the default ABI will be returned
+# along with empty <use-flag>.
+multilib_get_enabled_abi_pairs() {
+ debug-print-function ${FUNCNAME} "${@}"
+
local abis=( $(get_all_abis) )
local abi i found
@@ -119,7 +134,7 @@
# for the split is more complex than cheating like this
for m_abi in ${m_abis//,/ }; do
if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then
- echo "${abi}"
+ echo "${m_flag}:${abi}"
found=1
break 2
fi
@@ -134,7 +149,7 @@
debug-print "${FUNCNAME}: no ABIs enabled, fallback to ${abi}"
debug-print "${FUNCNAME}: ABI=${ABI}, DEFAULT_ABI=${DEFAULT_ABI}"
- echo ${abi}
+ echo ":${abi}"
fi
}
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-05-12 21:56 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-05-12 21:56 UTC (permalink / raw
To: gentoo-commits
mgorny 14/05/12 21:56:17
Modified: ChangeLog multilib-build.eclass
Log:
Do not install wrapper headers when no ABI provides a particular header.
Revision Changes Path
1.1252 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1252&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1252&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1251&r2=1.1252
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1251
retrieving revision 1.1252
diff -u -r1.1251 -r1.1252
--- ChangeLog 12 May 2014 11:53:28 -0000 1.1251
+++ ChangeLog 12 May 2014 21:56:17 -0000 1.1252
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1251 2014/05/12 11:53:28 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1252 2014/05/12 21:56:17 mgorny Exp $
+
+ 12 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Do not install wrapper headers when no ABI provides a particular header.
12 May 2014; Michael Palimaka <kensington@gentoo.org> -boost-utils.eclass, -office-ext.eclass:
Remove last-rited eclasses.
1.48 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.47&r2=1.48
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- multilib-build.eclass 7 May 2014 17:33:49 -0000 1.47
+++ multilib-build.eclass 12 May 2014 21:56:17 -0000 1.48
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.47 2014/05/07 17:33:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.48 2014/05/12 21:56:17 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -414,10 +414,12 @@
local dir=${f%/*}
- if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then
- dodir "/tmp/multilib-include${dir}"
- # a generic template
- cat > "${ED}/tmp/multilib-include${f}" <<_EOF_
+ # Some ABIs may have install less files than others.
+ if [[ -f ${root}/usr/include${f} ]]; then
+ if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then
+ dodir "/tmp/multilib-include${dir}"
+ # a generic template
+ cat > "${ED}/tmp/multilib-include${f}" <<_EOF_
/* This file is auto-generated by multilib-build.eclass
* as a multilib-friendly wrapper. For the original content,
* please see the files that are #included below.
@@ -443,10 +445,8 @@
# error "No ABI matched, please report a bug to bugs.gentoo.org"
#endif
_EOF_
- fi
+ fi
- # Some ABIs may have install less files than others.
- if [[ -f ${root}/usr/include${f} ]]; then
# $CHOST shall be set by multilib_toolchain_setup
dodir "/tmp/multilib-include/${CHOST}${dir}"
mv "${root}/usr/include${f}" "${ED}/tmp/multilib-include/${CHOST}${dir}/" || die
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-05-07 17:33 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-05-07 17:33 UTC (permalink / raw
To: gentoo-commits
mgorny 14/05/07 17:33:49
Modified: ChangeLog multilib-build.eclass
Log:
Use amd64 headers for i686 when USE=-abi_x86_32 to maintain compatibility with current state of emul-linux. Fixes bug #509556.
Revision Changes Path
1.1242 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1242&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1242&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1241&r2=1.1242
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1241
retrieving revision 1.1242
diff -u -r1.1241 -r1.1242
--- ChangeLog 6 May 2014 20:43:44 -0000 1.1241
+++ ChangeLog 7 May 2014 17:33:49 -0000 1.1242
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1241 2014/05/06 20:43:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1242 2014/05/07 17:33:49 mgorny Exp $
+
+ 07 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Use amd64 headers for i686 when USE=-abi_x86_32 to maintain compatibility
+ with current state of emul-linux. Fixes bug #509556.
06 May 2014; Pacho Ramos <pacho@gentoo.org> emul-linux-x86.eclass:
Move headers to a separate directory, bug #509556
1.47 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.46&r2=1.47
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- multilib-build.eclass 1 May 2014 09:52:27 -0000 1.46
+++ multilib-build.eclass 7 May 2014 17:33:49 -0000 1.47
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.46 2014/05/01 09:52:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.47 2014/05/07 17:33:49 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -454,6 +454,14 @@
# Note: match a space afterwards to avoid collision potential.
sed -e "/${abi_flag} /s&error.*&include <${CHOST}${f}>&" \
-i "${ED}/tmp/multilib-include${f}" || die
+
+ # Hack for emul-linux-x86 compatibility.
+ # It assumes amd64 will come after x86, and will use amd64
+ # headers if no specific x86 headers were installed.
+ if [[ ${ABI} == amd64 ]]; then
+ sed -e "/abi_x86_32 /s&error.*&include <${CHOST}${f}>&" \
+ -i "${ED}/tmp/multilib-include${f}" || die
+ fi
fi
done
fi
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-05-01 9:52 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-05-01 9:52 UTC (permalink / raw
To: gentoo-commits
mgorny 14/05/01 09:52:27
Modified: ChangeLog multilib-build.eclass
Log:
Add MULTILIB_COMPAT to limit the supported ABIs for pre-built packages.
Revision Changes Path
1.1234 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1234&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1234&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1233&r2=1.1234
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1233
retrieving revision 1.1234
diff -u -r1.1233 -r1.1234
--- ChangeLog 30 Apr 2014 18:17:19 -0000 1.1233
+++ ChangeLog 1 May 2014 09:52:27 -0000 1.1234
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1233 2014/04/30 18:17:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1234 2014/05/01 09:52:27 mgorny Exp $
+
+ 01 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Add MULTILIB_COMPAT to limit the supported ABIs for pre-built packages.
30 Apr 2014; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass:
Update the doc and make it simpler.
1.46 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.45&r2=1.46
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- multilib-build.eclass 29 Apr 2014 20:59:41 -0000 1.45
+++ multilib-build.eclass 1 May 2014 09:52:27 -0000 1.46
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.45 2014/04/29 20:59:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.46 2014/05/01 09:52:27 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -46,6 +46,23 @@
abi_mips_o32:o32
)
+# @ECLASS-VARIABLE: MULTILIB_COMPAT
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of multilib ABIs supported by the ebuild. If unset, defaults to
+# all ABIs supported by the eclass.
+#
+# This variable is intended for use in prebuilt multilib packages that
+# can provide binaries only for a limited set of ABIs. If ABIs need to
+# be limited due to a bug in source code, package.use.mask is
+# recommended instead.
+#
+# Example use:
+# @CODE
+# # Upstream provides binaries for x86 & amd64 only
+# MULTILIB_COMPAT=( abi_x86_{32,64} )
+# @CODE
+
# @ECLASS-VARIABLE: MULTILIB_USEDEP
# @DESCRIPTION:
# The USE-dependency to be used on dependencies (libraries) needing
@@ -59,6 +76,19 @@
_multilib_build_set_globals() {
local flags=( "${_MULTILIB_FLAGS[@]%:*}" )
+
+ if [[ ${MULTILIB_COMPAT[@]} ]]; then
+ # Validate MULTILIB_COMPAT and filter out the flags.
+ local f
+ for f in "${MULTILIB_COMPAT[@]}"; do
+ if ! has "${f}" "${flags[@]}"; then
+ die "Invalid value in MULTILIB_COMPAT: ${f}"
+ fi
+ done
+
+ flags=( "${MULTILIB_COMPAT[@]}" )
+ fi
+
local usedeps=${flags[@]/%/(-)?}
IUSE=${flags[*]}
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-04-29 20:59 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-04-29 20:59 UTC (permalink / raw
To: gentoo-commits
mgorny 14/04/29 20:59:41
Modified: ChangeLog multilib-build.eclass
Log:
Disable header wrapping on unsupported ABIs.
Revision Changes Path
1.1232 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1232&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1232&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1231&r2=1.1232
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1231
retrieving revision 1.1232
diff -u -r1.1231 -r1.1232
--- ChangeLog 29 Apr 2014 20:59:00 -0000 1.1231
+++ ChangeLog 29 Apr 2014 20:59:41 -0000 1.1232
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1231 2014/04/29 20:59:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1232 2014/04/29 20:59:41 mgorny Exp $
+
+ 29 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Disable header wrapping on unsupported ABIs.
29 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Reorder the operations in multilib_prepare_wrappers for easier reading.
1.45 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.44&r2=1.45
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- multilib-build.eclass 29 Apr 2014 20:59:00 -0000 1.44
+++ multilib-build.eclass 29 Apr 2014 20:59:41 -0000 1.45
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.44 2014/04/29 20:59:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.45 2014/04/29 20:59:41 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -342,22 +342,52 @@
fi
done
- for f in "${MULTILIB_WRAPPED_HEADERS[@]}"; do
- # drop leading slash if it's there
- f=${f#/}
+ if [[ ${MULTILIB_WRAPPED_HEADERS[@]} ]]; then
+ # XXX: get abi_* directly
+ local abi_flag
+ case "${ABI}" in
+ amd64|amd64_fbsd)
+ abi_flag=abi_x86_64;;
+ x86|x86_fbsd)
+ abi_flag=abi_x86_32;;
+ x32)
+ abi_flag=abi_x86_x32;;
+ n32)
+ abi_flag=abi_mips_n32;;
+ n64)
+ abi_flag=abi_mips_n64;;
+ o32)
+ abi_flag=abi_mips_o32;;
+ esac
+
+ # If abi_flag is unset, then header wrapping is unsupported
+ # on this ABI. This could mean either that:
+ #
+ # 1) the arch doesn't support multilib at all -- in this case,
+ # the headers are not wrapped and everything works as expected,
+ #
+ # 2) someone added new ABI and forgot to update the function --
+ # in this case, the header consistency check will notice one of
+ # those ABIs has an extra header (compared to the header moved
+ # for wrapping) and will fail.
+
+ if [[ ${abi_flag} ]]; then
+ for f in "${MULTILIB_WRAPPED_HEADERS[@]}"; do
+ # drop leading slash if it's there
+ f=${f#/}
- if [[ ${f} != usr/include/* ]]; then
- die "Wrapping headers outside of /usr/include is not supported at the moment."
- fi
- # and then usr/include
- f=${f#usr/include}
+ if [[ ${f} != usr/include/* ]]; then
+ die "Wrapping headers outside of /usr/include is not supported at the moment."
+ fi
+ # and then usr/include
+ f=${f#usr/include}
- local dir=${f%/*}
+ local dir=${f%/*}
- if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then
- dodir "/tmp/multilib-include${dir}"
- # a generic template
- cat > "${ED}/tmp/multilib-include${f}" <<_EOF_
+ if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then
+ dodir "/tmp/multilib-include${dir}"
+ # a generic template
+ cat > "${ED}/tmp/multilib-include${f}" <<_EOF_
/* This file is auto-generated by multilib-build.eclass
* as a multilib-friendly wrapper. For the original content,
* please see the files that are #included below.
@@ -383,38 +413,21 @@
# error "No ABI matched, please report a bug to bugs.gentoo.org"
#endif
_EOF_
- fi
+ fi
- # Some ABIs may have install less files than others.
- if [[ -f ${root}/usr/include${f} ]]; then
- # $CHOST shall be set by multilib_toolchain_setup
- dodir "/tmp/multilib-include/${CHOST}${dir}"
- mv "${root}/usr/include${f}" "${ED}/tmp/multilib-include/${CHOST}${dir}/" || die
-
- # XXX: get abi_* directly
- local abi_flag
- case "${ABI}" in
- amd64|amd64_fbsd)
- abi_flag=abi_x86_64;;
- x86|x86_fbsd)
- abi_flag=abi_x86_32;;
- x32)
- abi_flag=abi_x86_x32;;
- n32)
- abi_flag=abi_mips_n32;;
- n64)
- abi_flag=abi_mips_n64;;
- o32)
- abi_flag=abi_mips_o32;;
- *)
- die "Header wrapping for ${ABI} not supported yet";;
- esac
-
- # Note: match a space afterwards to avoid collision potential.
- sed -e "/${abi_flag} /s&error.*&include <${CHOST}${f}>&" \
- -i "${ED}/tmp/multilib-include${f}" || die
+ # Some ABIs may have install less files than others.
+ if [[ -f ${root}/usr/include${f} ]]; then
+ # $CHOST shall be set by multilib_toolchain_setup
+ dodir "/tmp/multilib-include/${CHOST}${dir}"
+ mv "${root}/usr/include${f}" "${ED}/tmp/multilib-include/${CHOST}${dir}/" || die
+
+ # Note: match a space afterwards to avoid collision potential.
+ sed -e "/${abi_flag} /s&error.*&include <${CHOST}${f}>&" \
+ -i "${ED}/tmp/multilib-include${f}" || die
+ fi
+ done
fi
- done
+ fi
}
# @FUNCTION: multilib_install_wrappers
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-04-29 20:59 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-04-29 20:59 UTC (permalink / raw
To: gentoo-commits
mgorny 14/04/29 20:59:00
Modified: ChangeLog multilib-build.eclass
Log:
Reorder the operations in multilib_prepare_wrappers for easier reading.
Revision Changes Path
1.1231 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1231&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1231&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1230&r2=1.1231
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1230
retrieving revision 1.1231
diff -u -r1.1230 -r1.1231
--- ChangeLog 29 Apr 2014 20:57:28 -0000 1.1230
+++ ChangeLog 29 Apr 2014 20:59:00 -0000 1.1231
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1230 2014/04/29 20:57:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1231 2014/04/29 20:59:00 mgorny Exp $
+
+ 29 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Reorder the operations in multilib_prepare_wrappers for easier reading.
29 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Create ${CHOST}-prefixed tool symlinks for multilib portage, to gain better
1.44 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.43&r2=1.44
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- multilib-build.eclass 29 Apr 2014 20:57:28 -0000 1.43
+++ multilib-build.eclass 29 Apr 2014 20:59:00 -0000 1.44
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.43 2014/04/29 20:57:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.44 2014/04/29 20:59:00 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -315,6 +315,33 @@
return
fi
+ for f in "${MULTILIB_CHOST_TOOLS[@]}"; do
+ # drop leading slash if it's there
+ f=${f#/}
+
+ local dir=${f%/*}
+ local fn=${f##*/}
+
+ if [[ -L ${root}/${f} ]]; then
+ # rewrite the symlink target
+ local target=$(readlink "${root}/${f}")
+ local target_dir
+ local target_fn=${target##*/}
+
+ [[ ${target} == */* ]] && target_dir=${target%/*}
+
+ ln -f -s "${target_dir+${target_dir}/}${CHOST}-${target_fn}" \
+ "${root}/${f}" || die
+ fi
+
+ mv "${root}/${f}" "${root}/${dir}/${CHOST}-${fn}" || die
+
+ # symlink the native one back
+ if multilib_is_native_abi; then
+ ln -s "${CHOST}-${fn}" "${root}/${f}" || die
+ fi
+ done
+
for f in "${MULTILIB_WRAPPED_HEADERS[@]}"; do
# drop leading slash if it's there
f=${f#/}
@@ -388,33 +415,6 @@
-i "${ED}/tmp/multilib-include${f}" || die
fi
done
-
- for f in "${MULTILIB_CHOST_TOOLS[@]}"; do
- # drop leading slash if it's there
- f=${f#/}
-
- local dir=${f%/*}
- local fn=${f##*/}
-
- if [[ -L ${root}/${f} ]]; then
- # rewrite the symlink target
- local target=$(readlink "${root}/${f}")
- local target_dir
- local target_fn=${target##*/}
-
- [[ ${target} == */* ]] && target_dir=${target%/*}
-
- ln -f -s "${target_dir+${target_dir}/}${CHOST}-${target_fn}" \
- "${root}/${f}" || die
- fi
-
- mv "${root}/${f}" "${root}/${dir}/${CHOST}-${fn}" || die
-
- # symlink the native one back
- if multilib_is_native_abi; then
- ln -s "${CHOST}-${fn}" "${root}/${f}" || die
- fi
- done
}
# @FUNCTION: multilib_install_wrappers
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-04-29 20:57 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-04-29 20:57 UTC (permalink / raw
To: gentoo-commits
mgorny 14/04/29 20:57:28
Modified: ChangeLog multilib-build.eclass
Log:
Create ${CHOST}-prefixed tool symlinks for multilib portage, to gain better compatibility with plain multilib.
Revision Changes Path
1.1230 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1230&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1230&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1229&r2=1.1230
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1229
retrieving revision 1.1230
diff -u -r1.1229 -r1.1230
--- ChangeLog 29 Apr 2014 20:56:46 -0000 1.1229
+++ ChangeLog 29 Apr 2014 20:57:28 -0000 1.1230
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1229 2014/04/29 20:56:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1230 2014/04/29 20:57:28 mgorny Exp $
+
+ 29 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Create ${CHOST}-prefixed tool symlinks for multilib portage, to gain better
+ compatibility with plain multilib.
29 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Disable wrappers for multilib portage only. Enable them in non-multilib
1.43 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.42&r2=1.43
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- multilib-build.eclass 29 Apr 2014 20:56:46 -0000 1.42
+++ multilib-build.eclass 29 Apr 2014 20:57:28 -0000 1.43
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.42 2014/04/29 20:56:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.43 2014/04/29 20:57:28 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -295,11 +295,26 @@
[[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments"
- [[ ${COMPLETE_MULTILIB} == yes ]] && return
-
local root=${1:-${ED}}
local f
+ if [[ ${COMPLETE_MULTILIB} == yes ]]; then
+ # symlink '${CHOST}-foo -> foo' to support abi-wrapper while
+ # keeping ${CHOST}-foo calls correct.
+
+ for f in "${MULTILIB_CHOST_TOOLS[@]}"; do
+ # drop leading slash if it's there
+ f=${f#/}
+
+ local dir=${f%/*}
+ local fn=${f##*/}
+
+ ln -s "${fn}" "${root}/${dir}/${CHOST}-${fn}" || die
+ done
+
+ return
+ fi
+
for f in "${MULTILIB_WRAPPED_HEADERS[@]}"; do
# drop leading slash if it's there
f=${f#/}
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-04-29 20:56 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-04-29 20:56 UTC (permalink / raw
To: gentoo-commits
mgorny 14/04/29 20:56:46
Modified: ChangeLog multilib-build.eclass
Log:
Disable wrappers for multilib portage only. Enable them in non-multilib profiles for consistency.
Revision Changes Path
1.1229 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1229&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1229&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1228&r2=1.1229
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1228
retrieving revision 1.1229
diff -u -r1.1228 -r1.1229
--- ChangeLog 29 Apr 2014 20:54:54 -0000 1.1228
+++ ChangeLog 29 Apr 2014 20:56:46 -0000 1.1229
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1228 2014/04/29 20:54:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1229 2014/04/29 20:56:46 mgorny Exp $
+
+ 29 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Disable wrappers for multilib portage only. Enable them in non-multilib
+ profiles for consistency.
29 Apr 2014; Michał Górny <mgorny@gentoo.org> cmake-multilib.eclass,
multilib-build.eclass, multilib-minimal.eclass:
1.42 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.41&r2=1.42
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- multilib-build.eclass 29 Apr 2014 20:54:54 -0000 1.41
+++ multilib-build.eclass 29 Apr 2014 20:56:46 -0000 1.42
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.41 2014/04/29 20:54:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.42 2014/04/29 20:56:46 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -295,7 +295,7 @@
[[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments"
- [[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return
+ [[ ${COMPLETE_MULTILIB} == yes ]] && return
local root=${1:-${ED}}
local f
@@ -421,7 +421,7 @@
[[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments"
- [[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return
+ [[ ${COMPLETE_MULTILIB} == yes ]] && return
local root=${1:-${ED}}
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-04-28 17:38 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-04-28 17:38 UTC (permalink / raw
To: gentoo-commits
mgorny 14/04/28 17:38:22
Modified: ChangeLog multilib-build.eclass
Log:
Deprecate multilib_build_binaries, and switch the code to use multilib_is_native_abi.
Revision Changes Path
1.1227 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1227&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1227&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1226&r2=1.1227
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1226
retrieving revision 1.1227
diff -u -r1.1226 -r1.1227
--- ChangeLog 26 Apr 2014 05:13:24 -0000 1.1226
+++ ChangeLog 28 Apr 2014 17:38:21 -0000 1.1227
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1226 2014/04/26 05:13:24 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1227 2014/04/28 17:38:21 mgorny Exp $
+
+ 28 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Deprecate multilib_build_binaries, and switch the code to use
+ multilib_is_native_abi.
26 Apr 2014; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-plugin.eclass:
vdr-plugin.eclass removed, see #497058, #489116
1.40 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.39&r2=1.40
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- multilib-build.eclass 22 Apr 2014 20:12:53 -0000 1.39
+++ multilib-build.eclass 28 Apr 2014 17:38:21 -0000 1.40
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.39 2014/04/22 20:12:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.40 2014/04/28 17:38:21 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -394,7 +394,7 @@
mv "${root}/${f}" "${root}/${dir}/${CHOST}-${fn}" || die
# symlink the native one back
- if multilib_build_binaries; then
+ if multilib_is_native_abi; then
ln -s "${CHOST}-${fn}" "${root}/${f}" || die
fi
done
@@ -439,7 +439,9 @@
multilib_is_native_abi() {
debug-print-function ${FUNCNAME} "${@}"
- multilib_build_binaries "${@}"
+ [[ ${#} -eq 0 ]] || die "${FUNCNAME}: too many arguments"
+
+ [[ ${COMPLETE_MULTILIB} == yes || ${ABI} == ${DEFAULT_ABI} ]]
}
# @FUNCTION: multilib_build_binaries
@@ -455,20 +457,21 @@
multilib_build_binaries() {
debug-print-function ${FUNCNAME} "${@}"
- [[ ${#} -eq 0 ]] || die "${FUNCNAME}: too many arguments"
+ eqawarn "QA warning: multilib_build_binaries is deprecated. Please use the equivalent"
+ eqawarn "multilib_is_native_abi function instead."
- [[ ${COMPLETE_MULTILIB} == yes || ${ABI} == ${DEFAULT_ABI} ]]
+ multilib_is_native_abi "${@}"
}
# @FUNCTION: multilib_native_use_with
# @USAGE: <flag> [<opt-name> [<opt-value>]]
# @DESCRIPTION:
# Output --with configure option alike use_with if USE <flag> is enabled
-# and executables are being built (multilib_build_binaries is true).
+# and executables are being built (multilib_is_native_abi is true).
# Otherwise, outputs --without configure option. Arguments are the same
# as for use_with in the EAPI.
multilib_native_use_with() {
- if multilib_build_binaries; then
+ if multilib_is_native_abi; then
use_with "${@}"
else
echo "--without-${2:-${1}}"
@@ -479,11 +482,11 @@
# @USAGE: <flag> [<opt-name> [<opt-value>]]
# @DESCRIPTION:
# Output --enable configure option alike use_with if USE <flag>
-# is enabled and executables are being built (multilib_build_binaries
+# is enabled and executables are being built (multilib_is_native_abi
# is true). Otherwise, outputs --disable configure option. Arguments are
# the same as for use_enable in the EAPI.
multilib_native_use_enable() {
- if multilib_build_binaries; then
+ if multilib_is_native_abi; then
use_enable "${@}"
else
echo "--disable-${2:-${1}}"
@@ -495,13 +498,13 @@
# @DESCRIPTION:
# Output the concatenation of <true1> (or 'yes' if unspecified)
# and <true2> if USE <flag> is enabled and executables are being built
-# (multilib_build_binaries is true). Otherwise, output the concatenation
+# (multilib_is_native_abi is true). Otherwise, output the concatenation
# of <false1> (or 'no' if unspecified) and <false2>. Arguments
# are the same as for usex in the EAPI.
#
# Note: in EAPI 4 you need to inherit eutils to use this function.
multilib_native_usex() {
- if multilib_build_binaries; then
+ if multilib_is_native_abi; then
usex "${@}"
else
echo "${3-no}${5}"
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-04-22 20:12 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-04-22 20:12 UTC (permalink / raw
To: gentoo-commits
mgorny 14/04/22 20:12:53
Modified: ChangeLog multilib-build.eclass
Log:
Remove the QA warning from multilib_is_native_abi() till we decide which one to keep actually.
Revision Changes Path
1.1222 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1222&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1222&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1221&r2=1.1222
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1221
retrieving revision 1.1222
diff -u -r1.1221 -r1.1222
--- ChangeLog 22 Apr 2014 02:00:28 -0000 1.1221
+++ ChangeLog 22 Apr 2014 20:12:53 -0000 1.1222
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1221 2014/04/22 02:00:28 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1222 2014/04/22 20:12:53 mgorny Exp $
+
+ 22 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Remove the QA warning from multilib_is_native_abi() till we decide which one
+ to keep actually.
22 Apr 2014; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
mysql-cmake.eclass, mysql-v2.eclass:
1.39 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.38&r2=1.39
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- multilib-build.eclass 21 Apr 2014 07:58:10 -0000 1.38
+++ multilib-build.eclass 22 Apr 2014 20:12:53 -0000 1.39
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.38 2014/04/21 07:58:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.39 2014/04/22 20:12:53 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -439,9 +439,6 @@
multilib_is_native_abi() {
debug-print-function ${FUNCNAME} "${@}"
- eqawarn "QA warning: multilib_is_native_abi() is deprecated,"
- eqawarn "please use multilib_build_binaries instead."
-
multilib_build_binaries "${@}"
}
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-04-21 7:58 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-04-21 7:58 UTC (permalink / raw
To: gentoo-commits
mgorny 14/04/21 07:58:10
Modified: ChangeLog multilib-build.eclass
Log:
Add a QA warning to multilib_is_native_abi.
Revision Changes Path
1.1218 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1218&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1218&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1217&r2=1.1218
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1217
retrieving revision 1.1218
diff -u -r1.1217 -r1.1218
--- ChangeLog 21 Apr 2014 07:27:53 -0000 1.1217
+++ ChangeLog 21 Apr 2014 07:58:10 -0000 1.1218
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1217 2014/04/21 07:27:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1218 2014/04/21 07:58:10 mgorny Exp $
+
+ 21 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Add a QA warning to multilib_is_native_abi.
21 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
...and make multilib_build_binaries stand-alone.
1.38 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.37&r2=1.38
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- multilib-build.eclass 21 Apr 2014 07:27:53 -0000 1.37
+++ multilib-build.eclass 21 Apr 2014 07:58:10 -0000 1.38
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.37 2014/04/21 07:27:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.38 2014/04/21 07:58:10 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -439,6 +439,9 @@
multilib_is_native_abi() {
debug-print-function ${FUNCNAME} "${@}"
+ eqawarn "QA warning: multilib_is_native_abi() is deprecated,"
+ eqawarn "please use multilib_build_binaries instead."
+
multilib_build_binaries "${@}"
}
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-04-21 7:27 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-04-21 7:27 UTC (permalink / raw
To: gentoo-commits
mgorny 14/04/21 07:27:54
Modified: ChangeLog multilib-build.eclass
Log:
...and make multilib_build_binaries stand-alone.
Revision Changes Path
1.1217 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1217&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1217&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1216&r2=1.1217
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1216
retrieving revision 1.1217
diff -u -r1.1216 -r1.1217
--- ChangeLog 21 Apr 2014 07:22:17 -0000 1.1216
+++ ChangeLog 21 Apr 2014 07:27:53 -0000 1.1217
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1216 2014/04/21 07:22:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1217 2014/04/21 07:27:53 mgorny Exp $
+
+ 21 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ ...and make multilib_build_binaries stand-alone.
21 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Make multilib_is_native_abi equivalent to multilib_build_binaries, until all
1.37 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.36&r2=1.37
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- multilib-build.eclass 21 Apr 2014 07:22:17 -0000 1.36
+++ multilib-build.eclass 21 Apr 2014 07:27:53 -0000 1.37
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.36 2014/04/21 07:22:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.37 2014/04/21 07:27:53 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -457,7 +457,7 @@
[[ ${#} -eq 0 ]] || die "${FUNCNAME}: too many arguments"
- [[ ${COMPLETE_MULTILIB} == yes ]] || multilib_is_native_abi
+ [[ ${COMPLETE_MULTILIB} == yes || ${ABI} == ${DEFAULT_ABI} ]]
}
# @FUNCTION: multilib_native_use_with
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-04-21 7:22 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-04-21 7:22 UTC (permalink / raw
To: gentoo-commits
mgorny 14/04/21 07:22:17
Modified: ChangeLog multilib-build.eclass
Log:
Make multilib_is_native_abi equivalent to multilib_build_binaries, until all ebuilds are fixed.
Revision Changes Path
1.1216 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1216&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1216&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1215&r2=1.1216
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1215
retrieving revision 1.1216
diff -u -r1.1215 -r1.1216
--- ChangeLog 21 Apr 2014 07:17:55 -0000 1.1215
+++ ChangeLog 21 Apr 2014 07:22:17 -0000 1.1216
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1215 2014/04/21 07:17:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1216 2014/04/21 07:22:17 mgorny Exp $
+
+ 21 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Make multilib_is_native_abi equivalent to multilib_build_binaries, until all
+ ebuilds are fixed.
21 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Introduce extra multilib_native_use* wrappers encapulsating
1.36 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.35&r2=1.36
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- multilib-build.eclass 21 Apr 2014 07:17:55 -0000 1.35
+++ multilib-build.eclass 21 Apr 2014 07:22:17 -0000 1.36
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.35 2014/04/21 07:17:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.36 2014/04/21 07:22:17 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -439,9 +439,7 @@
multilib_is_native_abi() {
debug-print-function ${FUNCNAME} "${@}"
- [[ ${#} -eq 0 ]] || die "${FUNCNAME}: too many arguments"
-
- [[ ${ABI} == ${DEFAULT_ABI} ]]
+ multilib_build_binaries "${@}"
}
# @FUNCTION: multilib_build_binaries
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-04-21 7:17 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-04-21 7:17 UTC (permalink / raw
To: gentoo-commits
mgorny 14/04/21 07:17:55
Modified: ChangeLog multilib-build.eclass
Log:
Introduce extra multilib_native_use* wrappers encapulsating multilib_build_binaries & use* functions.
Revision Changes Path
1.1215 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1215&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1215&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1214&r2=1.1215
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1214
retrieving revision 1.1215
diff -u -r1.1214 -r1.1215
--- ChangeLog 21 Apr 2014 00:08:15 -0000 1.1214
+++ ChangeLog 21 Apr 2014 07:17:55 -0000 1.1215
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1214 2014/04/21 00:08:15 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1215 2014/04/21 07:17:55 mgorny Exp $
+
+ 21 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Introduce extra multilib_native_use* wrappers encapulsating
+ multilib_build_binaries & use* functions.
21 Apr 2014; Michael Pagano <mpagano@gentoo.org> kernel-2.eclass:
Update 3.15-rcX temporary fix. See bug #507656.
1.35 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.34&r2=1.35
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- multilib-build.eclass 3 Apr 2014 22:09:36 -0000 1.34
+++ multilib-build.eclass 21 Apr 2014 07:17:55 -0000 1.35
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.34 2014/04/03 22:09:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.35 2014/04/21 07:17:55 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -462,5 +462,53 @@
[[ ${COMPLETE_MULTILIB} == yes ]] || multilib_is_native_abi
}
+# @FUNCTION: multilib_native_use_with
+# @USAGE: <flag> [<opt-name> [<opt-value>]]
+# @DESCRIPTION:
+# Output --with configure option alike use_with if USE <flag> is enabled
+# and executables are being built (multilib_build_binaries is true).
+# Otherwise, outputs --without configure option. Arguments are the same
+# as for use_with in the EAPI.
+multilib_native_use_with() {
+ if multilib_build_binaries; then
+ use_with "${@}"
+ else
+ echo "--without-${2:-${1}}"
+ fi
+}
+
+# @FUNCTION: multilib_native_use_enable
+# @USAGE: <flag> [<opt-name> [<opt-value>]]
+# @DESCRIPTION:
+# Output --enable configure option alike use_with if USE <flag>
+# is enabled and executables are being built (multilib_build_binaries
+# is true). Otherwise, outputs --disable configure option. Arguments are
+# the same as for use_enable in the EAPI.
+multilib_native_use_enable() {
+ if multilib_build_binaries; then
+ use_enable "${@}"
+ else
+ echo "--disable-${2:-${1}}"
+ fi
+}
+
+# @FUNCTION: multilib_native_usex
+# @USAGE: <flag> [<true1> [<false1> [<true2> [<false2>]]]]
+# @DESCRIPTION:
+# Output the concatenation of <true1> (or 'yes' if unspecified)
+# and <true2> if USE <flag> is enabled and executables are being built
+# (multilib_build_binaries is true). Otherwise, output the concatenation
+# of <false1> (or 'no' if unspecified) and <false2>. Arguments
+# are the same as for usex in the EAPI.
+#
+# Note: in EAPI 4 you need to inherit eutils to use this function.
+multilib_native_usex() {
+ if multilib_build_binaries; then
+ usex "${@}"
+ else
+ echo "${3-no}${5}"
+ fi
+}
+
_MULTILIB_BUILD=1
fi
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-04-03 21:38 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-04-03 21:38 UTC (permalink / raw
To: gentoo-commits
mgorny 14/04/03 21:38:08
Modified: ChangeLog multilib-build.eclass
Log:
Add a note not to add new ABIs without contacting multilib.
Revision Changes Path
1.1194 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1194&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1194&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1193&r2=1.1194
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1193
retrieving revision 1.1194
diff -u -r1.1193 -r1.1194
--- ChangeLog 3 Apr 2014 21:32:56 -0000 1.1193
+++ ChangeLog 3 Apr 2014 21:38:08 -0000 1.1194
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1193 2014/04/03 21:32:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1194 2014/04/03 21:38:08 mgorny Exp $
+
+ 03 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Add a note not to add new ABIs without contacting multilib.
03 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Revert incomplete and broken s390 support. Please finally contact multilib
1.33 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.32&r2=1.33
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- multilib-build.eclass 3 Apr 2014 21:32:56 -0000 1.32
+++ multilib-build.eclass 3 Apr 2014 21:38:08 -0000 1.33
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.32 2014/04/03 21:32:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.33 2014/04/03 21:38:08 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -31,6 +31,10 @@
# The list of multilib flags and corresponding ABI values. If the same
# flag is reused for multiple ABIs (e.g. x86 on Linux&FreeBSD), multiple
# ABIs may be separated by commas.
+#
+# Please contact multilib before modifying this list. This way we can
+# ensure that every *preliminary* work is done and the multilib can be
+# extended safely.
_MULTILIB_FLAGS=(
abi_x86_32:x86,x86_fbsd
abi_x86_64:amd64,amd64_fbsd
^ permalink raw reply [flat|nested] 53+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-04-03 21:32 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-04-03 21:32 UTC (permalink / raw
To: gentoo-commits
mgorny 14/04/03 21:32:56
Modified: ChangeLog multilib-build.eclass
Log:
Revert incomplete and broken s390 support. Please finally contact multilib before playing with this.
Revision Changes Path
1.1193 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1193&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1193&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1192&r2=1.1193
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1192
retrieving revision 1.1193
diff -u -r1.1192 -r1.1193
--- ChangeLog 1 Apr 2014 15:22:40 -0000 1.1192
+++ ChangeLog 3 Apr 2014 21:32:56 -0000 1.1193
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1192 2014/04/01 15:22:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1193 2014/04/03 21:32:56 mgorny Exp $
+
+ 03 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Revert incomplete and broken s390 support. Please finally contact multilib
+ before playing with this.
01 Apr 2014; Michał Górny <mgorny@gentoo.org> tests/python-utils-r1.sh:
Add slot op to expected PyPy dependency string.
1.32 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.31&r2=1.32
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- multilib-build.eclass 3 Apr 2014 17:00:00 -0000 1.31
+++ multilib-build.eclass 3 Apr 2014 21:32:56 -0000 1.32
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.31 2014/04/03 17:00:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.32 2014/04/03 21:32:56 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -38,8 +38,6 @@
abi_mips_n32:n32
abi_mips_n64:n64
abi_mips_o32:o32
- abi_s390_32:s390
- abi_s390_64:s390x
)
# @ECLASS-VARIABLE: MULTILIB_USEDEP
^ permalink raw reply [flat|nested] 53+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-03-31 15:32 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-03-31 15:32 UTC (permalink / raw
To: gentoo-commits
mgorny 14/03/31 15:32:22
Modified: ChangeLog multilib-build.eclass
Log:
Revert the introduction of ABI_PPC due to a lot of breakage, bug #506298 to track it.
Revision Changes Path
1.1190 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1190&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1190&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1189&r2=1.1190
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1189
retrieving revision 1.1190
diff -u -r1.1189 -r1.1190
--- ChangeLog 30 Mar 2014 09:14:56 -0000 1.1189
+++ ChangeLog 31 Mar 2014 15:32:22 -0000 1.1190
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1189 2014/03/30 09:14:56 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1190 2014/03/31 15:32:22 mgorny Exp $
+
+ 31 Mar 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Revert the introduction of ABI_PPC due to a lot of breakage, bug #506298 to
+ track it.
30 Mar 2014; Sven Vermeulen <swift@gentoo.org> selinux-policy-2.eclass:
Add support for USE triggered policy decisions
1.30 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.29&r2=1.30
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- multilib-build.eclass 30 Mar 2014 08:41:53 -0000 1.29
+++ multilib-build.eclass 31 Mar 2014 15:32:22 -0000 1.30
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.29 2014/03/30 08:41:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.30 2014/03/31 15:32:22 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -38,8 +38,6 @@
abi_mips_n32:n32
abi_mips_n64:n64
abi_mips_o32:o32
- abi_ppc_32:ppc
- abi_ppc_64:ppc64
)
# @ECLASS-VARIABLE: MULTILIB_USEDEP
@@ -358,10 +356,6 @@
abi_flag=abi_mips_n64;;
o32)
abi_flag=abi_mips_o32;;
- ppc)
- abi_flag=abi_ppc_32;;
- ppc64)
- abi_flag=abi_ppc_64;;
*)
die "Header wrapping for ${ABI} not supported yet";;
esac
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-03-30 8:41 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-03-30 8:41 UTC (permalink / raw
To: gentoo-commits
mgorny 14/03/30 08:41:53
Modified: ChangeLog multilib-build.eclass
Log:
Support rewriting symlinks in MULTILIB_CHOST_TOOLS, bug #506062.
Revision Changes Path
1.1187 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1187&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1187&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1186&r2=1.1187
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1186
retrieving revision 1.1187
diff -u -r1.1186 -r1.1187
--- ChangeLog 29 Mar 2014 16:06:44 -0000 1.1186
+++ ChangeLog 30 Mar 2014 08:41:53 -0000 1.1187
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1186 2014/03/29 16:06:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1187 2014/03/30 08:41:53 mgorny Exp $
+
+ 30 Mar 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Support rewriting symlinks in MULTILIB_CHOST_TOOLS, bug #506062.
29 Mar 2014; Ulrich Müller <ulm@gentoo.org> check-reqs.eclass:
Move test for MERGE_TYPE from check-reqs_pkg_setup() to check-reqs_run().
1.29 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.28&r2=1.29
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- multilib-build.eclass 29 Mar 2014 03:00:44 -0000 1.28
+++ multilib-build.eclass 30 Mar 2014 08:41:53 -0000 1.29
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.28 2014/03/29 03:00:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.29 2014/03/30 08:41:53 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -246,8 +246,13 @@
# and the native variant will be symlinked to the generic name.
#
# This variable has to be a bash array. Paths shall be relative to
-# installation root (${ED}), and name regular files. Recursive wrapping
-# is not supported.
+# installation root (${ED}), and name regular files or symbolic
+# links to regular files. Recursive wrapping is not supported.
+#
+# If symbolic link is passed, both symlink path and symlink target
+# will be changed. As a result, the symlink target is expected
+# to be wrapped as well (either by listing in MULTILIB_CHOST_TOOLS
+# or externally).
#
# Please note that tool wrapping is *discouraged*. It is preferred to
# install pkg-config files for each ABI, and require reverse
@@ -374,6 +379,18 @@
local dir=${f%/*}
local fn=${f##*/}
+ if [[ -L ${root}/${f} ]]; then
+ # rewrite the symlink target
+ local target=$(readlink "${root}/${f}")
+ local target_dir
+ local target_fn=${target##*/}
+
+ [[ ${target} == */* ]] && target_dir=${target%/*}
+
+ ln -f -s "${target_dir+${target_dir}/}${CHOST}-${target_fn}" \
+ "${root}/${f}" || die
+ fi
+
mv "${root}/${f}" "${root}/${dir}/${CHOST}-${fn}" || die
# symlink the native one back
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-01-16 20:05 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-01-16 20:05 UTC (permalink / raw
To: gentoo-commits
mgorny 14/01/16 20:05:12
Modified: ChangeLog multilib-build.eclass
Log:
Typo.
Revision Changes Path
1.1118 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1118&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1118&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1117&r2=1.1118
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1117
retrieving revision 1.1118
diff -u -r1.1117 -r1.1118
--- ChangeLog 16 Jan 2014 18:53:41 -0000 1.1117
+++ ChangeLog 16 Jan 2014 20:05:12 -0000 1.1118
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1117 2014/01/16 18:53:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1118 2014/01/16 20:05:12 mgorny Exp $
+
+ 16 Jan 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Typo.
16 Jan 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Support MULTILIB_CHOST_TOOLS for tool renaming/preserving.
1.27 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.26&r2=1.27
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- multilib-build.eclass 16 Jan 2014 18:53:41 -0000 1.26
+++ multilib-build.eclass 16 Jan 2014 20:05:12 -0000 1.27
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.26 2014/01/16 18:53:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.27 2014/01/16 20:05:12 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -423,7 +423,7 @@
# @FUNCTION: multilib_build_binaries
# @DESCRIPTION:
-# Determine whether to build binaries for the currently build ABI.
+# Determine whether to build binaries for the currently built ABI.
# Returns true status (0) if the currently built ABI is the profile
# native or COMPLETE_MULTILIB variable is set to 'yes', otherwise
# false (1).
^ permalink raw reply [flat|nested] 53+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2014-01-16 18:53 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2014-01-16 18:53 UTC (permalink / raw
To: gentoo-commits
mgorny 14/01/16 18:53:41
Modified: ChangeLog multilib-build.eclass
Log:
Support MULTILIB_CHOST_TOOLS for tool renaming/preserving.
Revision Changes Path
1.1117 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1117&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1117&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1116&r2=1.1117
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1116
retrieving revision 1.1117
diff -u -r1.1116 -r1.1117
--- ChangeLog 16 Jan 2014 07:57:40 -0000 1.1116
+++ ChangeLog 16 Jan 2014 18:53:41 -0000 1.1117
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1116 2014/01/16 07:57:40 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1117 2014/01/16 18:53:41 mgorny Exp $
+
+ 16 Jan 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Support MULTILIB_CHOST_TOOLS for tool renaming/preserving.
16 Jan 2014; Hans de Graaff <graaff@gentoo.org> ruby-ng.eclass:
Explicitly cp symlinks as-is. The default for this changed in coreutils 8.22.
1.26 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.25&r2=1.26
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- multilib-build.eclass 31 Dec 2013 18:31:47 -0000 1.25
+++ multilib-build.eclass 16 Jan 2014 18:53:41 -0000 1.26
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.25 2013/12/31 18:31:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.26 2014/01/16 18:53:41 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -237,6 +237,31 @@
# )
# @CODE
+# @ECLASS-VARIABLE: MULTILIB_CHOST_TOOLS
+# @DESCRIPTION:
+# A list of tool executables to preserve for each multilib ABI.
+# The listed executables will be renamed to ${CHOST}-${basename},
+# and the native variant will be symlinked to the generic name.
+#
+# This variable has to be a bash array. Paths shall be relative to
+# installation root (${ED}), and name regular files. Recursive wrapping
+# is not supported.
+#
+# Please note that tool wrapping is *discouraged*. It is preferred to
+# install pkg-config files for each ABI, and require reverse
+# dependencies to use that.
+#
+# Packages that search for tools properly (e.g. using AC_PATH_TOOL
+# macro) will find the wrapper executables automatically. Other packages
+# will need explicit override of tool paths.
+#
+# Example:
+# @CODE
+# MULTILIB_CHOST_TOOLS=(
+# /usr/bin/foo-config
+# )
+
+# @CODE
# @FUNCTION: multilib_prepare_wrappers
# @USAGE: [<install-root>]
# @DESCRIPTION:
@@ -335,6 +360,21 @@
-i "${ED}/tmp/multilib-include${f}" || die
fi
done
+
+ for f in "${MULTILIB_CHOST_TOOLS[@]}"; do
+ # drop leading slash if it's there
+ f=${f#/}
+
+ local dir=${f%/*}
+ local fn=${f##*/}
+
+ mv "${root}/${f}" "${root}/${dir}/${CHOST}-${fn}" || die
+
+ # symlink the native one back
+ if multilib_build_binaries; then
+ ln -s "${CHOST}-${fn}" "${root}/${f}" || die
+ fi
+ done
}
# @FUNCTION: multilib_install_wrappers
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-12-31 18:31 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2013-12-31 18:31 UTC (permalink / raw
To: gentoo-commits
mgorny 13/12/31 18:31:48
Modified: ChangeLog multilib-build.eclass
Log:
Improve documentation on multilib_is_native_abi & multilib_build_binaries to make it clear which one to use. Requested and reviewed by okias.
Revision Changes Path
1.1105 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1105&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1105&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1104&r2=1.1105
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1104
retrieving revision 1.1105
diff -u -r1.1104 -r1.1105
--- ChangeLog 30 Dec 2013 08:25:35 -0000 1.1104
+++ ChangeLog 31 Dec 2013 18:31:47 -0000 1.1105
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1104 2013/12/30 08:25:35 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1105 2013/12/31 18:31:47 mgorny Exp $
+
+ 31 Dec 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Improve documentation on multilib_is_native_abi & multilib_build_binaries to
+ make it clear which one to use. Requested and reviewed by okias.
30 Dec 2013; Ryan Hill <dirtyepic@gentoo.org> wxwidgets.eclass:
Add 3.0 support.
1.25 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.24&r2=1.25
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- multilib-build.eclass 28 Dec 2013 18:23:25 -0000 1.24
+++ multilib-build.eclass 31 Dec 2013 18:31:47 -0000 1.25
@@ -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/eclass/multilib-build.eclass,v 1.24 2013/12/28 18:23:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.25 2013/12/31 18:31:47 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -371,9 +371,8 @@
# Determine whether the currently built ABI is the profile native.
# Return true status (0) if that is true, otherwise false (1).
#
-# This is often useful for configure calls when some of the options are
-# supposed to be disabled for multilib ABIs (like those used for
-# executables only).
+# This function is not intended to be used directly. Please use
+# multilib_build_binaries instead.
multilib_is_native_abi() {
debug-print-function ${FUNCNAME} "${@}"
@@ -384,14 +383,14 @@
# @FUNCTION: multilib_build_binaries
# @DESCRIPTION:
-# Determine whether to build binaries for the current build ABI.
-# Returns true status (0) if the current built ABI is the profile
-# native or COMPLETE_MULTILIB variable is set to yes, otherwise
+# Determine whether to build binaries for the currently build ABI.
+# Returns true status (0) if the currently built ABI is the profile
+# native or COMPLETE_MULTILIB variable is set to 'yes', otherwise
# false (1).
#
-# The COMPLETE_MULTILIB variable can be set by users or profiles
-# when they want to build binaries for none-default ABI so e.g.
-# 32bit binaries on amd64.
+# This is often useful for configure calls when some of the options are
+# supposed to be disabled for multilib ABIs (like those used for
+# executables only).
multilib_build_binaries() {
debug-print-function ${FUNCNAME} "${@}"
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-10-01 18:06 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2013-10-01 18:06 UTC (permalink / raw
To: gentoo-commits
mgorny 13/10/01 18:06:07
Modified: ChangeLog multilib-build.eclass
Log:
Clean up the splitting code wrt suggestions from Ulrich Mueller.
Revision Changes Path
1.1004 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1004&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1004&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1003&r2=1.1004
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1003
retrieving revision 1.1004
diff -u -r1.1003 -r1.1004
--- ChangeLog 1 Oct 2013 17:42:38 -0000 1.1003
+++ ChangeLog 1 Oct 2013 18:06:06 -0000 1.1004
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1003 2013/10/01 17:42:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1004 2013/10/01 18:06:06 mgorny Exp $
+
+ 01 Oct 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Clean up the splitting code wrt suggestions from Ulrich Mueller.
01 Oct 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Split ABIs without altering IFS, to work-around bug in Paludis, bug #486592.
1.23 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.22&r2=1.23
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- multilib-build.eclass 1 Oct 2013 17:42:38 -0000 1.22
+++ multilib-build.eclass 1 Oct 2013 18:06:06 -0000 1.23
@@ -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/eclass/multilib-build.eclass,v 1.22 2013/10/01 17:42:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.23 2013/10/01 18:06:06 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -80,10 +80,8 @@
# split on ,; we can't switch IFS for function scope because
# paludis is broken (bug #486592), and switching it locally
- # for the split is more complex than tricking like this
- m_abis=( ${m_abis/,/ } )
-
- for m_abi in ${m_abis[@]}; do
+ # for the split is more complex than cheating like this
+ for m_abi in ${m_abis//,/ }; do
if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then
echo "${abi}"
found=1
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-10-01 17:42 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2013-10-01 17:42 UTC (permalink / raw
To: gentoo-commits
mgorny 13/10/01 17:42:38
Modified: ChangeLog multilib-build.eclass
Log:
Split ABIs without altering IFS, to work-around bug in Paludis, bug #486592.
Revision Changes Path
1.1003 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1003&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1003&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1002&r2=1.1003
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1002
retrieving revision 1.1003
diff -u -r1.1002 -r1.1003
--- ChangeLog 30 Sep 2013 07:27:06 -0000 1.1002
+++ ChangeLog 1 Oct 2013 17:42:38 -0000 1.1003
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1002 2013/09/30 07:27:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1003 2013/10/01 17:42:38 mgorny Exp $
+
+ 01 Oct 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Split ABIs without altering IFS, to work-around bug in Paludis, bug #486592.
30 Sep 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Fix duplicate flags in MULTILIB_USEDEP. Thanks for the report and the patch
1.22 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.21&r2=1.22
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- multilib-build.eclass 30 Sep 2013 07:27:06 -0000 1.21
+++ multilib-build.eclass 1 Oct 2013 17:42:38 -0000 1.22
@@ -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/eclass/multilib-build.eclass,v 1.21 2013/09/30 07:27:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.22 2013/10/01 17:42:38 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -72,14 +72,18 @@
local abis=( $(get_all_abis) )
- local IFS=,
local abi i found
for abi in "${abis[@]}"; do
for i in "${_MULTILIB_FLAGS[@]}"; do
local m_abis=${i#*:} m_abi
local m_flag=${i%:*}
- for m_abi in ${m_abis}; do
+ # split on ,; we can't switch IFS for function scope because
+ # paludis is broken (bug #486592), and switching it locally
+ # for the split is more complex than tricking like this
+ m_abis=( ${m_abis/,/ } )
+
+ for m_abi in ${m_abis[@]}; do
if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then
echo "${abi}"
found=1
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-09-30 7:27 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-30 7:27 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/30 07:27:06
Modified: ChangeLog multilib-build.eclass
Log:
Fix duplicate flags in MULTILIB_USEDEP. Thanks for the report and the patch to Ulrich Mueller.
Revision Changes Path
1.1002 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1002&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1002&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1001&r2=1.1002
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1001
retrieving revision 1.1002
diff -u -r1.1001 -r1.1002
--- ChangeLog 30 Sep 2013 02:28:42 -0000 1.1001
+++ ChangeLog 30 Sep 2013 07:27:06 -0000 1.1002
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1001 2013/09/30 02:28:42 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1002 2013/09/30 07:27:06 mgorny Exp $
+
+ 30 Sep 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Fix duplicate flags in MULTILIB_USEDEP. Thanks for the report and the patch
+ to Ulrich Mueller.
30 Sep 2013; Christoph Junghans <ottxor@gentoo.org>
toolchain-binutils.eclass:
1.21 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.20&r2=1.21
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- multilib-build.eclass 17 Sep 2013 13:29:19 -0000 1.20
+++ multilib-build.eclass 30 Sep 2013 07:27:06 -0000 1.21
@@ -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/eclass/multilib-build.eclass,v 1.20 2013/09/17 13:29:19 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.21 2013/09/30 07:27:06 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -28,13 +28,13 @@
# @ECLASS-VARIABLE: _MULTILIB_FLAGS
# @INTERNAL
# @DESCRIPTION:
-# The list of multilib flags and corresponding ABI values.
+# The list of multilib flags and corresponding ABI values. If the same
+# flag is reused for multiple ABIs (e.g. x86 on Linux&FreeBSD), multiple
+# ABIs may be separated by commas.
_MULTILIB_FLAGS=(
- abi_x86_32:x86
- abi_x86_64:amd64
+ abi_x86_32:x86,x86_fbsd
+ abi_x86_64:amd64,amd64_fbsd
abi_x86_x32:x32
- abi_x86_32:x86_fbsd
- abi_x86_64:amd64_fbsd
abi_mips_n32:n32
abi_mips_n64:n64
abi_mips_o32:o32
@@ -72,16 +72,20 @@
local abis=( $(get_all_abis) )
+ local IFS=,
local abi i found
for abi in "${abis[@]}"; do
for i in "${_MULTILIB_FLAGS[@]}"; do
- local m_abi=${i#*:}
+ local m_abis=${i#*:} m_abi
local m_flag=${i%:*}
- if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then
- echo "${abi}"
- found=1
- fi
+ for m_abi in ${m_abis}; do
+ if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then
+ echo "${abi}"
+ found=1
+ break 2
+ fi
+ done
done
done
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-09-17 13:29 Thomas Sachau (tommy)
0 siblings, 0 replies; 53+ messages in thread
From: Thomas Sachau (tommy) @ 2013-09-17 13:29 UTC (permalink / raw
To: gentoo-commits
tommy 13/09/17 13:29:20
Modified: ChangeLog multilib-build.eclass
Log:
Add eclass doc for multilib_build_binaries
Revision Changes Path
1.970 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.970&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.970&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.969&r2=1.970
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.969
retrieving revision 1.970
diff -u -r1.969 -r1.970
--- ChangeLog 17 Sep 2013 13:25:58 -0000 1.969
+++ ChangeLog 17 Sep 2013 13:29:19 -0000 1.970
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.969 2013/09/17 13:25:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.970 2013/09/17 13:29:19 tommy Exp $
+
+ 17 Sep 2013; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+ multilib-build.eclass:
+ Add eclass doc for multilib_build_binaries
17 Sep 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass,
tests/python-utils-r1.sh:
1.20 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.19&r2=1.20
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- multilib-build.eclass 17 Sep 2013 12:25:50 -0000 1.19
+++ multilib-build.eclass 17 Sep 2013 13:29:19 -0000 1.20
@@ -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/eclass/multilib-build.eclass,v 1.19 2013/09/17 12:25:50 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.20 2013/09/17 13:29:19 tommy Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -376,6 +376,16 @@
[[ ${ABI} == ${DEFAULT_ABI} ]]
}
+# @FUNCTION: multilib_build_binaries
+# @DESCRIPTION:
+# Determine wheter to build binaries for the current build ABI.
+# Returns true status (0) if the current built ABI is the profile
+# native or COMPLETE_MULTILIB variable is set to yes, otherwise
+# false (1).
+#
+# The COMPLETE_MULTILIB variable can be set by users or profiles
+# when they want to build binaries for none-default ABI so e.g.
+# 32bit binaries on amd64.
multilib_build_binaries() {
debug-print-function ${FUNCNAME} "${@}"
@@ -383,6 +393,6 @@
[[ ${COMPLETE_MULTILIB} == yes ]] || multilib_is_native_abi
}
-
+
_MULTILIB_BUILD=1
fi
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-09-17 12:25 Thomas Sachau (tommy)
0 siblings, 0 replies; 53+ messages in thread
From: Thomas Sachau (tommy) @ 2013-09-17 12:25 UTC (permalink / raw
To: gentoo-commits
tommy 13/09/17 12:25:50
Modified: ChangeLog multilib-build.eclass
Log:
Add multilib_build_binaries function to multilib-build eclass
Revision Changes Path
1.967 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.967&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.967&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.966&r2=1.967
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.966
retrieving revision 1.967
diff -u -r1.966 -r1.967
--- ChangeLog 16 Sep 2013 17:58:15 -0000 1.966
+++ ChangeLog 17 Sep 2013 12:25:50 -0000 1.967
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.966 2013/09/16 17:58:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.967 2013/09/17 12:25:50 tommy Exp $
+
+ 17 Sep 2013; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+ multilib-build.eclass:
+ Add multilib_build_binaries function to multilib-build eclass
16 Sep 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Deprecate python_get_PYTHON and python_get_EPYTHON.
1.19 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.18&r2=1.19
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- multilib-build.eclass 8 Aug 2013 10:20:15 -0000 1.18
+++ multilib-build.eclass 17 Sep 2013 12:25:50 -0000 1.19
@@ -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/eclass/multilib-build.eclass,v 1.18 2013/08/08 10:20:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.19 2013/09/17 12:25:50 tommy Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -376,5 +376,13 @@
[[ ${ABI} == ${DEFAULT_ABI} ]]
}
+multilib_build_binaries() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ [[ ${#} -eq 0 ]] || die "${FUNCNAME}: too many arguments"
+
+ [[ ${COMPLETE_MULTILIB} == yes ]] || multilib_is_native_abi
+}
+
_MULTILIB_BUILD=1
fi
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-08-08 10:20 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2013-08-08 10:20 UTC (permalink / raw
To: gentoo-commits
mgorny 13/08/08 10:20:15
Modified: ChangeLog multilib-build.eclass
Log:
Allow wrapping headers that are installed only for some of the ABIs.
Revision Changes Path
1.917 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.917&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.917&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.916&r2=1.917
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.916
retrieving revision 1.917
diff -u -r1.916 -r1.917
--- ChangeLog 7 Aug 2013 16:37:32 -0000 1.916
+++ ChangeLog 8 Aug 2013 10:20:15 -0000 1.917
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.916 2013/08/07 16:37:32 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.917 2013/08/08 10:20:15 mgorny Exp $
+
+ 08 Aug 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Allow wrapping headers that are installed only for some of the ABIs.
07 Aug 2013; Mike Gilbert <floppym@gentoo.org> python-r1.eclass,
python-single-r1.eclass:
1.18 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.17&r2=1.18
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- multilib-build.eclass 30 Jul 2013 02:08:54 -0000 1.17
+++ multilib-build.eclass 8 Aug 2013 10:20:15 -0000 1.18
@@ -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/eclass/multilib-build.eclass,v 1.17 2013/07/30 02:08:54 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.18 2013/08/08 10:20:15 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -268,10 +268,6 @@
local dir=${f%/*}
- # $CHOST shall be set by multilib_toolchain_setup
- dodir "/tmp/multilib-include/${CHOST}${dir}"
- mv "${root}/usr/include${f}" "${ED}/tmp/multilib-include/${CHOST}${dir}/" || die
-
if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then
dodir "/tmp/multilib-include${dir}"
# a generic template
@@ -303,28 +299,35 @@
_EOF_
fi
- # XXX: get abi_* directly
- local abi_flag
- case "${ABI}" in
- amd64|amd64_fbsd)
- abi_flag=abi_x86_64;;
- x86|x86_fbsd)
- abi_flag=abi_x86_32;;
- x32)
- abi_flag=abi_x86_x32;;
- n32)
- abi_flag=abi_mips_n32;;
- n64)
- abi_flag=abi_mips_n64;;
- o32)
- abi_flag=abi_mips_o32;;
- *)
- die "Header wrapping for ${ABI} not supported yet";;
- esac
-
- # Note: match a space afterwards to avoid collision potential.
- sed -e "/${abi_flag} /s&error.*&include <${CHOST}${f}>&" \
- -i "${ED}/tmp/multilib-include${f}" || die
+ # Some ABIs may have install less files than others.
+ if [[ -f ${root}/usr/include${f} ]]; then
+ # $CHOST shall be set by multilib_toolchain_setup
+ dodir "/tmp/multilib-include/${CHOST}${dir}"
+ mv "${root}/usr/include${f}" "${ED}/tmp/multilib-include/${CHOST}${dir}/" || die
+
+ # XXX: get abi_* directly
+ local abi_flag
+ case "${ABI}" in
+ amd64|amd64_fbsd)
+ abi_flag=abi_x86_64;;
+ x86|x86_fbsd)
+ abi_flag=abi_x86_32;;
+ x32)
+ abi_flag=abi_x86_x32;;
+ n32)
+ abi_flag=abi_mips_n32;;
+ n64)
+ abi_flag=abi_mips_n64;;
+ o32)
+ abi_flag=abi_mips_o32;;
+ *)
+ die "Header wrapping for ${ABI} not supported yet";;
+ esac
+
+ # Note: match a space afterwards to avoid collision potential.
+ sed -e "/${abi_flag} /s&error.*&include <${CHOST}${f}>&" \
+ -i "${ED}/tmp/multilib-include${f}" || die
+ fi
done
}
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-07-30 2:08 Matt Turner (mattst88)
0 siblings, 0 replies; 53+ messages in thread
From: Matt Turner (mattst88) @ 2013-07-30 2:08 UTC (permalink / raw
To: gentoo-commits
mattst88 13/07/30 02:08:54
Modified: ChangeLog multilib-build.eclass
Log:
Add MIPS support to multilib-build.eclass.
Revision Changes Path
1.904 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.904&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.904&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.903&r2=1.904
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.903
retrieving revision 1.904
diff -u -r1.903 -r1.904
--- ChangeLog 29 Jul 2013 12:31:35 -0000 1.903
+++ ChangeLog 30 Jul 2013 02:08:54 -0000 1.904
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.903 2013/07/29 12:31:35 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.904 2013/07/30 02:08:54 mattst88 Exp $
+
+ 30 Jul 2013; Matt Turner <mattst88@gentoo.org> multilib-build.eclass:
+ Add MIPS support to multilib-build.eclass.
29 Jul 2013; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
ask user to run haskell-updater for old packages (like in bug
1.17 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.16&r2=1.17
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- multilib-build.eclass 27 Jul 2013 17:31:47 -0000 1.16
+++ multilib-build.eclass 30 Jul 2013 02:08:54 -0000 1.17
@@ -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/eclass/multilib-build.eclass,v 1.16 2013/07/27 17:31:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.17 2013/07/30 02:08:54 mattst88 Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -35,6 +35,9 @@
abi_x86_x32:x32
abi_x86_32:x86_fbsd
abi_x86_64:amd64_fbsd
+ abi_mips_n32:n32
+ abi_mips_n64:n64
+ abi_mips_o32:o32
)
# @ECLASS-VARIABLE: MULTILIB_USEDEP
@@ -286,6 +289,14 @@
# endif
#elif defined(__i386__) /* plain x86 */
# error "abi_x86_32 not supported by the package."
+#elif defined(__mips__)
+# if(_MIPS_SIM == _ABIN32) /* n32 */
+# error "abi_mips_n32 not supported by the package."
+# elif(_MIPS_SIM == _ABI64) /* n64 */
+# error "abi_mips_n64 not supported by the package."
+# elif(_MIPS_SIM == _ABIO32) /* o32 */
+# error "abi_mips_o32 not supported by the package."
+# endif
#else
# error "No ABI matched, please report a bug to bugs.gentoo.org"
#endif
@@ -301,6 +312,12 @@
abi_flag=abi_x86_32;;
x32)
abi_flag=abi_x86_x32;;
+ n32)
+ abi_flag=abi_mips_n32;;
+ n64)
+ abi_flag=abi_mips_n64;;
+ o32)
+ abi_flag=abi_mips_o32;;
*)
die "Header wrapping for ${ABI} not supported yet";;
esac
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-07-11 6:57 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2013-07-11 6:57 UTC (permalink / raw
To: gentoo-commits
mgorny 13/07/11 06:57:18
Modified: ChangeLog multilib-build.eclass
Log:
Add multilib_is_native_abi helper.
Revision Changes Path
1.875 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.875&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.875&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.874&r2=1.875
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.874
retrieving revision 1.875
diff -u -r1.874 -r1.875
--- ChangeLog 10 Jul 2013 17:12:57 -0000 1.874
+++ ChangeLog 11 Jul 2013 06:57:18 -0000 1.875
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.874 2013/07/10 17:12:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.875 2013/07/11 06:57:18 mgorny Exp $
+
+ 11 Jul 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Add multilib_is_native_abi helper.
10 Jul 2013; Robin H. Johnson <robbat2@gentoo.org> db.eclass:
Additional change to run tests successfully on newer versions of db
1.15 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.14&r2=1.15
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- multilib-build.eclass 28 Jun 2013 02:37:52 -0000 1.14
+++ multilib-build.eclass 11 Jul 2013 06:57:18 -0000 1.15
@@ -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/eclass/multilib-build.eclass,v 1.14 2013/06/28 02:37:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.15 2013/07/11 06:57:18 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -338,5 +338,21 @@
fi
}
+# @FUNCTION: multilib_is_native_abi
+# @DESCRIPTION:
+# Determine whether the currently built ABI is the profile native.
+# Return true status (0) if that is true, otherwise false (1).
+#
+# This is often useful for configure calls when some of the options are
+# supposed to be disabled for multilib ABIs (like those used for
+# executables only).
+multilib_is_native_abi() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ [[ ${#} -eq 0 ]] || die "${FUNCNAME}: too many arguments"
+
+ [[ ${ABI} == ${DEFAULT_ABI} ]]
+}
+
_MULTILIB_BUILD=1
fi
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-06-28 2:37 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2013-06-28 2:37 UTC (permalink / raw
To: gentoo-commits
mgorny 13/06/28 02:37:52
Modified: ChangeLog multilib-build.eclass
Log:
Fix redundant slashes in header-wrapping include paths, bug #475046. Thanks to Arfrever for the patch.
Revision Changes Path
1.865 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.865&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.865&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.864&r2=1.865
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.864
retrieving revision 1.865
diff -u -r1.864 -r1.865
--- ChangeLog 23 Jun 2013 16:36:49 -0000 1.864
+++ ChangeLog 28 Jun 2013 02:37:52 -0000 1.865
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.864 2013/06/23 16:36:49 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.865 2013/06/28 02:37:52 mgorny Exp $
+
+ 28 Jun 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Fix redundant slashes in header-wrapping include paths, bug #475046. Thanks
+ to Arfrever for the patch.
23 Jun 2013; Michael Weber <xmw@gentoo.org> +netsurf.eclass:
Add netsurf.eclass
1.14 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.13&r2=1.14
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- multilib-build.eclass 31 May 2013 17:50:33 -0000 1.13
+++ multilib-build.eclass 28 Jun 2013 02:37:52 -0000 1.14
@@ -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/eclass/multilib-build.eclass,v 1.13 2013/05/31 17:50:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.14 2013/06/28 02:37:52 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -304,7 +304,7 @@
esac
# Note: match a space afterwards to avoid collision potential.
- sed -e "/${abi_flag} /s&error.*&include <${CHOST}/${f}>&" \
+ sed -e "/${abi_flag} /s&error.*&include <${CHOST}${f}>&" \
-i "${ED}/tmp/multilib-include${f}" || die
done
}
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-03-09 13:52 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2013-03-09 13:52 UTC (permalink / raw
To: gentoo-commits
mgorny 13/03/09 13:52:05
Modified: ChangeLog multilib-build.eclass
Log:
Introduce multilib_copy_sources.
Revision Changes Path
1.724 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.724&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.724&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.723&r2=1.724
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.723
retrieving revision 1.724
diff -u -r1.723 -r1.724
--- ChangeLog 9 Mar 2013 13:51:39 -0000 1.723
+++ ChangeLog 9 Mar 2013 13:52:05 -0000 1.724
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.723 2013/03/09 13:51:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.724 2013/03/09 13:52:05 mgorny Exp $
+
+ 09 Mar 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Introduce multilib_copy_sources.
09 Mar 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
Use multibuild_copy_sources for python_copy_sources.
1.10 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.9&r2=1.10
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- multilib-build.eclass 4 Mar 2013 19:31:01 -0000 1.9
+++ multilib-build.eclass 9 Mar 2013 13:52:05 -0000 1.10
@@ -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/eclass/multilib-build.eclass,v 1.9 2013/03/04 19:31:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.10 2013/03/09 13:52:05 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -190,5 +190,19 @@
fi
}
+# @FUNCTION: multilib_copy_sources
+# @DESCRIPTION:
+# Create a single copy of the package sources for each enabled ABI.
+#
+# The sources are always copied from initial BUILD_DIR (or S if unset)
+# to ABI-specific build directory matching BUILD_DIR used by
+# multilib_foreach_abi().
+multilib_copy_sources() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
+ multibuild_copy_sources
+}
+
_MULTILIB_BUILD=1
fi
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-03-04 19:31 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2013-03-04 19:31 UTC (permalink / raw
To: gentoo-commits
mgorny 13/03/04 19:31:01
Modified: ChangeLog multilib-build.eclass
Log:
Introduce multilib_for_best_impl().
Revision Changes Path
1.713 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.713&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.713&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.712&r2=1.713
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.712
retrieving revision 1.713
diff -u -r1.712 -r1.713
--- ChangeLog 4 Mar 2013 19:30:28 -0000 1.712
+++ ChangeLog 4 Mar 2013 19:31:01 -0000 1.713
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.712 2013/03/04 19:30:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.713 2013/03/04 19:31:01 mgorny Exp $
+
+ 04 Mar 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Introduce multilib_for_best_impl().
04 Mar 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Convert to use multibuild.eclass.
1.9 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.8&r2=1.9
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- multilib-build.eclass 4 Mar 2013 19:30:28 -0000 1.8
+++ multilib-build.eclass 4 Mar 2013 19:31:01 -0000 1.9
@@ -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/eclass/multilib-build.eclass,v 1.8 2013/03/04 19:30:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.9 2013/03/04 19:31:01 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -139,6 +139,18 @@
multibuild_parallel_foreach_variant _multilib_multibuild_wrapper "${@}"
}
+# @FUNCTION: multilib_for_best_abi
+# @USAGE: <argv>...
+# @DESCRIPTION:
+# Runs the given command with setup for the 'best' (usually native) ABI.
+multilib_for_best_abi() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
+
+ multibuild_for_best_variant _multilib_multibuild_wrapper "${@}"
+}
+
# @FUNCTION: multilib_check_headers
# @DESCRIPTION:
# Check whether the header files are consistent between ABIs.
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-03-04 19:30 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2013-03-04 19:30 UTC (permalink / raw
To: gentoo-commits
mgorny 13/03/04 19:30:28
Modified: ChangeLog multilib-build.eclass
Log:
Convert to use multibuild.eclass.
Revision Changes Path
1.712 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.712&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.712&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.711&r2=1.712
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.711
retrieving revision 1.712
diff -u -r1.711 -r1.712
--- ChangeLog 4 Mar 2013 19:29:43 -0000 1.711
+++ ChangeLog 4 Mar 2013 19:30:28 -0000 1.712
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.711 2013/03/04 19:29:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.712 2013/03/04 19:30:28 mgorny Exp $
+
+ 04 Mar 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Convert to use multibuild.eclass.
04 Mar 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Use multilib_for_best_variant() for the *_all() phases.
1.8 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.7&r2=1.8
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- multilib-build.eclass 2 Mar 2013 18:18:13 -0000 1.7
+++ multilib-build.eclass 4 Mar 2013 19:30:28 -0000 1.8
@@ -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/eclass/multilib-build.eclass,v 1.7 2013/03/02 18:18:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.8 2013/03/04 19:30:28 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -23,7 +23,7 @@
*) die "EAPI=${EAPI} is not supported" ;;
esac
-inherit multilib multiprocessing
+inherit multibuild multilib
# @ECLASS-VARIABLE: _MULTILIB_FLAGS
# @INTERNAL
@@ -91,6 +91,19 @@
fi
}
+# @FUNCTION: _multilib_multibuild_wrapper
+# @USAGE: <argv>...
+# @INTERNAL
+# @DESCRIPTION:
+# Initialize the environment for ABI selected for multibuild.
+_multilib_multibuild_wrapper() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ local ABI=${MULTIBUILD_VARIANT}
+ multilib_toolchain_setup "${ABI}"
+ "${@}"
+}
+
# @FUNCTION: multilib_foreach_abi
# @USAGE: <argv>...
# @DESCRIPTION:
@@ -101,14 +114,10 @@
# If multilib support is disabled, it just runs the commands. No setup
# is done.
multilib_foreach_abi() {
- local initial_dir=${BUILD_DIR:-${S}}
+ debug-print-function ${FUNCNAME} "${@}"
- local abis=( $(multilib_get_enabled_abis) )
- local ABI
- for ABI in "${abis[@]}"; do
- multilib_toolchain_setup "${ABI}"
- BUILD_DIR=${initial_dir%%/}-${ABI} "${@}"
- done
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
+ multibuild_foreach_variant _multilib_multibuild_wrapper "${@}"
}
# @FUNCTION: multilib_parallel_foreach_abi
@@ -124,25 +133,10 @@
#
# Useful for running configure scripts.
multilib_parallel_foreach_abi() {
- local initial_dir=${BUILD_DIR:-${S}}
-
- multijob_init
-
- local abis=( $(multilib_get_enabled_abis) )
- local ABI
- for ABI in "${abis[@]}"; do
- (
- multijob_child_init
-
- multilib_toolchain_setup "${ABI}"
- BUILD_DIR=${initial_dir%%/}-${ABI}
- "${@}"
- ) &
-
- multijob_post_fork
- done
+ debug-print-function ${FUNCNAME} "${@}"
- multijob_finish
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
+ multibuild_parallel_foreach_variant _multilib_multibuild_wrapper "${@}"
}
# @FUNCTION: multilib_check_headers
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-03-02 18:18 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2013-03-02 18:18 UTC (permalink / raw
To: gentoo-commits
mgorny 13/03/02 18:18:13
Modified: ChangeLog multilib-build.eclass
Log:
Improve the no-multilib fallback to respect ${ABI} set by multilib-portage.
Revision Changes Path
1.700 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.700&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.700&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.699&r2=1.700
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.699
retrieving revision 1.700
diff -u -r1.699 -r1.700
--- ChangeLog 2 Mar 2013 12:54:31 -0000 1.699
+++ ChangeLog 2 Mar 2013 18:18:13 -0000 1.700
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.699 2013/03/02 12:54:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.700 2013/03/02 18:18:13 mgorny Exp $
+
+ 02 Mar 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Improve the no-multilib fallback to respect ${ABI} set by multilib-portage.
02 Mar 2013; Michał Górny <mgorny@gentoo.org> python.eclass:
Remove deprecation warnings wrt bug #452160. The code will not be removed
1.7 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.6&r2=1.7
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- multilib-build.eclass 27 Feb 2013 23:23:11 -0000 1.6
+++ multilib-build.eclass 2 Mar 2013 18:18:13 -0000 1.7
@@ -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/eclass/multilib-build.eclass,v 1.6 2013/02/27 23:23:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.7 2013/03/02 18:18:13 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -81,8 +81,13 @@
done
if [[ ! ${found} ]]; then
- debug-print "${FUNCNAME}: no ABIs enabled, fallback to ${DEFAULT_ABI}"
- echo ${DEFAULT_ABI}
+ # ${ABI} can be used to override the fallback (multilib-portage),
+ # ${DEFAULT_ABI} is the safe fallback.
+ local abi=${ABI:-${DEFAULT_ABI}}
+
+ debug-print "${FUNCNAME}: no ABIs enabled, fallback to ${abi}"
+ debug-print "${FUNCNAME}: ABI=${ABI}, DEFAULT_ABI=${DEFAULT_ABI}"
+ echo ${abi}
fi
}
@@ -98,8 +103,9 @@
multilib_foreach_abi() {
local initial_dir=${BUILD_DIR:-${S}}
+ local abis=( $(multilib_get_enabled_abis) )
local ABI
- for ABI in $(multilib_get_enabled_abis); do
+ for ABI in "${abis[@]}"; do
multilib_toolchain_setup "${ABI}"
BUILD_DIR=${initial_dir%%/}-${ABI} "${@}"
done
@@ -122,8 +128,9 @@
multijob_init
+ local abis=( $(multilib_get_enabled_abis) )
local ABI
- for ABI in $(multilib_get_enabled_abis); do
+ for ABI in "${abis[@]}"; do
(
multijob_child_init
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-02-27 23:23 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2013-02-27 23:23 UTC (permalink / raw
To: gentoo-commits
mgorny 13/02/27 23:23:11
Modified: ChangeLog multilib-build.eclass
Log:
Enable x32 ABI support.
Revision Changes Path
1.695 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.695&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.695&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.694&r2=1.695
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.694
retrieving revision 1.695
diff -u -r1.694 -r1.695
--- ChangeLog 27 Feb 2013 21:47:38 -0000 1.694
+++ ChangeLog 27 Feb 2013 23:23:11 -0000 1.695
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.694 2013/02/27 21:47:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.695 2013/02/27 23:23:11 mgorny Exp $
+
+ 27 Feb 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Enable x32 ABI support.
27 Feb 2013; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass:
Export src_prepare() explicitly rather than implicitly through inherits.
1.6 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.5&r2=1.6
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- multilib-build.eclass 27 Feb 2013 21:02:59 -0000 1.5
+++ multilib-build.eclass 27 Feb 2013 23:23:11 -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/eclass/multilib-build.eclass,v 1.5 2013/02/27 21:02:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.6 2013/02/27 23:23:11 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -32,6 +32,7 @@
_MULTILIB_FLAGS=(
abi_x86_32:x86
abi_x86_64:amd64
+ abi_x86_x32:x32
)
# @ECLASS-VARIABLE: MULTILIB_USEDEP
^ permalink raw reply [flat|nested] 53+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-02-26 21:05 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2013-02-26 21:05 UTC (permalink / raw
To: gentoo-commits
mgorny 13/02/26 21:05:39
Modified: ChangeLog multilib-build.eclass
Log:
Run header checksumming function only if /usr/include exists (IOW: silence the warning).
Revision Changes Path
1.691 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.691&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.691&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.690&r2=1.691
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.690
retrieving revision 1.691
diff -u -r1.690 -r1.691
--- ChangeLog 26 Feb 2013 14:42:24 -0000 1.690
+++ ChangeLog 26 Feb 2013 21:05:39 -0000 1.691
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.690 2013/02/26 14:42:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.691 2013/02/26 21:05:39 mgorny Exp $
+
+ 26 Feb 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Run header checksumming function only if /usr/include exists (IOW: silence
+ the warning).
26 Feb 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Enable writing split build logs.
1.4 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.3&r2=1.4
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- multilib-build.eclass 26 Feb 2013 14:42:24 -0000 1.3
+++ multilib-build.eclass 26 Feb 2013 21:05:39 -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/eclass/multilib-build.eclass,v 1.3 2013/02/26 14:42:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.4 2013/02/26 21:05:39 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -147,6 +147,7 @@
# runs (if any). Dies if header files differ.
multilib_check_headers() {
_multilib_header_cksum() {
+ [[ -d ${ED}usr/include ]] && \
find "${ED}"usr/include -type f \
-exec cksum {} + | sort -k2
}
^ permalink raw reply [flat|nested] 53+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
@ 2013-02-26 14:42 Michal Gorny (mgorny)
0 siblings, 0 replies; 53+ messages in thread
From: Michal Gorny (mgorny) @ 2013-02-26 14:42 UTC (permalink / raw
To: gentoo-commits
mgorny 13/02/26 14:42:24
Modified: ChangeLog multilib-build.eclass
Log:
Enable writing split build logs.
Revision Changes Path
1.690 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.690&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.690&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.689&r2=1.690
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.689
retrieving revision 1.690
diff -u -r1.689 -r1.690
--- ChangeLog 26 Feb 2013 14:36:40 -0000 1.689
+++ ChangeLog 26 Feb 2013 14:42:24 -0000 1.690
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.689 2013/02/26 14:36:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.690 2013/02/26 14:42:24 mgorny Exp $
+
+ 26 Feb 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Enable writing split build logs.
26 Feb 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
prune_libtool_files: support running without pkg-config installed, using sed
1.3 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.2&r2=1.3
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- multilib-build.eclass 10 Feb 2013 11:44:00 -0000 1.2
+++ multilib-build.eclass 26 Feb 2013 14:42:24 -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/eclass/multilib-build.eclass,v 1.2 2013/02/10 11:44:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.3 2013/02/26 14:42:24 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -100,7 +100,8 @@
local ABI
for ABI in $(multilib_get_enabled_abis); do
multilib_toolchain_setup "${ABI}"
- BUILD_DIR=${initial_dir%%/}-${ABI} "${@}"
+ local BUILD_DIR=${initial_dir%%/}-${ABI}
+ "${@}" | tee -a "${T}/build-${ABI}.log"
done
}
@@ -127,8 +128,8 @@
multijob_child_init
multilib_toolchain_setup "${ABI}"
- BUILD_DIR=${initial_dir%%/}-${ABI}
- "${@}"
+ local BUILD_DIR=${initial_dir%%/}-${ABI}
+ "${@}" 2>&1 | tee -a "${T}/build-${ABI}.log"
) &
multijob_post_fork
^ permalink raw reply [flat|nested] 53+ messages in thread
end of thread, other threads:[~2015-06-26 20:43 UTC | newest]
Thread overview: 53+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-03 7:48 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2015-06-26 20:43 Michal Gorny (mgorny)
2014-08-17 3:34 Jonathan Callen (jcallen)
2014-07-04 13:02 Michal Gorny (mgorny)
2014-07-03 17:45 Fabian Groffen (grobian)
2014-07-03 8:27 Michal Gorny (mgorny)
2014-06-29 8:32 Michal Gorny (mgorny)
2014-06-29 7:53 Michal Gorny (mgorny)
2014-06-28 9:56 Michal Gorny (mgorny)
2014-06-08 13:57 Michal Gorny (mgorny)
2014-05-28 18:53 Michal Gorny (mgorny)
2014-05-23 17:11 Michal Gorny (mgorny)
2014-05-23 7:53 Michal Gorny (mgorny)
2014-05-23 7:47 Michal Gorny (mgorny)
2014-05-23 7:39 Michal Gorny (mgorny)
2014-05-23 7:38 Michal Gorny (mgorny)
2014-05-23 7:11 Michal Gorny (mgorny)
2014-05-12 21:56 Michal Gorny (mgorny)
2014-05-07 17:33 Michal Gorny (mgorny)
2014-05-01 9:52 Michal Gorny (mgorny)
2014-04-29 20:59 Michal Gorny (mgorny)
2014-04-29 20:59 Michal Gorny (mgorny)
2014-04-29 20:57 Michal Gorny (mgorny)
2014-04-29 20:56 Michal Gorny (mgorny)
2014-04-28 17:38 Michal Gorny (mgorny)
2014-04-22 20:12 Michal Gorny (mgorny)
2014-04-21 7:58 Michal Gorny (mgorny)
2014-04-21 7:27 Michal Gorny (mgorny)
2014-04-21 7:22 Michal Gorny (mgorny)
2014-04-21 7:17 Michal Gorny (mgorny)
2014-04-03 21:38 Michal Gorny (mgorny)
2014-04-03 21:32 Michal Gorny (mgorny)
2014-03-31 15:32 Michal Gorny (mgorny)
2014-03-30 8:41 Michal Gorny (mgorny)
2014-01-16 20:05 Michal Gorny (mgorny)
2014-01-16 18:53 Michal Gorny (mgorny)
2013-12-31 18:31 Michal Gorny (mgorny)
2013-10-01 18:06 Michal Gorny (mgorny)
2013-10-01 17:42 Michal Gorny (mgorny)
2013-09-30 7:27 Michal Gorny (mgorny)
2013-09-17 13:29 Thomas Sachau (tommy)
2013-09-17 12:25 Thomas Sachau (tommy)
2013-08-08 10:20 Michal Gorny (mgorny)
2013-07-30 2:08 Matt Turner (mattst88)
2013-07-11 6:57 Michal Gorny (mgorny)
2013-06-28 2:37 Michal Gorny (mgorny)
2013-03-09 13:52 Michal Gorny (mgorny)
2013-03-04 19:31 Michal Gorny (mgorny)
2013-03-04 19:30 Michal Gorny (mgorny)
2013-03-02 18:18 Michal Gorny (mgorny)
2013-02-27 23:23 Michal Gorny (mgorny)
2013-02-26 21:05 Michal Gorny (mgorny)
2013-02-26 14:42 Michal Gorny (mgorny)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox