* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2011-02-06 13:09 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2011-02-06 13:09 UTC (permalink / raw
To: gentoo-commits
commit: 4973cc7e046d24c33a53eb14218f43d9e5031876
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 30 22:19:13 2011 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan 30 22:19:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4973cc7e
isolated-functions.sh: fix syntax error for die
Fix die so that dump_trace is not called when the main script is a
helper binary. This prevents the following error message when a helper
dies automatically in EAPI 4:
isolated-functions.sh: line 61: p -= : syntax error: operand expected (error token is "-= ")
---
bin/isolated-functions.sh | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 1403c0a..8af202f 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -139,8 +139,10 @@ die() {
eerror "ERROR: $CATEGORY/$PF failed:"
eerror " ${*:-(no error message)}"
eerror
- # This part is useless when called by the die helper.
- if [[ ${BASH_SOURCE[1]##*/} != die ]] ; then
+ # dump_trace is useless when the main script is a helper binary
+ local main_index
+ (( main_index = ${#BASH_SOURCE[@]} - 1 ))
+ if has ${BASH_SOURCE[$main_index]##*/} ebuild.sh misc-functions.sh ; then
dump_trace 2 ${filespacing} ${linespacing}
eerror " $(printf "%${filespacing}s" "${BASH_SOURCE[1]##*/}"), line $(printf "%${linespacing}s" "${BASH_LINENO[0]}"): Called die"
eerror "The specific snippet of code:"
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2011-02-06 13:09 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2011-02-06 13:09 UTC (permalink / raw
To: gentoo-commits
commit: 77f39aae4f2f3604407ca942bbfa58ef51bfa3a8
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 30 23:24:48 2011 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan 30 23:24:48 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=77f39aae
die: include $EBUILD_PHASE in message
When a helper binary dies automatically in EAPI 4 and later, we don't
get a stack trace, so at least report the phase that failed.
---
bin/isolated-functions.sh | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 8af202f..f89c11e 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -136,7 +136,11 @@ die() {
(( n-- ))
done
- eerror "ERROR: $CATEGORY/$PF failed:"
+ # When a helper binary dies automatically in EAPI 4 and later, we don't
+ # get a stack trace, so at least report the phase that failed.
+ local phase_str=
+ [[ -n $EBUILD_PHASE ]] && phase_str=" ($EBUILD_PHASE phase)"
+ eerror "ERROR: $CATEGORY/$PF failed${phase_str}:"
eerror " ${*:-(no error message)}"
eerror
# dump_trace is useless when the main script is a helper binary
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2011-03-03 19:53 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2011-03-03 19:53 UTC (permalink / raw
To: gentoo-commits
commit: e491bb8031350de79734ba15b084f60f3e0f2fc2
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 27 13:18:06 2011 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 13:18:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e491bb80
Always start with DEFAULT_ABI, if it is enabled
---
bin/auto-multilib.sh | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 0469105..9fc3b01 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -114,14 +114,13 @@ is_ebuild() {
}
get_abi_order() {
- local order= dodefault=
+ local order=
+ use multilib_abi_"${DEFAULT_ABI}" && order=${DEFAULT_ABI}
if is_auto-multilib; then
- for x in ${MULTILIB_ABIS} ; do
- use multilib_abi_"${x}" && order="${order} ${x}"
+ for x in ${MULTILIB_ABIS/${DEFAULT_ABI}} ; do
+ use multilib_abi_"${x}" && order+=" ${x}"
done
- else
- order=${DEFAULT_ABI}
fi
if [ -z "${order}" ]; then
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2011-07-05 17:34 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2011-07-05 17:34 UTC (permalink / raw
To: gentoo-commits
commit: 9735a747c4a5d9cd79d3a04b37dffb0e0ee26a49
Author: Nathan Phillip Brink <binki <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 27 01:25:10 2011 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 01:41:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9735a747
Fix portage-multilib compilation of asm files (for autotools projects) when the user has set CCASFLAGS in make.conf.
During ./configure, if CCASFLAGS is unest it will default to CFLAGS
(or in essence, ${CCASFLAGS:=${CFLAGS}}). The old portage-multilib
behavior was to not define CCASFLAGS. However, certain users may wish
to define CCASFLAGS. In such a scenario, -m32 would never enter into
CCASFLAGS because the user's CCASFLAGS would be used by ./configure
instead of CFLAGS.
This patch causes portage-multilib to set CCASFLAGS to CFLAGS if it is
unset and then append the ABI-specific CFLAGS (such as -m32). This
allows a user to have different CCASFLAGS and still have successful
multilib builds.
---
bin/auto-multilib.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 9fc3b01..73259d9 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -227,6 +227,7 @@ _setup_abi_env() {
export CHOST=$(get_abi_var CHOST $1)
export CBUILD=$(get_abi_var CHOST $1)
export CDEFINE="$(get_abi_var CDEFINE $1)"
+ export CCASFLAGS="${CCASFLAGS:-${CFLAGS}} $(get_abi_var CFLAGS)"
export CFLAGS="${CFLAGS} $(get_abi_var CFLAGS)"
export CPPFLAGS="${CPPFLAGS} $(get_abi_var CPPFLAGS)"
export CXXFLAGS="${CXXFLAGS} $(get_abi_var CFLAGS)"
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2011-07-15 13:33 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2011-07-15 13:33 UTC (permalink / raw
To: gentoo-commits
commit: b25198292425a3f0739f224974d7a5235c07121f
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 13:32:34 2011 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 13:32:34 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b2519829
Adjust deprecated hasq call
---
bin/auto-multilib.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 73259d9..674bed0 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -101,7 +101,7 @@ has_multilib_profile() {
}
is_auto-multilib() {
- if has_multilib_profile && ! hasq multilib-native ${INHERITED} && ! use multilib; then
+ if has_multilib_profile && ! has multilib-native ${INHERITED} && ! use multilib; then
for i in ${MULTILIB_ABIS} ; do
use multilib_abi_"${i}" && [[ "${i}" != "${DEFAULT_ABI}" ]] && return 0
done
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2011-07-15 13:43 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2011-07-15 13:43 UTC (permalink / raw
To: gentoo-commits
commit: e4994fda0b289a788210f8790e7e6ad4dca914ac
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 13:41:50 2011 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 13:41:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e4994fda
Keep header symlinks and their targets in sync
---
bin/auto-multilib.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 674bed0..4cafc35 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -336,7 +336,7 @@ _finalize_abi_install() {
for dir in ${dirs}; do
if use multilib_abi_"${DEFAULT_ABI}" ; then
cd "${base}${dir}/gentoo-multilib/${DEFAULT_ABI}" || die
- for i in $(find . -type f); do
+ for i in $(find . -type l ; find . -type f); do
for diffabi in ${ALTERNATE_ABIS}; do
diff -q "${i}" ../${diffabi}/"${i}" >/dev/null || files_differ=1
done
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2011-09-09 13:16 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2011-09-09 13:16 UTC (permalink / raw
To: gentoo-commits
commit: d0c86632d0cf8e61d3605bfb4b8d28ee11227b6b
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 9 13:16:02 2011 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Sep 9 13:16:02 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d0c86632
Fix issue from merge
---
bin/ebuild.sh | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 67a1a8b..26cb611 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -765,7 +765,6 @@ dyn_unpack() {
fi
is_ebuild && { unset_abi; source "${T}"/environment || die ; }
- done
is_ebuild && { rm "${T}"/environment || die ; }
>> "$PORTAGE_BUILDDIR/.unpacked" || \
die "Failed to create $PORTAGE_BUILDDIR/.unpacked"
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2011-10-02 14:00 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2011-10-02 14:00 UTC (permalink / raw
To: gentoo-commits
commit: 550783cc265cc2851af2e80011de49917c1397f2
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 14:00:18 2011 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 14:00:18 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=550783cc
Fix merge result
---
bin/ebuild.sh | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index aebdb17..2aae318 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -156,7 +156,6 @@ if ! has "$EBUILD_PHASE" clean cleanrm depend help ; then
cd "$PORTAGE_BUILDDIR" || \
die "PORTAGE_BUILDDIR does not exist: '$PORTAGE_BUILDDIR'"
fi
->>>>>>> v2.2.0_alpha58
#if no perms are specified, dirs/files will have decent defaults
#(not secretive, but not stupid)
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2011-10-03 12:34 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2011-10-03 12:34 UTC (permalink / raw
To: gentoo-commits
commit: 89a8b8bc44af7664d1a5d9b064f4442ed7c845bb
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 3 12:34:35 2011 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 3 12:34:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=89a8b8bc
Wrap all binaries in /bin /usr/bin /sbin and /usr/sbin
---
bin/auto-multilib.sh | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 4cafc35..67b53e1 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -72,8 +72,8 @@ prep_ml_binaries() {
mv ${binary} ${binary}-${ABI} || die
_debug ${binary} ${binary}-${ABI}
if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
- ln -s /usr/bin/abi-wrapper ${binary} || die
- _debug /usr/bin/abi-wrapper ${binary}
+ ln -s /bin/abi-wrapper ${binary} || die
+ _debug /bin/abi-wrapper ${binary}
fi
done
}
@@ -277,14 +277,14 @@ _finalize_abi_install() {
# Create wrapper symlink for *-config files
local i=
- prep_ml_binaries $(find "${D}"usr/bin -type f -name '*-config' 2>/dev/null)
+ prep_ml_binaries $(find "${D}"usr/bin "${D}"usr/sbin "${D}"bin "${D}"sbin -type f -name '*-config' 2>/dev/null)
local noabi=()
for i in ${MULTILIB_ABIS}; do
noabi+=( ! -name '*-'${i} )
done
if [[ ${MULTILIB_BINARIES} == *${CATEGORY}/${PN}* ]]; then
- for i in $(find "${D}"usr/bin/ -type f ${noabi[@]}) $(find "${D}"bin/ -type f ${noabi[@]}); do
+ for i in $(find "${D}"usr/bin/ "${D}"usr/sbin "${D}"bin "${D}"sbin -type f ${noabi[@]}) ); do
prep_ml_binaries "${i}"
done
fi
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2011-10-03 12:40 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2011-10-03 12:40 UTC (permalink / raw
To: gentoo-commits
commit: 2e687a0a955908341537511f215e8e62bbe2330b
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 3 12:39:56 2011 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 3 12:39:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2e687a0a
Fix brackets
---
bin/auto-multilib.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 67b53e1..b268b24 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -284,7 +284,7 @@ _finalize_abi_install() {
noabi+=( ! -name '*-'${i} )
done
if [[ ${MULTILIB_BINARIES} == *${CATEGORY}/${PN}* ]]; then
- for i in $(find "${D}"usr/bin/ "${D}"usr/sbin "${D}"bin "${D}"sbin -type f ${noabi[@]}) ); do
+ for i in $(find "${D}"usr/bin/ "${D}"usr/sbin "${D}"bin "${D}"sbin -type f ${noabi[@]}); do
prep_ml_binaries "${i}"
done
fi
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2011-10-31 19:50 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2011-10-31 19:50 UTC (permalink / raw
To: gentoo-commits
commit: 6e974a299674af0f67cfb87aa9092623b4442cb4
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 19:50:22 2011 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 19:50:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6e974a29
Also remove .abi file
---
bin/phase-functions.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 6fc8b51..1922aa6 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -292,6 +292,7 @@ dyn_clean() {
if [[ $EMERGE_FROM = binary ]] || ! has keepwork $FEATURES; then
rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,logid,pretended*,setuped*,unpacked*,prepared*} \
"$PORTAGE_BUILDDIR"/.{configured*,compiled*,tested*,packaged*} \
+ "$PORTAGE_BUILDDIR"/.abi \
"$PORTAGE_BUILDDIR"/.die_hooks \
"$PORTAGE_BUILDDIR"/.ipc_{in,out,lock} \
"$PORTAGE_BUILDDIR"/.exit_status
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2011-11-14 20:58 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2011-11-14 20:58 UTC (permalink / raw
To: gentoo-commits
commit: 12cc1427abc4fc14f5a3087e447fa641f34b1a55
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 20:58:38 2011 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 20:58:38 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=12cc1427
Add exception for media-libs/gst-plugins-*
---
bin/phase-functions.sh | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 122faeb..b6e450b 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -639,6 +639,9 @@ dyn_install() {
if [[ "${CATEGORY}/${PN}" == "sys-devel/libtool" ]] ; then
ewarn "Preserving libltdl.la because of extensive usage"
ewarn "even in m4 macros of libtool"
+ elif [[ "${CATEGORY}/${PN}" == "media-libs/gst-plugins-"* ]]
+ ewarn "Preserving .la files for gst plugins
+ ewarn "because of broken Gentoo package"
else
find "${D}" -name '*.la' ! -exec grep -q shouldnotlink=yes {} \; -exec rm {} \;
fi
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2011-11-14 21:05 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2011-11-14 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 48827a5ed95b2c02af32690ec3c9d193c0a76d53
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 21:05:08 2011 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 21:05:08 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=48827a5e
fix overquoting
---
bin/phase-functions.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index b6e450b..aaf8ba0 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -636,10 +636,10 @@ dyn_install() {
fi
done
if [[ -d "${D}" ]]; then
- if [[ "${CATEGORY}/${PN}" == "sys-devel/libtool" ]] ; then
+ if [[ ${CATEGORY}/${PN} == sys-devel/libtool ]] ; then
ewarn "Preserving libltdl.la because of extensive usage"
ewarn "even in m4 macros of libtool"
- elif [[ "${CATEGORY}/${PN}" == "media-libs/gst-plugins-"* ]]
+ elif [[ ${CATEGORY}/${PN} == media-libs/gst-plugins-* ]]
ewarn "Preserving .la files for gst plugins
ewarn "because of broken Gentoo package"
else
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2011-11-14 21:07 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2011-11-14 21:07 UTC (permalink / raw
To: gentoo-commits
commit: 9d5c593045f8a18bc3f4dcfc05895165bf15394f
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 21:07:49 2011 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 21:07:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9d5c5930
better limit the echo line
---
bin/phase-functions.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index aaf8ba0..038616a 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -640,7 +640,7 @@ dyn_install() {
ewarn "Preserving libltdl.la because of extensive usage"
ewarn "even in m4 macros of libtool"
elif [[ ${CATEGORY}/${PN} == media-libs/gst-plugins-* ]]
- ewarn "Preserving .la files for gst plugins
+ ewarn "Preserving .la files for gst plugins"
ewarn "because of broken Gentoo package"
else
find "${D}" -name '*.la' ! -exec grep -q shouldnotlink=yes {} \; -exec rm {} \;
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2011-11-14 21:11 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2011-11-14 21:11 UTC (permalink / raw
To: gentoo-commits
commit: 8e91d97b307d275a0a90ecfccc7ad68894a1a54f
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 21:11:24 2011 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 21:11:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8e91d97b
fix incomplete line
---
bin/phase-functions.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 038616a..9e2d275 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -639,7 +639,7 @@ dyn_install() {
if [[ ${CATEGORY}/${PN} == sys-devel/libtool ]] ; then
ewarn "Preserving libltdl.la because of extensive usage"
ewarn "even in m4 macros of libtool"
- elif [[ ${CATEGORY}/${PN} == media-libs/gst-plugins-* ]]
+ elif [[ ${CATEGORY}/${PN} == media-libs/gst-plugins-* ]] ; then
ewarn "Preserving .la files for gst plugins"
ewarn "because of broken Gentoo package"
else
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2011-11-17 17:59 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2011-11-17 17:59 UTC (permalink / raw
To: gentoo-commits
commit: 1293e045ad66ca676a7e330bce668819c7c2fdf7
Author: Nathan Phillip Brink <binki <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 01:03:47 2011 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 17:59:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1293e045
Treat symlinks in /usr/include more carefully by not removing them when diff(1) thinks they are different.
This change recognizes that symlinks can be valid even when they are
pointing to files that are nonexistent. When portage-multilib is
merging /usr/include, the situation of the link targets disappearing
is expected.
This fixes invalid installation of media-libs/openjpeg-1.4-r1 on
portage-multilib.
---
bin/auto-multilib.sh | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index b268b24..aa65d39 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -337,9 +337,16 @@ _finalize_abi_install() {
if use multilib_abi_"${DEFAULT_ABI}" ; then
cd "${base}${dir}/gentoo-multilib/${DEFAULT_ABI}" || die
for i in $(find . -type l ; find . -type f); do
- for diffabi in ${ALTERNATE_ABIS}; do
- diff -q "${i}" ../${diffabi}/"${i}" >/dev/null || files_differ=1
- done
+ # Ignore symbolic links, they can't be
+ # ABI-ized and diff is confused when the
+ # link's target is removed (by this
+ # loop).
+ if ! [[ -L ${i} ]]; then
+ for diffabi in ${ALTERNATE_ABIS}; do
+ diff -q "${i}" ../${diffabi}/"${i}" >/dev/null || files_differ=1
+ done
+ fi
+
if [ -z "${files_differ}" ]; then
[ -d "${D}${dir}/${i%/*}" ] || mkdir -p "${D}${dir}/${i%/*}"
mv ${base}${dir}/gentoo-multilib/${DEFAULT_ABI}/"${i}" "${D}${dir}/${i}" || die "$DEFAULT_ABI failed"
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2012-02-26 16:27 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2012-02-26 16:27 UTC (permalink / raw
To: gentoo-commits
commit: d038cfcd7eb952e0d4017b66c35ba2734859bfb7
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 15:04:00 2012 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 15:04:00 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d038cfcd
phase-functions.sh: Move multilib behind force-multilib FEATURE
---
bin/phase-functions.sh | 337 +++++++++++++++++++++++++++---------------------
1 files changed, 192 insertions(+), 145 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 538cae5..7307b76 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -225,34 +225,42 @@ dyn_pretend() {
}
dyn_setup() {
- if ! is_auto-multilib && ! use multilib_abi_"${DEFAULT_ABI}" ; then
- ewarn
- ewarn "You disabled all ABIs"
- ewarn "You should enable at least one ABI"
- ewarn "Enabling the default ABI now"
- ewarn
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ if ! is_auto-multilib && ! use multilib_abi_"${DEFAULT_ABI}" ; then
+ ewarn
+ ewarn "You disabled all ABIs"
+ ewarn "You should enable at least one ABI"
+ ewarn "Enabling the default ABI now"
+ ewarn
+ fi
fi
for LOOP_ABI in $(get_abi_list); do
- set_abi ${LOOP_ABI}
- if is_ebuild; then
- source "${T}"/environment || die
- else
- rm -f "${T}"/environment
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ set_abi ${LOOP_ABI}
+ if is_ebuild; then
+ source "${T}"/environment || die
+ else
+ rm -f "${T}"/environment
+ fi
+ if [[ -e $PORTAGE_BUILDDIR/.setuped.${ABI} ]] ; then
+ vecho ">>> It appears that '$PF' is already setup; skipping."
+ vecho ">>> Remove '$PORTAGE_BUILDDIR/.setuped.${ABI}' to force setup."
+ return 0
+ fi
fi
- if [[ -e $PORTAGE_BUILDDIR/.setuped.${ABI} ]] ; then
- vecho ">>> It appears that '$PF' is already setup; skipping."
- vecho ">>> Remove '$PORTAGE_BUILDDIR/.setuped.${ABI}' to force setup."
- return 0
- fi
ebuild_phase pre_pkg_setup
ebuild_phase pkg_setup
>> "$PORTAGE_BUILDDIR/.setuped.${ABI}" || \
die "Failed to create $PORTAGE_BUILDDIR/.setuped"
- ebuild_phase post_pkg_setup
- is_ebuild && { unset_abi; source "${T}"/environment || die ; }
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { unset_abi; source "${T}"/environment || die ; }
done
- is_ebuild && { rm "${T}"/environment || die ; }
+
+ >> "$PORTAGE_BUILDDIR/.setuped" || \
+ die "Failed to create $PORTAGE_BUILDDIR/.setuped"
+ ebuild_phase post_pkg_setup
+
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { rm "${T}"/environment || die ; }
}
dyn_unpack() {
@@ -268,12 +276,14 @@ dyn_unpack() {
vecho ">>> Unpacking source$(_get_abi_string)..."
ebuild_phase src_unpack
- if is_auto-multilib && is_ebuild; then
- >> "$PORTAGE_BUILDDIR"/.unpacked."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .unpacked.${LOOP_ABI}'"
- fi
- is_ebuild && { unset_abi; source "${T}"/environment || die ; }
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ if is_auto-multilib && is_ebuild; then
+ >> "$PORTAGE_BUILDDIR"/.unpacked."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .unpacked.${LOOP_ABI}'"
+ fi
+ is_ebuild && { unset_abi; source "${T}"/environment || die ; }
- is_ebuild && { rm "${T}"/environment || die ; }
+ is_ebuild && { rm "${T}"/environment || die ; }
+ fi
>> "$PORTAGE_BUILDDIR/.unpacked" || \
die "Failed to create $PORTAGE_BUILDDIR/.unpacked"
vecho ">>> Source unpacked in ${WORKDIR}"
@@ -392,13 +402,15 @@ dyn_prepare() {
fi
for LOOP_ABI in $(get_abi_list); do
- is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
- if [ "${PORTAGE_BUILDDIR}"/.prepared.${LOOP_ABI} -nt "${WORKDIR}" ]; then
- echo ">>> It appears that ${PN} is already prepared for ABI=${LOOP_ABI}; skipping."
- echo ">>> Remove '$PORTAGE_BUILDDIR/.prepared.${LOOP_ABI}' to force prepare."
- continue
- fi
+ if [ "${PORTAGE_BUILDDIR}"/.prepared.${LOOP_ABI} -nt "${WORKDIR}" ]; then
+ echo ">>> It appears that ${PN} is already prepared for ABI=${LOOP_ABI}; skipping."
+ echo ">>> Remove '$PORTAGE_BUILDDIR/.prepared.${LOOP_ABI}' to force prepare."
+ continue
+ fi
+ fi
if [[ -d $S ]] ; then
cd "${S}"
elif has $EAPI 0 1 2 3 3_pre2 ; then
@@ -415,12 +427,14 @@ dyn_prepare() {
vecho ">>> Preparing source in $PWD$(_get_abi_string) ..."
ebuild_phase src_prepare
- if is_auto-multilib && is_ebuild; then
- >> "$PORTAGE_BUILDDIR"/.prepared."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .prepared.${LOOP_ABI}'"
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ if is_auto-multilib && is_ebuild; then
+ >> "$PORTAGE_BUILDDIR"/.prepared."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .prepared.${LOOP_ABI}'"
+ fi
+ is_ebuild && { unset_abi; source "${T}"/environment || die ; }
fi
- is_ebuild && { unset_abi; source "${T}"/environment || die ; }
done
- is_ebuild && { rm "${T}"/environment || die ; }
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { rm "${T}"/environment || die ; }
>> "$PORTAGE_BUILDDIR/.prepared" || \
die "Failed to create $PORTAGE_BUILDDIR/.prepared"
@@ -439,13 +453,15 @@ dyn_configure() {
fi
for LOOP_ABI in $(get_abi_list); do
- is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
- if [ ${PORTAGE_BUILDDIR}/.configured.${LOOP_ABI} -nt "${WORKDIR}" ]; then
- echo ">>> It appears that ${PN} is already configured for ABI=${LOOP_ABI}; skipping."
- echo ">>> Remove '$PORTAGE_BUILDDIR/.configured.${LOOP_ABI}' to force configuration."
- continue
- fi
+ if [ ${PORTAGE_BUILDDIR}/.configured.${LOOP_ABI} -nt "${WORKDIR}" ]; then
+ echo ">>> It appears that ${PN} is already configured for ABI=${LOOP_ABI}; skipping."
+ echo ">>> Remove '$PORTAGE_BUILDDIR/.configured.${LOOP_ABI}' to force configuration."
+ continue
+ fi
+ fi
if [[ -d $S ]] ; then
cd "${S}"
elif has $EAPI 0 1 2 3 3_pre2 ; then
@@ -463,12 +479,14 @@ dyn_configure() {
vecho ">>> Configuring source in $PWD$(_get_abi_string) ..."
ebuild_phase src_configure
- if is_auto-multilib && is_ebuild; then
- >> "$PORTAGE_BUILDDIR"/.configured."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .configured.${LOOP_ABI}'"
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ if is_auto-multilib && is_ebuild; then
+ >> "$PORTAGE_BUILDDIR"/.configured."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .configured.${LOOP_ABI}'"
+ fi
+ is_ebuild && { unset_abi; source "${T}"/environment || die ; }
fi
- is_ebuild && { unset_abi; source "${T}"/environment || die ; }
done
- is_ebuild && { rm "${T}"/environment || die ; }
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { rm "${T}"/environment || die ; }
>> "$PORTAGE_BUILDDIR/.configured" || \
die "Failed to create $PORTAGE_BUILDDIR/.configured"
vecho ">>> Source configured."
@@ -487,12 +505,14 @@ dyn_compile() {
fi
for LOOP_ABI in $(get_abi_list); do
- is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
- if [ ${PORTAGE_BUILDDIR}/.compiled.${LOOP_ABI} -nt "${WORKDIR}" ]; then
- echo ">>> It appears that ${PN} is already compiled for ABI=${LOOP_ABI}; skipping."
- echo ">>> Remove '$PORTAGE_BUILDDIR/.compiled.${LOOP_ABI}' to force compilation."
- continue
+ if [ ${PORTAGE_BUILDDIR}/.compiled.${LOOP_ABI} -nt "${WORKDIR}" ]; then
+ echo ">>> It appears that ${PN} is already compiled for ABI=${LOOP_ABI}; skipping."
+ echo ">>> Remove '$PORTAGE_BUILDDIR/.compiled.${LOOP_ABI}' to force compilation."
+ continue
+ fi
fi
if [[ -d $S ]] ; then
cd "${S}"
@@ -518,12 +538,14 @@ dyn_compile() {
vecho ">>> Compiling source in $PWD$(_get_abi_string) ..."
ebuild_phase src_compile
- if is_auto-multilib && is_ebuild; then
- >> "$PORTAGE_BUILDDIR"/.compiled."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .compiled.${LOOP_ABI}'"
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ if is_auto-multilib && is_ebuild; then
+ >> "$PORTAGE_BUILDDIR"/.compiled."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .compiled.${LOOP_ABI}'"
+ fi
+ is_ebuild && { unset_abi; source "${T}"/environment || die ; }
fi
- is_ebuild && { unset_abi; source "${T}"/environment || die ; }
done
- is_ebuild && { rm "${T}"/environment || die ; }
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { rm "${T}"/environment || die ; }
>> "$PORTAGE_BUILDDIR/.compiled" || \
die "Failed to create $PORTAGE_BUILDDIR/.compiled"
vecho ">>> Source compiled."
@@ -534,7 +556,6 @@ dyn_compile() {
}
dyn_test() {
-
if [[ -e $PORTAGE_BUILDDIR/.tested ]] ; then
vecho ">>> It appears that ${PN} has already been tested; skipping."
vecho ">>> Remove '${PORTAGE_BUILDDIR}/.tested' to force test."
@@ -549,7 +570,7 @@ dyn_test() {
trap "abort_test" SIGINT SIGQUIT
for LOOP_ABI in $(get_abi_list); do
- is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
if [ -d "${S}" ]; then
cd "${S}"
@@ -563,10 +584,12 @@ dyn_test() {
einfo "Skipping make test/check due to ebuild restriction."
vecho ">>> Test phase [explicitly disabled]: ${CATEGORY}/${PF}"
else
- if [ ${PORTAGE_BUILDDIR}/.tested.${LOOP_ABI} -nt "${WORKDIR}" ]; then
- echo ">>> It appears that ${PN} is already tested for ABI=${LOOP_ABI}; skipping."
- echo ">>> Remove '$PORTAGE_BUILDDIR/.tested.${LOOP_ABI}' to force testing."
- continue
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ if [ ${PORTAGE_BUILDDIR}/.tested.${LOOP_ABI} -nt "${WORKDIR}" ]; then
+ echo ">>> It appears that ${PN} is already tested for ABI=${LOOP_ABI}; skipping."
+ echo ">>> Remove '$PORTAGE_BUILDDIR/.tested.${LOOP_ABI}' to force testing."
+ continue
+ fi
fi
local save_sp=${SANDBOX_PREDICT}
@@ -574,18 +597,20 @@ dyn_test() {
ebuild_phase pre_src_test
ebuild_phase src_test
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
if is_auto-multilib && is_ebuild; then
>> "$PORTAGE_BUILDDIR"/.tested."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .tested.${LOOP_ABI}'"
fi
+ fi
>> "$PORTAGE_BUILDDIR/.tested" || \
die "Failed to create $PORTAGE_BUILDDIR/.tested"
ebuild_phase post_src_test
SANDBOX_PREDICT=${save_sp}
fi
- is_ebuild && { unset_abi; source "${T}"/environment || die ; }
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { unset_abi; source "${T}"/environment || die ; }
done
- is_ebuild && { rm "${T}"/environment || die ; }
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { rm "${T}"/environment || die ; }
trap - SIGINT SIGQUIT
}
@@ -606,11 +631,11 @@ dyn_install() {
[[ " ${FEATURES} " == *" force-prefix "* ]] || \
case "$EAPI" in 0|1|2) _x=${D} ;; esac
rm -rf "${D}"
- is_auto-multilib && rm -rf "${D}".${ABI}
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && is_auto-multilib && rm -rf "${D}".${ABI}
mkdir -p "${_x}"
unset _x
- for LOOP_ABI in $(get_abi_list); do
- is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
+ for LOOP_ABI in $(get_abi_list); do
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
if [[ -d $S ]] ; then
cd "${S}"
@@ -638,7 +663,7 @@ dyn_install() {
ebuild_phase src_install
- if is_auto-multilib ; then
+ if ( [[ " ${FEATURES} " == *" force-multilib "* ]] && is_auto-multilib ) ; then
_finalize_abi_install
cp "${T}"/environment "${PORTAGE_BUILDDIR}"/build-info/environment.${LOOP_ABI} || die
if is_ebuild; then
@@ -648,14 +673,16 @@ dyn_install() {
fi
done
if [[ -d "${D}" ]]; then
- if [[ ${CATEGORY}/${PN} == sys-devel/libtool ]] ; then
- ewarn "Preserving libltdl.la because of extensive usage"
- ewarn "even in m4 macros of libtool"
- elif [[ ${CATEGORY}/${PN} == media-libs/gst-plugins-* ]] ; then
- ewarn "Preserving .la files for gst plugins"
- ewarn "because of broken Gentoo package"
- else
- find "${D}" -name '*.la' ! -exec grep -q shouldnotlink=yes {} \; -exec rm {} \;
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ if [[ ${CATEGORY}/${PN} == sys-devel/libtool ]] ; then
+ ewarn "Preserving libltdl.la because of extensive usage"
+ ewarn "even in m4 macros of libtool"
+ elif [[ ${CATEGORY}/${PN} == media-libs/gst-plugins-* ]] ; then
+ ewarn "Preserving .la files for gst plugins"
+ ewarn "because of broken Gentoo package"
+ else
+ find "${D}" -name '*.la' ! -exec grep -q shouldnotlink=yes {} \; -exec rm {} \;
+ fi
fi
>> "$PORTAGE_BUILDDIR/.installed" || \
@@ -681,18 +708,20 @@ dyn_install() {
[[ -n $x ]] && echo "$x" > $f
done
fi
- if has_multilib_profile ; then
- local i= x=
- for i in ${MULTILIB_ABIS} ; do
- x+=" multilib_abi_${i}"
- done
- echo "${IUSE}${x}" > IUSE
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ if has_multilib_profile ; then
+ local i= x=
+ for i in ${MULTILIB_ABIS} ; do
+ x+=" multilib_abi_${i}"
+ done
+ echo "${IUSE}${x}" > IUSE
+ fi
+ if is_auto-multilib; then
+ echo "$(get_abi_order)" > MULTILIB_ABIS
+ fi
fi
echo "${USE}" > USE
echo "${EAPI:-0}" > EAPI
- if is_auto-multilib; then
- echo "$(get_abi_order)" > MULTILIB_ABIS
- fi
# Save EPREFIX, since it makes it easy to use chpathtool to
# adjust the content of a binary package so that it will
@@ -726,21 +755,21 @@ dyn_install() {
fi
else
- cd "${PORTAGE_BUILDDIR}"
- if [[ $EMERGE_FROM = binary ]] || ! has keepwork $FEATURES; then
- rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,exit_status,logid,unpacked,prepared} \
- "$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged} \
- "$PORTAGE_BUILDDIR"/.die_hooks
-
-# rm -rf "${PORTAGE_BUILDDIR}/build-info"
- rm -rf "${WORKDIR}"
- fi
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ cd "${PORTAGE_BUILDDIR}"
+ if [[ $EMERGE_FROM = binary ]] || ! has keepwork $FEATURES; then
+ rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,exit_status,logid,unpacked,prepared} \
+ "$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged} \
+ "$PORTAGE_BUILDDIR"/.die_hooks
+
+ rm -rf "${WORKDIR}"
+ fi
- if [ -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then
- find "${PORTAGE_BUILDDIR}" -type d ! -regex "^${WORKDIR}" | sort -r | tr "\n" "\0" | $XARGS -0 rmdir &>/dev/null
+ if [ -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then
+ find "${PORTAGE_BUILDDIR}" -type d ! -regex "^${WORKDIR}" | sort -r | tr "\n" "\0" | $XARGS -0 rmdir &>/dev/null
+ fi
fi
fi
-
trap - SIGINT SIGQUIT
}
@@ -750,11 +779,9 @@ dyn_preinst() {
return 1
fi
for LOOP_ABI in $(get_abi_order); do
- set_abi ${LOOP_ABI}; source "${T}"/environment || die
-
- ebuild_phase_with_hooks pkg_preinst
-
- unset_abi; source "${T}"/environment || die
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
+ ebuild_phase_with_hooks pkg_preinst
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && { unset_abi; source "${T}"/environment || die ; }
done
}
@@ -1035,24 +1062,62 @@ ebuild_main() {
fi
;;
prerm|postrm|postinst)
- for LOOP_ABI in $(get_abi_order); do
- if is_auto-multilib ; then
- case ${1} in
- postinst)
- set_abi ${LOOP_ABI}
- ;;
- prerm|postrm)
- # if = backward compactibility for previous versions, which did not
- # install a per-ABI environment
- if [[ -f "${ROOT}"var/db/pkg/${CATEGORY}/${PF}/environment.${LOOP_ABI}.bz2 ]] ; then
- bzcat "${ROOT}"var/db/pkg/${CATEGORY}/${PF}/environment.${LOOP_ABI}.bz2 > "${T}"/environment || die
- preprocess_ebuild_env --filter-metadata
- fi
- ;;
- esac
- # >/dev/null = backward compactibility for prerm/postrm
- source "${T}"/environment 2>/dev/null || die
- fi
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ for LOOP_ABI in $(get_abi_order); do
+ if is_auto-multilib ; then
+ case ${1} in
+ postinst)
+ set_abi ${LOOP_ABI}
+ ;;
+ prerm|postrm)
+ # if = backward compactibility for previous versions, which did not
+ # install a per-ABI environment
+ if [[ -f "${ROOT}"var/db/pkg/${CATEGORY}/${PF}/environment.${LOOP_ABI}.bz2 ]] ; then
+ bzcat "${ROOT}"var/db/pkg/${CATEGORY}/${PF}/environment.${LOOP_ABI}.bz2 > "${T}"/environment || die
+ preprocess_ebuild_env --filter-metadata
+ fi
+ ;;
+ esac
+ # >/dev/null = backward compactibility for prerm/postrm
+ source "${T}"/environment 2>/dev/null || die
+ fi
+ export SANDBOX_ON="0"
+ if [ "${PORTAGE_DEBUG}" != "1" ] || [ "${-/x/}" != "$-" ]; then
+ ebuild_phase_with_hooks pkg_${1}
+ else
+ set -x
+ ebuild_phase_with_hooks pkg_${1}
+ set +x
+ fi
+
+ if [[ $EBUILD_PHASE == postinst ]] && [[ -n $PORTAGE_UPDATE_ENV ]]; then
+ # Update environment.bz2 in case installation phases
+ # need to pass some variables to uninstallation phases.
+ save_ebuild_env --exclude-init-phases | \
+ filter_readonly_variables --filter-path \
+ --filter-sandbox --allow-extra-vars \
+ | ${PORTAGE_BZIP2_COMMAND} -c -f9 > "$PORTAGE_UPDATE_ENV"
+ assert "save_ebuild_env failed"
+ fi
+ if is_auto-multilib ; then
+ case ${1} in
+ postinst)
+ unset_abi
+ ;;
+ prerm|postrm)
+ #if = backward compactibility for previous versions, which did not
+ #install a per-ABI environment
+ if [[ -f "${ROOT}"var/db/pkg/${CATEGORY}/${PF}/environment.${LOOP_ABI}.bz2 ]] ; then
+ preprocess_ebuild_env --filter-metadata
+ bzcat "${ROOT}"var/db/pkg/${CATEGORY}/${PF}/environment.${LOOP_ABI}.bz2 > "${T}"/environment || die
+ fi
+ ;;
+ esac
+ # >/dev/null = backward compactibility for prerm/postrm
+ source "${T}"/environment 2>/dev/null || die
+ fi
+ done
+ else
export SANDBOX_ON="0"
if [ "${PORTAGE_DEBUG}" != "1" ] || [ "${-/x/}" != "$-" ]; then
ebuild_phase_with_hooks pkg_${1}
@@ -1061,34 +1126,16 @@ ebuild_main() {
ebuild_phase_with_hooks pkg_${1}
set +x
fi
-
- if [[ $EBUILD_PHASE == postinst ]] && [[ -n $PORTAGE_UPDATE_ENV ]]; then
- # Update environment.bz2 in case installation phases
- # need to pass some variables to uninstallation phases.
- save_ebuild_env --exclude-init-phases | \
- filter_readonly_variables --filter-path \
- --filter-sandbox --allow-extra-vars \
- | ${PORTAGE_BZIP2_COMMAND} -c -f9 > "$PORTAGE_UPDATE_ENV"
- assert "save_ebuild_env failed"
- fi
- if is_auto-multilib ; then
- case ${1} in
- postinst)
- unset_abi
- ;;
- prerm|postrm)
- #if = backward compactibility for previous versions, which did not
- #install a per-ABI environment
- if [[ -f "${ROOT}"var/db/pkg/${CATEGORY}/${PF}/environment.${LOOP_ABI}.bz2 ]] ; then
- preprocess_ebuild_env --filter-metadata
- bzcat "${ROOT}"var/db/pkg/${CATEGORY}/${PF}/environment.${LOOP_ABI}.bz2 > "${T}"/environment || die
- fi
- ;;
- esac
- # >/dev/null = backward compactibility for prerm/postrm
- source "${T}"/environment 2>/dev/null || die
- fi
- done
+ fi
+ if [[ $EBUILD_PHASE == postinst ]] && [[ -n $PORTAGE_UPDATE_ENV ]]; then
+ # Update environment.bz2 in case installation phases
+ # need to pass some variables to uninstallation phases.
+ save_ebuild_env --exclude-init-phases | \
+ filter_readonly_variables --filter-path \
+ --filter-sandbox --allow-extra-vars \
+ | ${PORTAGE_BZIP2_COMMAND} -c -f9 > "$PORTAGE_UPDATE_ENV"
+ assert "save_ebuild_env failed"
+ fi
;;
unpack|prepare|configure|compile|test|clean|install)
if [[ ${SANDBOX_DISABLED:-0} = 0 ]] ; then
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2012-02-26 16:27 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2012-02-26 16:27 UTC (permalink / raw
To: gentoo-commits
commit: ea7212cfb57756e2e95d687cb1f2eda52cff934b
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 13:44:34 2012 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 13:44:34 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ea7212cf
phase-helpers.sh: Move multilib behind force-multilib FEATURE
---
bin/phase-helpers.sh | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 8ede693..6e06044 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -196,11 +196,10 @@ use() {
# Make sure we have this USE flag in IUSE
elif [[ -n $PORTAGE_IUSE && -n $EBUILD_PHASE ]] ; then
- if [[ $u != multilib ]]; then
- [[ $u =~ $PORTAGE_IUSE ]] || \
+ ( [[ " ${FEATURES} " == *" force-multilib "* ]] && [[ $u == multilib ]] ) || \
+ [[ $u =~ $PORTAGE_IUSE ]] || \
eqawarn "QA Notice: USE Flag '${u}' not" \
"in IUSE for ${CATEGORY}/${PF}"
- fi
fi
if has ${u} ${USE} ; then
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2012-02-26 16:27 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2012-02-26 16:27 UTC (permalink / raw
To: gentoo-commits
commit: 909addf96cca3fe5de77e96f47f7d8b9233bac57
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 15:29:52 2012 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 15:29:52 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=909addf9
auto-multilib.sh: Move multilib behind force-multilib FEATURE
---
bin/auto-multilib.sh | 52 ++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index db49c52..d9c68e8 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -114,34 +114,42 @@ is_ebuild() {
}
get_abi_order() {
- local order=
- use multilib_abi_"${DEFAULT_ABI}" && order=${DEFAULT_ABI}
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ local order=
+ use multilib_abi_"${DEFAULT_ABI}" && order=${DEFAULT_ABI}
- if is_auto-multilib; then
- for x in ${MULTILIB_ABIS/${DEFAULT_ABI}} ; do
- use multilib_abi_"${x}" && order+=" ${x}"
- done
- fi
+ if is_auto-multilib; then
+ for x in ${MULTILIB_ABIS/${DEFAULT_ABI}} ; do
+ use multilib_abi_"${x}" && order+=" ${x}"
+ done
+ fi
- if [ -z "${order}" ]; then
- if ! [ -z "${DEFAULT_ABI}" ]; then
- order=${DEFAULT_ABI}
- else
- die "Could not determine your profile ABI(s). Perhaps your USE flags or MULTILIB_ABIS are too restrictive for this package or your profile does not set DEFAULT_ABI."
+ if [ -z "${order}" ]; then
+ if ! [ -z "${DEFAULT_ABI}" ]; then
+ order=${DEFAULT_ABI}
+ else
+ die "Could not determine your profile ABI(s). Perhaps your USE flags or MULTILIB_ABIS are too restrictive for this package or your profile does not set DEFAULT_ABI."
+ fi
fi
- fi
- echo ${order}
+ echo ${order}
+ else
+ echo "default"
+ fi
}
get_abi_list() {
- if ! is_ebuild; then
- for my_abi in $(get_abi_order); do
- [[ -e "${D%/}".${my_abi} ]] || break
- done
- fi
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ if ! is_ebuild; then
+ for my_abi in $(get_abi_order); do
+ [[ -e "${D%/}".${my_abi} ]] || break
+ done
+ fi
- is_ebuild && echo $(get_abi_order) || echo ${my_abi}
+ is_ebuild && echo $(get_abi_order) || echo ${my_abi}
+ else
+ echo "default"
+ fi
}
set_abi() {
@@ -215,9 +223,9 @@ unset_abi() {
}
_get_abi_string() {
- if is_auto-multilib && [ -n "${ABI}" ]; then
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && \
+ is_auto-multilib && [ -n "${ABI}" ] && \
echo " (for ABI=${ABI})"
- fi
}
_setup_abi_env() {
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2012-03-16 19:23 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2012-03-16 19:23 UTC (permalink / raw
To: gentoo-commits
commit: b5b2e8a458b0f3a488bc377297c71a23f609c662
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 19:23:33 2012 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 19:23:33 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b5b2e8a4
Only modify flags, if multilib USE flag is disabled
---
bin/auto-multilib.sh | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index d9c68e8..31b85f1 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -229,28 +229,30 @@ _get_abi_string() {
}
_setup_abi_env() {
- # Set the CHOST native first so that we pick up the native
- # toolchain and not a cross-compiler by accident #202811.
- export CHOST=$(get_abi_var CHOST ${DEFAULT_ABI})
- export AS="$(tc-getPROG AS as)"
- export CC="$(tc-getPROG CC gcc)"
- export CXX="$(tc-getPROG CXX g++)"
- export FC="$(tc-getPROG FC gfortran)"
- export CHOST=$(get_abi_var CHOST $1)
- export CBUILD=$(get_abi_var CHOST $1)
- export CDEFINE="$(get_abi_var CDEFINE $1)"
- export CCASFLAGS="${CCASFLAGS:-${CFLAGS}} $(get_abi_var CFLAGS)"
- export CFLAGS="${CFLAGS} $(get_abi_var CFLAGS)"
- export CPPFLAGS="${CPPFLAGS} $(get_abi_var CPPFLAGS)"
- export CXXFLAGS="${CXXFLAGS} $(get_abi_var CFLAGS)"
- export FCFLAGS="${FCFLAGS} $(get_abi_var CFLAGS)"
- export FFLAGS="${FFLAGS} $(get_abi_var CFLAGS)"
- export ASFLAGS="${ASFLAGS} $(get_abi_var ASFLAGS)"
- export LDFLAGS="${LDFLAGS} $(get_abi_var CFLAGS)"
- local LIBDIR=$(get_abi_var LIBDIR $1)
- export PKG_CONFIG_PATH="/usr/${LIBDIR}/pkgconfig"
- if [[ "${ABI}" != "${DEFAULT_ABI}" ]]; then
- [[ -z ${CCACHE_DIR} ]] || export CCACHE_DIR=${CCACHE_DIR}/${ABI}
+ if is_auto-multilib ; then
+ # Set the CHOST native first so that we pick up the native
+ # toolchain and not a cross-compiler by accident #202811.
+ export CHOST=$(get_abi_var CHOST ${DEFAULT_ABI})
+ export AS="$(tc-getPROG AS as)"
+ export CC="$(tc-getPROG CC gcc)"
+ export CXX="$(tc-getPROG CXX g++)"
+ export FC="$(tc-getPROG FC gfortran)"
+ export CHOST=$(get_abi_var CHOST $1)
+ export CBUILD=$(get_abi_var CHOST $1)
+ export CDEFINE="$(get_abi_var CDEFINE $1)"
+ export CCASFLAGS="${CCASFLAGS:-${CFLAGS}} $(get_abi_var CFLAGS)"
+ export CFLAGS="${CFLAGS} $(get_abi_var CFLAGS)"
+ export CPPFLAGS="${CPPFLAGS} $(get_abi_var CPPFLAGS)"
+ export CXXFLAGS="${CXXFLAGS} $(get_abi_var CFLAGS)"
+ export FCFLAGS="${FCFLAGS} $(get_abi_var CFLAGS)"
+ export FFLAGS="${FFLAGS} $(get_abi_var CFLAGS)"
+ export ASFLAGS="${ASFLAGS} $(get_abi_var ASFLAGS)"
+ export LDFLAGS="${LDFLAGS} $(get_abi_var CFLAGS)"
+ local LIBDIR=$(get_abi_var LIBDIR $1)
+ export PKG_CONFIG_PATH="/usr/${LIBDIR}/pkgconfig"
+ if [[ "${ABI}" != "${DEFAULT_ABI}" ]]; then
+ [[ -z ${CCACHE_DIR} ]] || export CCACHE_DIR=${CCACHE_DIR}/${ABI}
+ fi
fi
}
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2012-03-16 19:26 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2012-03-16 19:26 UTC (permalink / raw
To: gentoo-commits
commit: fe663a299b1c896493c3b8929b9e571af57f57fb
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 19:26:14 2012 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 19:26:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fe663a29
Wrap binaries by default, unless restricted
---
bin/auto-multilib.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 31b85f1..ef7e667 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -297,7 +297,7 @@ _finalize_abi_install() {
for i in ${MULTILIB_ABIS}; do
noabi+=( ! -name '*-'${i} )
done
- if [[ ${MULTILIB_BINARIES} == *${CATEGORY}/${PN}* ]]; then
+ if ! [[ ${RESTRICT_MULTILIB_BINARIES} == *${CATEGORY}/${PN}* ]]; then
for i in $(find "${D}"usr/bin/ "${D}"usr/sbin "${D}"bin "${D}"sbin -type f ${noabi[@]}); do
prep_ml_binaries "${i}"
done
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2012-03-16 19:37 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2012-03-16 19:37 UTC (permalink / raw
To: gentoo-commits
commit: 85913fb6054117bc0def49e2f52b14ecda9407c8
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 19:36:52 2012 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 19:36:52 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=85913fb6
Dont show find messages about not existing directories, when searching for binaries to wrap
---
bin/auto-multilib.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index ef7e667..b218dcd 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -298,7 +298,7 @@ _finalize_abi_install() {
noabi+=( ! -name '*-'${i} )
done
if ! [[ ${RESTRICT_MULTILIB_BINARIES} == *${CATEGORY}/${PN}* ]]; then
- for i in $(find "${D}"usr/bin/ "${D}"usr/sbin "${D}"bin "${D}"sbin -type f ${noabi[@]}); do
+ for i in $(find "${D}"usr/bin/ "${D}"usr/sbin "${D}"bin "${D}"sbin -type f ${noabi[@]} 2>/dev/null); do
prep_ml_binaries "${i}"
done
fi
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2012-03-16 21:23 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2012-03-16 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 6ef770a5381b085931fbc18e5022fb08c81a366f
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 21:23:05 2012 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 21:23:05 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6ef770a5
Dont restrict cross-compiling to packages with binaries in /usr/bin, also include packages with binaries in other locations
---
bin/auto-multilib.sh | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index b218dcd..89b1892 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -304,8 +304,10 @@ _finalize_abi_install() {
fi
local LIBDIR=$(get_abi_var LIBDIR $1)
if ( [[ -d "${D}${LIBDIR}" ]] || [[ -d "${D}usr/${LIBDIR}" ]] || [[ -d "${base}" ]] || \
- (shopt -s nullglob dotglob; f=("${D}"usr/bin/*-config); ((${#f[@]}))) || \
- ( [[ ${MULTILIB_BINARIES} == *${CATEGORY}/${PN}* ]] && [[ -d "${D}"usr/bin ]] ) ); then
+ (shopt -s nullglob dotglob; f=("${D}"usr/bin/*-config); ((${#f[@]}))) || \
+ ( ! [[ ${MULTILIB_BINARIES} == *${CATEGORY}/${PN}* ]] && \
+ ( [[ -d "${D}"usr/bin ]] || \
+ [[ -d "${D}"usr/sbin ]] || [[ -d "${D}"bin ]] || [[ -d "${D}"sbin ]])) ); then
mv "${D}" "${D%/}".${ABI} || die
for my_abi in ${ALL_ABIS}; do
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2012-03-18 15:25 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2012-03-18 15:25 UTC (permalink / raw
To: gentoo-commits
commit: 07b9015118fc15a01036ec43a10b412f64a50860
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 15:25:21 2012 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 15:25:21 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=07b90151
Adjust var for move to default binaries wrapping
---
bin/auto-multilib.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 89b1892..46cbc40 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -305,7 +305,7 @@ _finalize_abi_install() {
local LIBDIR=$(get_abi_var LIBDIR $1)
if ( [[ -d "${D}${LIBDIR}" ]] || [[ -d "${D}usr/${LIBDIR}" ]] || [[ -d "${base}" ]] || \
(shopt -s nullglob dotglob; f=("${D}"usr/bin/*-config); ((${#f[@]}))) || \
- ( ! [[ ${MULTILIB_BINARIES} == *${CATEGORY}/${PN}* ]] && \
+ ( ! [[ ${RESTRICT_MULTILIB_BINARIES} == *${CATEGORY}/${PN}* ]] && \
( [[ -d "${D}"usr/bin ]] || \
[[ -d "${D}"usr/sbin ]] || [[ -d "${D}"bin ]] || [[ -d "${D}"sbin ]])) ); then
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2012-03-25 17:38 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2012-03-25 17:38 UTC (permalink / raw
To: gentoo-commits
commit: 85d5c94e4f9e3b938befa9b4a77dfafc31cb49ef
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 17:38:31 2012 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Mar 25 17:38:31 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=85d5c94e
Install symlink to abi-wrapper for first installed ABI, not just for the default ABI, also only remove installed symlinks, if the current ABI is not the first installed ABI
---
bin/auto-multilib.sh | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 46cbc40..7abed9b 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -71,7 +71,7 @@ prep_ml_binaries() {
for binary in "$@"; do
mv ${binary} ${binary}-${ABI} || die
_debug ${binary} ${binary}-${ABI}
- if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
+ if [[ ${ABI} == ${first_installed_abi} ]]; then
ln -s /bin/abi-wrapper ${binary} || die
_debug /bin/abi-wrapper ${binary}
fi
@@ -269,6 +269,8 @@ _finalize_abi_install() {
local ALTERNATE_ABIS=${ALL_ABIS#* }
local dirs=${ABI_HEADER_DIRS-/usr/include}
local base=
+ local first_installed_abi=
+ local i
# Save header files for each ABI
for dir in ${dirs}; do
@@ -281,11 +283,14 @@ _finalize_abi_install() {
done
# Symlinks are not overwritten without the "-f" option, so
- # remove them in non-default ABI
- if [ "${ABI}" != "${DEFAULT_ABI}" ]; then
+ # remove them in second and following enabled ABIs
+ for i in ${ALL_ABIS} ; do
+ use multilib_abi_${i} && first_installed_abi=${i} && break
+ done
+ if [ "${ABI}" != "${first_installed_abi}" ]; then
vecho ">>> Removing installed symlinks $(_get_abi_string)"
for i in $(find ${D} -type l) ; do
- [[ -e "${D%/}".${DEFAULT_ABI}/${i/${D}} ]] && rm -f ${i}
+ [[ -e "${D%/}".${first_installed_abi}/${i/${D}} ]] && rm -f ${i}
done
fi
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2012-07-01 11:58 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2012-07-01 11:58 UTC (permalink / raw
To: gentoo-commits
commit: 0604da19dcfd201686a980edcdb0ed70a06427ff
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 1 11:58:21 2012 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jul 1 11:58:21 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0604da19
Missed a location for abiwrapper switch in the loop check
---
bin/auto-multilib.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 4287f0f..be0b05c 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -310,7 +310,7 @@ _finalize_abi_install() {
local LIBDIR=$(get_abi_var LIBDIR $1)
if ( [[ -d "${D}${LIBDIR}" ]] || [[ -d "${D}usr/${LIBDIR}" ]] || [[ -d "${base}" ]] || \
(shopt -s nullglob dotglob; f=("${D}"usr/bin/*-config); ((${#f[@]}))) || \
- ( ! [[ ${RESTRICT_MULTILIB_BINARIES} == *${CATEGORY}/${PN}* ]] && \
+ ( use abiwrapper && \
( [[ -d "${D}"usr/bin ]] || \
[[ -d "${D}"usr/sbin ]] || [[ -d "${D}"bin ]] || [[ -d "${D}"sbin ]])) ); then
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2012-07-02 5:22 Zac Medico
0 siblings, 0 replies; 49+ messages in thread
From: Zac Medico @ 2012-07-02 5:22 UTC (permalink / raw
To: gentoo-commits
commit: bf98260e8cc570cd64de5ff6e66f06ecfc359f2d
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 2 05:22:14 2012 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jul 2 05:22:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=bf98260e
phase-helpers.sh: remove subshell from use()
---
bin/phase-helpers.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 6e06044..b9e8bbf 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -196,7 +196,7 @@ use() {
# Make sure we have this USE flag in IUSE
elif [[ -n $PORTAGE_IUSE && -n $EBUILD_PHASE ]] ; then
- ( [[ " ${FEATURES} " == *" force-multilib "* ]] && [[ $u == multilib ]] ) || \
+ [[ " ${FEATURES} " == *" force-multilib "* && $u == multilib ]] || \
[[ $u =~ $PORTAGE_IUSE ]] || \
eqawarn "QA Notice: USE Flag '${u}' not" \
"in IUSE for ${CATEGORY}/${PF}"
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2012-07-08 10:03 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2012-07-08 10:03 UTC (permalink / raw
To: gentoo-commits
commit: d63d72cbdafa5fa3661e0c755038e6a886e698f2
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 8 09:55:36 2012 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jul 8 09:55:36 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d63d72cb
Rename get_abi_var and tc-getPROG function to indicate, that they are portage internal functions
---
bin/auto-multilib.sh | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index be0b05c..121d5fd 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -34,12 +34,12 @@ _restore_abi_env() {
preprocess_ebuild_env --filter-metadata
}
-# @FUNCTION: get_abi_var
+# @FUNCTION: portage-get_abi_var
# @USAGE: <VAR> [ABI]
# @RETURN: returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
# @DESCRIPTION:
# ex:
-# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
+# CFLAGS=$(portage-get_abi_var CFLAGS sparc32) # CFLAGS=-m32
#
# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
# This will hopefully be added to portage soon...
@@ -47,7 +47,7 @@ _restore_abi_env() {
# If <ABI> is not specified, ${ABI} is used.
# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
-get_abi_var() {
+portage-get_abi_var() {
local flag=$1
local abi
if [ $# -gt 1 ]; then
@@ -78,7 +78,7 @@ prep_ml_binaries() {
done
}
-tc-getPROG() {
+portage-getPROG() {
local var=$1
local prog=$2
@@ -232,23 +232,23 @@ _setup_abi_env() {
if is_auto-multilib ; then
# Set the CHOST native first so that we pick up the native
# toolchain and not a cross-compiler by accident #202811.
- export CHOST=$(get_abi_var CHOST ${DEFAULT_ABI})
- export AS="$(tc-getPROG AS as)"
- export CC="$(tc-getPROG CC gcc)"
- export CXX="$(tc-getPROG CXX g++)"
- export FC="$(tc-getPROG FC gfortran)"
- export CHOST=$(get_abi_var CHOST $1)
- export CBUILD=$(get_abi_var CHOST $1)
- export CDEFINE="$(get_abi_var CDEFINE $1)"
- export CCASFLAGS="${CCASFLAGS:-${CFLAGS}} $(get_abi_var CFLAGS)"
- export CFLAGS="${CFLAGS} $(get_abi_var CFLAGS)"
- export CPPFLAGS="${CPPFLAGS} $(get_abi_var CPPFLAGS)"
- export CXXFLAGS="${CXXFLAGS} $(get_abi_var CFLAGS)"
- export FCFLAGS="${FCFLAGS} $(get_abi_var CFLAGS)"
- export FFLAGS="${FFLAGS} $(get_abi_var CFLAGS)"
- export ASFLAGS="${ASFLAGS} $(get_abi_var ASFLAGS)"
- export LDFLAGS="${LDFLAGS} $(get_abi_var CFLAGS)"
- local LIBDIR=$(get_abi_var LIBDIR $1)
+ export CHOST=$(portage-get_abi_var CHOST ${DEFAULT_ABI})
+ export AS="$(portage-getPROG AS as)"
+ export CC="$(portage-getPROG CC gcc)"
+ export CXX="$(portage-getPROG CXX g++)"
+ export FC="$(portage-getPROG FC gfortran)"
+ export CHOST=$(portage-get_abi_var CHOST $1)
+ export CBUILD=$(portage-get_abi_var CHOST $1)
+ export CDEFINE="$(portage-get_abi_var CDEFINE $1)"
+ export CCASFLAGS="${CCASFLAGS:-${CFLAGS}} $(portage-get_abi_var CFLAGS)"
+ export CFLAGS="${CFLAGS} $(portage-get_abi_var CFLAGS)"
+ export CPPFLAGS="${CPPFLAGS} $(portage-get_abi_var CPPFLAGS)"
+ export CXXFLAGS="${CXXFLAGS} $(portage-get_abi_var CFLAGS)"
+ export FCFLAGS="${FCFLAGS} $(portage-get_abi_var CFLAGS)"
+ export FFLAGS="${FFLAGS} $(portage-get_abi_var CFLAGS)"
+ export ASFLAGS="${ASFLAGS} $(portage-get_abi_var ASFLAGS)"
+ export LDFLAGS="${LDFLAGS} $(portage-get_abi_var CFLAGS)"
+ local LIBDIR=$(portage-get_abi_var LIBDIR $1)
export PKG_CONFIG_PATH="/usr/${LIBDIR}/pkgconfig"
if [[ "${ABI}" != "${DEFAULT_ABI}" ]]; then
[[ -z ${CCACHE_DIR} ]] || export CCACHE_DIR=${CCACHE_DIR}/${ABI}
@@ -307,7 +307,7 @@ _finalize_abi_install() {
prep_ml_binaries "${i}"
done
fi
- local LIBDIR=$(get_abi_var LIBDIR $1)
+ local LIBDIR=$(portage-get_abi_var LIBDIR $1)
if ( [[ -d "${D}${LIBDIR}" ]] || [[ -d "${D}usr/${LIBDIR}" ]] || [[ -d "${base}" ]] || \
(shopt -s nullglob dotglob; f=("${D}"usr/bin/*-config); ((${#f[@]}))) || \
( use abiwrapper && \
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2012-09-22 15:30 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2012-09-22 15:30 UTC (permalink / raw
To: gentoo-commits
commit: 5dac178ab00b74c4af304a748d15b98d969650f6
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 15:30:07 2012 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 15:30:07 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5dac178a
Follow variable renaming for internal functions
---
bin/auto-multilib.sh | 4 ++--
bin/phase-functions.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 121d5fd..0df4b2f 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -18,7 +18,7 @@ _save_abi_env() {
[[ -n ${MULTILIB_DEBUG} ]] && \
einfo "MULTILIB_DEBUG: Saving Environment:" "${1}"
mkdir -p ${PORTAGE_BUILDDIR}/abi-code
- save_ebuild_env --exclude-init-phases | filter_readonly_variables \
+ __save_ebuild_env --exclude-init-phases | __filter_readonly_variables \
--filter-path --filter-sandbox --allow-extra-vars --filter-metadata > ${PORTAGE_BUILDDIR}/abi-code/environment."${1}"
[[ $UID == 0 ]] && chown portage:portage ${PORTAGE_BUILDDIR}/abi-code/environment."${1}"
}
@@ -31,7 +31,7 @@ _restore_abi_env() {
[[ -n ${MULTILIB_DEBUG} ]] && \
einfo "MULTILIB_DEBUG: Restoring Environment:" "${1}"
cp ${PORTAGE_BUILDDIR}/abi-code/environment."${1}" "${T}"/environment || die
- preprocess_ebuild_env --filter-metadata
+ __preprocess_ebuild_env --filter-metadata
}
# @FUNCTION: portage-get_abi_var
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 6ebcbe0..1afa45e 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -1070,7 +1070,7 @@ __ebuild_main() {
# install a per-ABI environment
if [[ -f "${ROOT}"var/db/pkg/${CATEGORY}/${PF}/environment.${LOOP_ABI}.bz2 ]] ; then
bzcat "${ROOT}"var/db/pkg/${CATEGORY}/${PF}/environment.${LOOP_ABI}.bz2 > "${T}"/environment || die
- preprocess_ebuild_env --filter-metadata
+ __preprocess_ebuild_env --filter-metadata
fi
;;
esac
@@ -1105,7 +1105,7 @@ __ebuild_main() {
#if = backward compactibility for previous versions, which did not
#install a per-ABI environment
if [[ -f "${ROOT}"var/db/pkg/${CATEGORY}/${PF}/environment.${LOOP_ABI}.bz2 ]] ; then
- preprocess_ebuild_env --filter-metadata
+ __preprocess_ebuild_env --filter-metadata
bzcat "${ROOT}"var/db/pkg/${CATEGORY}/${PF}/environment.${LOOP_ABI}.bz2 > "${T}"/environment || die
fi
;;
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2012-09-24 20:42 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2012-09-24 20:42 UTC (permalink / raw
To: gentoo-commits
commit: 74b1323c38b955dafbec31b4b1c9543d9c536ab6
Author: Nathan Phillip Brink <binki <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 24 01:54:42 2012 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 20:42:21 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=74b1323c
Replace incorrect references to removed vecho() function with references to internal __vecho() function in auto-multilib.sh.
---
bin/auto-multilib.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 0df4b2f..1386cd9 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -275,7 +275,7 @@ _finalize_abi_install() {
# Save header files for each ABI
for dir in ${dirs}; do
[ -d "${D}/${dir}" ] || continue
- vecho ">>> Saving headers $(_get_abi_string)"
+ __vecho ">>> Saving headers $(_get_abi_string)"
base=${PORTAGE_BUILDDIR}/abi-code/gentoo-multilib/${dir}/gentoo-multilib
mkdir -p ${base}
[ -d ${base}/${ABI} ] && rm -rvf ${base}/${ABI}
@@ -288,7 +288,7 @@ _finalize_abi_install() {
use multilib_abi_${i} && first_installed_abi=${i} && break
done
if [ "${ABI}" != "${first_installed_abi}" ]; then
- vecho ">>> Removing installed symlinks $(_get_abi_string)"
+ __vecho ">>> Removing installed symlinks $(_get_abi_string)"
for i in $(find ${D} -type l) ; do
[[ -e "${D%/}".${first_installed_abi}/${i/${D}} ]] && rm -f ${i}
done
@@ -351,7 +351,7 @@ _finalize_abi_install() {
fi
done
else # ABIS differ
- vecho ">>> Creating multilib headers"
+ __vecho ">>> Creating multilib headers"
base=${PORTAGE_BUILDDIR}/abi-code/gentoo-multilib
local files_differ=
for dir in ${dirs}; do
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2012-12-20 20:38 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2012-12-20 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 1a35bcc3be9db6a2bd5eb50af19965b2b6950701
Author: Nathan Phillip Brink <binki <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 20 04:35:23 2012 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Thu Dec 20 20:37:48 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1a35bcc3
Remove multilib workaround which saves .la files for media-libs/gst-plugins-* packages because bug #300256 has been resolved.
---
bin/phase-functions.sh | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index a6354b8..50955af 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -675,9 +675,6 @@ __dyn_install() {
if [[ ${CATEGORY}/${PN} == sys-devel/libtool ]] ; then
ewarn "Preserving libltdl.la because of extensive usage"
ewarn "even in m4 macros of libtool"
- elif [[ ${CATEGORY}/${PN} == media-libs/gst-plugins-* ]] ; then
- ewarn "Preserving .la files for gst plugins"
- ewarn "because of broken Gentoo package"
else
find "${D}" -name '*.la' ! -exec grep -q shouldnotlink=yes {} \; -exec rm {} \;
fi
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2013-02-27 19:44 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2013-02-27 19:44 UTC (permalink / raw
To: gentoo-commits
commit: 86d8c1bcea663ceb62867eb0131e7769f2914806
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 27 19:44:11 2013 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 19:44:11 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=86d8c1bc
Add a workaround to disable the new multilib eclass usage in xorg-2 eclass based ebuilds
---
bin/ebuild.sh | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8fd6ae5..0226ed2 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -198,6 +198,8 @@ debug-print-section() {
# Sources all eclasses in parameters
declare -ix ECLASS_DEPTH=0
inherit() {
+ XORG_MULTILIB=no
+ MULTILIB_USEDEP="${ARCH}"
ECLASS_DEPTH=$(($ECLASS_DEPTH + 1))
if [[ ${ECLASS_DEPTH} > 1 ]]; then
debug-print "*** Multiple Inheritence (Level: ${ECLASS_DEPTH})"
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2013-03-03 13:44 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2013-03-03 13:44 UTC (permalink / raw
To: gentoo-commits
commit: 6f6f51607974bd844eb918e6d7edac8130699c31
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 3 13:44:28 2013 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 13:44:28 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6f6f5160
Remove multilib eclass specific workarounds, since behaviour can now be changed via USE flags
---
bin/ebuild.sh | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 0226ed2..8fd6ae5 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -198,8 +198,6 @@ debug-print-section() {
# Sources all eclasses in parameters
declare -ix ECLASS_DEPTH=0
inherit() {
- XORG_MULTILIB=no
- MULTILIB_USEDEP="${ARCH}"
ECLASS_DEPTH=$(($ECLASS_DEPTH + 1))
if [[ ${ECLASS_DEPTH} > 1 ]]; then
debug-print "*** Multiple Inheritence (Level: ${ECLASS_DEPTH})"
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2013-09-17 13:02 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2013-09-17 13:02 UTC (permalink / raw
To: gentoo-commits
commit: 1bd557ccd474ef26a0311bc9be4f6ff528b47dfe
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 13:01:58 2013 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 13:01:58 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1bd557cc
Only source auto-multilib.sh, when FEATURES=force-multilib
---
bin/ebuild.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 3aa6e84..7d88a03 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -10,7 +10,10 @@ PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}"
unalias -a
source "${PORTAGE_BIN_PATH}/isolated-functions.sh" || exit 1
-source "${PORTAGE_BIN_PATH}/auto-multilib.sh" || exit 1
+
+if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ source "${PORTAGE_BIN_PATH}/auto-multilib.sh" || exit 1
+fi
if [[ $EBUILD_PHASE != depend ]] ; then
source "${PORTAGE_BIN_PATH}/phase-functions.sh" || die
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2015-05-05 12:05 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2015-05-05 12:05 UTC (permalink / raw
To: gentoo-commits
commit: 47c39606998a29f78056f077b7a8a29e0bf20c86
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Tue May 5 12:07:57 2015 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue May 5 12:07:57 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=47c39606
Removed unused conditions for is_ebuild
bin/auto-multilib.sh | 34 +++-----------------------------
bin/phase-functions.sh | 53 +-------------------------------------------------
2 files changed, 4 insertions(+), 83 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 0b7a635..73f1574 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -109,10 +109,6 @@ is_auto-multilib() {
return 1
}
-is_ebuild() {
- [[ ${PORTAGE_CALLER} == ebuild ]] && return 0 || return 1
-}
-
get_abi_order() {
if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
local order=
@@ -140,13 +136,10 @@ get_abi_order() {
get_abi_list() {
if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
- if ! is_ebuild; then
- for my_abi in $(get_abi_order); do
- [[ -e "${D%/}".${my_abi} ]] || break
- done
- fi
+ for my_abi in $(get_abi_order); do
+ [[ -e "${D%/}".${my_abi} ]] || break
+ done
- is_ebuild && echo $(get_abi_order) || echo ${my_abi}
else
echo "default"
fi
@@ -166,17 +159,6 @@ set_abi() {
unset ABI_SAVE
fi
- if is_ebuild; then
- if [ -d "${WORKDIR}" ]; then
- _unset_abi_dir
- fi
-
- if [ -d "${WORKDIR}.${abi}" ]; then
- # If it doesn't exist, then we're making it soon in dyn_unpack
- mv ${WORKDIR}.${abi} ${WORKDIR} || die "IO Failure -- Failed to 'mv work.${abi} work'"
- fi
- fi
-
echo "${abi}" > ${PORTAGE_BUILDDIR}/.abi || die "IO Failure -- Failed to create .abi."
[[ $UID == 0 ]] && chown portage:portage ${PORTAGE_BUILDDIR}/.abi
@@ -210,9 +192,6 @@ _unset_abi_dir() {
unset_abi() {
is_auto-multilib || return 0;
- if is_ebuild; then
- _unset_abi_dir
- fi
_save_abi_env "${ABI}"
export ABI=${DEFAULT_ABI}
if [[ -f ${PORTAGE_BUILDDIR}/abi-code/environment."${ABI}" ]]; then
@@ -318,13 +297,6 @@ _finalize_abi_install() {
for my_abi in ${ALL_ABIS}; do
[[ -e "${D%/}".${my_abi} ]] || return 0
done
- else
- if is_ebuild; then
- mv "${D}" "${D%/}".${ABI} || die
- for my_abi in ${ALL_ABIS}; do
- [[ -e "${D%/}".${my_abi} ]] || return 0
- done
- fi
fi
mkdir -p "${D}"
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 79a86cf..7537ddc 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -234,11 +234,7 @@ __dyn_setup() {
for LOOP_ABI in $(get_abi_list); do
if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
set_abi ${LOOP_ABI}
- if is_ebuild; then
- source "${T}"/environment || die
- else
- rm -f "${T}"/environment
- fi
+ rm -f "${T}"/environment
if [[ -e $PORTAGE_BUILDDIR/.setuped.${ABI} ]] ; then
__vecho ">>> It appears that '$PF' is already setup; skipping."
__vecho ">>> Remove '$PORTAGE_BUILDDIR/.setuped.${ABI}' to force setup."
@@ -250,14 +246,12 @@ __dyn_setup() {
>> "$PORTAGE_BUILDDIR/.setuped.${ABI}" || \
die "Failed to create $PORTAGE_BUILDDIR/.setuped"
- [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { unset_abi; source "${T}"/environment || die ; }
done
>> "$PORTAGE_BUILDDIR/.setuped" || \
die "Failed to create $PORTAGE_BUILDDIR/.setuped"
__ebuild_phase post_pkg_setup
- [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { rm "${T}"/environment || die ; }
}
__dyn_unpack() {
@@ -273,14 +267,6 @@ __dyn_unpack() {
__vecho ">>> Unpacking source$(_get_abi_string)..."
__ebuild_phase src_unpack
- if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
- if is_auto-multilib && is_ebuild; then
- >> "$PORTAGE_BUILDDIR"/.unpacked."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .unpacked.${LOOP_ABI}'"
- fi
- is_ebuild && { unset_abi; source "${T}"/environment || die ; }
-
- is_ebuild && { rm "${T}"/environment || die ; }
- fi
>> "$PORTAGE_BUILDDIR/.unpacked" || \
die "Failed to create $PORTAGE_BUILDDIR/.unpacked"
__vecho ">>> Source unpacked in ${WORKDIR}"
@@ -400,7 +386,6 @@ __dyn_prepare() {
for LOOP_ABI in $(get_abi_list); do
if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
- is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
if [ "${PORTAGE_BUILDDIR}"/.prepared.${LOOP_ABI} -nt "${WORKDIR}" ]; then
echo ">>> It appears that ${PN} is already prepared for ABI=${LOOP_ABI}; skipping."
@@ -424,14 +409,7 @@ __dyn_prepare() {
__vecho ">>> Preparing source in $PWD$(_get_abi_string) ..."
__ebuild_phase src_prepare
- if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
- if is_auto-multilib && is_ebuild; then
- >> "$PORTAGE_BUILDDIR"/.prepared."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .prepared.${LOOP_ABI}'"
- fi
- is_ebuild && { unset_abi; source "${T}"/environment || die ; }
- fi
done
- [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { rm "${T}"/environment || die ; }
>> "$PORTAGE_BUILDDIR/.prepared" || \
die "Failed to create $PORTAGE_BUILDDIR/.prepared"
@@ -464,7 +442,6 @@ __dyn_configure() {
for LOOP_ABI in $(get_abi_list); do
if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
- is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
if [ ${PORTAGE_BUILDDIR}/.configured.${LOOP_ABI} -nt "${WORKDIR}" ]; then
echo ">>> It appears that ${PN} is already configured for ABI=${LOOP_ABI}; skipping."
@@ -490,14 +467,7 @@ __dyn_configure() {
__vecho ">>> Configuring source in $PWD$(_get_abi_string) ..."
__ebuild_phase src_configure
- if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
- if is_auto-multilib && is_ebuild; then
- >> "$PORTAGE_BUILDDIR"/.configured."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .configured.${LOOP_ABI}'"
- fi
- is_ebuild && { unset_abi; source "${T}"/environment || die ; }
- fi
done
- [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { rm "${T}"/environment || die ; }
>> "$PORTAGE_BUILDDIR/.configured" || \
die "Failed to create $PORTAGE_BUILDDIR/.configured"
__vecho ">>> Source configured."
@@ -517,7 +487,6 @@ __dyn_compile() {
for LOOP_ABI in $(get_abi_list); do
if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
- is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
if [ ${PORTAGE_BUILDDIR}/.compiled.${LOOP_ABI} -nt "${WORKDIR}" ]; then
echo ">>> It appears that ${PN} is already compiled for ABI=${LOOP_ABI}; skipping."
@@ -543,14 +512,7 @@ __dyn_compile() {
__vecho ">>> Compiling source in $PWD$(_get_abi_string) ..."
__ebuild_phase src_compile
- if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
- if is_auto-multilib && is_ebuild; then
- >> "$PORTAGE_BUILDDIR"/.compiled."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .compiled.${LOOP_ABI}'"
- fi
- is_ebuild && { unset_abi; source "${T}"/environment || die ; }
- fi
done
- [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { rm "${T}"/environment || die ; }
>> "$PORTAGE_BUILDDIR/.compiled" || \
die "Failed to create $PORTAGE_BUILDDIR/.compiled"
__vecho ">>> Source compiled."
@@ -570,7 +532,6 @@ __dyn_test() {
trap "__abort_test" SIGINT SIGQUIT
for LOOP_ABI in $(get_abi_list); do
- [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
__start_distcc
if [ -d "${S}" ]; then
@@ -610,11 +571,6 @@ __dyn_test() {
__vecho ">>> Test phase: ${CATEGORY}/${PF}"
__ebuild_phase src_test
- if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
- if is_auto-multilib && is_ebuild; then
- >> "$PORTAGE_BUILDDIR"/.tested."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .tested.${LOOP_ABI}'"
- fi
- fi
__vecho ">>> Completed testing ${CATEGORY}/${PF}"
>> "$PORTAGE_BUILDDIR/.tested" || \
@@ -623,9 +579,7 @@ __dyn_test() {
SANDBOX_PREDICT=${save_sp}
fi
- [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { unset_abi; source "${T}"/environment || die ; }
done
- [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { rm "${T}"/environment || die ; }
trap - SIGINT SIGQUIT
}
@@ -654,7 +608,6 @@ __dyn_install() {
mkdir -p "${_x}"
unset _x
for LOOP_ABI in $(get_abi_list); do
- [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
if [[ -d $S ]] ; then
cd "${S}"
@@ -685,10 +638,6 @@ __dyn_install() {
if ( [[ " ${FEATURES} " == *" force-multilib "* ]] && is_auto-multilib ) ; then
_finalize_abi_install
cp "${T}"/environment "${PORTAGE_BUILDDIR}"/build-info/environment.${LOOP_ABI} || die
- if is_ebuild; then
- unset_abi; source "${T}"/environment || die
- touch "$PORTAGE_BUILDDIR"/.installed."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .installed.${LOOP_ABI}'"
- fi
fi
done
if [[ -d "${D}" ]]; then
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2015-05-05 12:05 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2015-05-05 12:05 UTC (permalink / raw
To: gentoo-commits
commit: 12311d395bd80db466b80c582877a60ab1dc67ff
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Tue May 5 11:58:41 2015 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue May 5 11:58:41 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=12311d39
Update exception list for no multilib actions when abi_x86_32 is enabled
bin/auto-multilib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 1386cd9..0b7a635 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -101,7 +101,7 @@ has_multilib_profile() {
}
is_auto-multilib() {
- if has_multilib_profile && ! has multilib-native ${INHERITED} && ! use multilib; then
+ if has_multilib_profile && ! has multilib-native ${INHERITED} && ! use multilib && ! use abi_x86_32; then
for i in ${MULTILIB_ABIS} ; do
use multilib_abi_"${i}" && [[ "${i}" != "${DEFAULT_ABI}" ]] && return 0
done
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2015-05-05 13:22 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2015-05-05 13:22 UTC (permalink / raw
To: gentoo-commits
commit: cf7284cba66a1d6e747ce916de24a5c25b5654f8
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Tue May 5 13:25:26 2015 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue May 5 13:25:26 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=cf7284cb
Fix build, removed a bit too much
bin/auto-multilib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 73f1574..c17c2e8 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -139,7 +139,7 @@ get_abi_list() {
for my_abi in $(get_abi_order); do
[[ -e "${D%/}".${my_abi} ]] || break
done
-
+ echo ${my_abi}
else
echo "default"
fi
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2016-02-28 12:57 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2016-02-28 12:57 UTC (permalink / raw
To: gentoo-commits
commit: d288acc2d1413a8739e74b2c20050dc2cc3bc69c
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 12:57:19 2016 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 12:57:19 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d288acc2
Drop accidently added check for .setuped
bin/phase-functions.sh | 6 ------
1 file changed, 6 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 858f713..420c9af 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -222,12 +222,6 @@ __dyn_pretend() {
}
__dyn_setup() {
- if [[ -e $PORTAGE_BUILDDIR/.setuped ]] ; then
- __vecho ">>> It appears that '$PF' is already setup; skipping."
- __vecho ">>> Remove '$PORTAGE_BUILDDIR/.setuped' to force setup."
- return
- fi
-
if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
if ! is_auto-multilib && ! use multilib_abi_"${DEFAULT_ABI}" ; then
ewarn
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2018-01-07 9:30 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2018-01-07 9:30 UTC (permalink / raw
To: gentoo-commits
commit: cc9000526ff239994ae2050c2df9f2e6f6512055
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 08:45:01 2017 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat May 27 08:45:01 2017 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=cc900052
Check for symlink instead of existing target (of symlink)
bin/auto-multilib.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index c17c2e8e8..b5043e041 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -269,12 +269,12 @@ _finalize_abi_install() {
if [ "${ABI}" != "${first_installed_abi}" ]; then
__vecho ">>> Removing installed symlinks $(_get_abi_string)"
for i in $(find ${D} -type l) ; do
- [[ -e "${D%/}".${first_installed_abi}/${i/${D}} ]] && rm -f ${i}
+ [[ -L "${D%/}".${first_installed_abi}/${i/${D}} ]] && rm -f ${i}
done
fi
# Create wrapper symlink for *-config files
- local i=
+ local i=
prep_ml_binaries $(find "${D}"usr/bin "${D}"usr/sbin "${D}"bin "${D}"sbin -type f -name '*-config' 2>/dev/null)
local noabi=()
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2018-01-07 9:30 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2018-01-07 9:30 UTC (permalink / raw
To: gentoo-commits
commit: 0bfcb49daadf993b26c6b782b5121fe4a6017eea
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 15:57:39 2017 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 15:57:39 2017 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0bfcb49d
Add workarounds for llvm
bin/auto-multilib.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index b5043e041..eabef5daf 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -275,7 +275,7 @@ _finalize_abi_install() {
# Create wrapper symlink for *-config files
local i=
- prep_ml_binaries $(find "${D}"usr/bin "${D}"usr/sbin "${D}"bin "${D}"sbin -type f -name '*-config' 2>/dev/null)
+ prep_ml_binaries $(find "${D}"usr/bin "${D}"usr/sbin "${D}"bin "${D}"sbin "${D}"usr/lib/llvm/*/bin -type f -name '*-config' 2>/dev/null)
local noabi=()
for i in ${MULTILIB_ABIS}; do
@@ -287,8 +287,10 @@ _finalize_abi_install() {
done
fi
local LIBDIR=$(portage-get_abi_var LIBDIR $1)
+ #FIXME: better way then hardcoding llvm to work around /usr/lib/llvm/${LIBDIR}
if ( [[ -d "${D}${LIBDIR}" ]] || [[ -d "${D}usr/${LIBDIR}" ]] || [[ -d "${base}" ]] || \
- (shopt -s nullglob dotglob; f=("${D}"usr/bin/*-config); ((${#f[@]}))) || \
+ (shopt -s nullglob dotglob; f=("${D}"usr/bin/*-config); ((${#f[@]}))) || \
+ (shopt -s nullglob dotglob; f=("${D}"usr/lib/llvm/*/bin/*-config); ((${#f[@]}))) || \
( use abiwrapper && \
( [[ -d "${D}"usr/bin ]] || \
[[ -d "${D}"usr/sbin ]] || [[ -d "${D}"bin ]] || [[ -d "${D}"sbin ]])) ); then
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2018-03-03 15:18 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2018-03-03 15:18 UTC (permalink / raw
To: gentoo-commits
commit: 7db8c8d9e4581031be66896392571f989f3d3a9e
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 3 15:17:08 2018 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 3 15:17:08 2018 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7db8c8d9
Fix quoting (did leave some files in the builddir)
bin/phase-functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index e97566d8f..58e0cdc0b 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -306,7 +306,7 @@ __dyn_clean() {
"$PORTAGE_BUILDDIR"/.ipc_{in,out,lock} \
"$PORTAGE_BUILDDIR"/.exit_status
- rm -rf "${PORTAGE_BUILDDIR}/{build-info,abi-code}"
+ rm -rf "${PORTAGE_BUILDDIR}"/{build-info,abi-code}
rm -rf "${WORKDIR}"
rm -f "${PORTAGE_BUILDDIR}/files"
fi
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2018-04-14 12:32 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2018-04-14 12:32 UTC (permalink / raw
To: gentoo-commits
commit: bc55fa6c10f027ba1eb986d3fc6698cd009eff54
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 14 12:32:19 2018 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 12:32:19 2018 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=bc55fa6c
Remove remaining else case
bin/phase-functions.sh | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 6c8da017d..65ad0610b 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -806,20 +806,18 @@ __dyn_install() {
>> DEBUGBUILD
fi
- else
- if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
- cd "${PORTAGE_BUILDDIR}"
- if [[ $EMERGE_FROM = binary ]] || ! has keepwork $FEATURES; then
- rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,exit_status,logid,unpacked,prepared} \
- "$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged} \
- "$PORTAGE_BUILDDIR"/.die_hooks
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ cd "${PORTAGE_BUILDDIR}"
+ if [[ $EMERGE_FROM = binary ]] || ! has keepwork $FEATURES; then
+ rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,exit_status,logid,unpacked,prepared} \
+ "$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged} \
+ "$PORTAGE_BUILDDIR"/.die_hooks
- rm -rf "${WORKDIR}"
- fi
+ rm -rf "${WORKDIR}"
+ fi
- if [ -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then
- find "${PORTAGE_BUILDDIR}" -type d ! -regex "^${WORKDIR}" | sort -r | tr "\n" "\0" | $XARGS -0 rmdir &>/dev/null
- fi
+ if [ -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then
+ find "${PORTAGE_BUILDDIR}" -type d ! -regex "^${WORKDIR}" | sort -r | tr "\n" "\0" | $XARGS -0 rmdir &>/dev/null
fi
fi
trap - SIGINT SIGQUIT
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2018-09-01 11:03 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2018-09-01 11:03 UTC (permalink / raw
To: gentoo-commits
commit: 2e1579a9b91f1d03e116d03ceec25614275a75b1
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 1 09:19:08 2018 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Sep 1 09:19:08 2018 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2e1579a9
Fix detection for multilib builds
bin/auto-multilib.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index eabef5daf..010ec1cd6 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -275,25 +275,25 @@ _finalize_abi_install() {
# Create wrapper symlink for *-config files
local i=
- prep_ml_binaries $(find "${D}"usr/bin "${D}"usr/sbin "${D}"bin "${D}"sbin "${D}"usr/lib/llvm/*/bin -type f -name '*-config' 2>/dev/null)
+ prep_ml_binaries $(find "${D}"/usr/bin "${D}"/usr/sbin "${D}"/bin "${D}"/sbin "${D}"/usr/lib/llvm/*/bin -type f -name '*-config' 2>/dev/null)
local noabi=()
for i in ${MULTILIB_ABIS}; do
noabi+=( ! -name '*-'${i} )
done
if use abiwrapper ; then
- for i in $(find "${D}"usr/bin/ "${D}"usr/sbin "${D}"bin "${D}"sbin -type f ${noabi[@]} 2>/dev/null); do
+ for i in $(find "${D}"/usr/bin/ "${D}"/usr/sbin "${D}"/bin "${D}"/sbin -type f ${noabi[@]} 2>/dev/null); do
prep_ml_binaries "${i}"
done
fi
local LIBDIR=$(portage-get_abi_var LIBDIR $1)
#FIXME: better way then hardcoding llvm to work around /usr/lib/llvm/${LIBDIR}
- if ( [[ -d "${D}${LIBDIR}" ]] || [[ -d "${D}usr/${LIBDIR}" ]] || [[ -d "${base}" ]] || \
- (shopt -s nullglob dotglob; f=("${D}"usr/bin/*-config); ((${#f[@]}))) || \
- (shopt -s nullglob dotglob; f=("${D}"usr/lib/llvm/*/bin/*-config); ((${#f[@]}))) || \
+ if ( [[ -d "${D}/${LIBDIR}" ]] || [[ -d "${D}/usr/${LIBDIR}" ]] || [[ -d "${base}" ]] || \
+ (shopt -s nullglob dotglob; f=("${D}"/usr/bin/*-config); ((${#f[@]}))) || \
+ (shopt -s nullglob dotglob; f=("${D}"/usr/lib/llvm/*/bin/*-config); ((${#f[@]}))) || \
( use abiwrapper && \
- ( [[ -d "${D}"usr/bin ]] || \
- [[ -d "${D}"usr/sbin ]] || [[ -d "${D}"bin ]] || [[ -d "${D}"sbin ]])) ); then
+ ( [[ -d "${D}"/usr/bin ]] || \
+ [[ -d "${D}"/usr/sbin ]] || [[ -d "${D}"/bin ]] || [[ -d "${D}"/sbin ]])) ); then
mv "${D}" "${D%/}".${ABI} || die
for my_abi in ${ALL_ABIS}; do
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2019-12-26 12:37 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2019-12-26 12:37 UTC (permalink / raw
To: gentoo-commits
commit: d0102f790d48ba22877d8ca0d0c0698e54154efb
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 12:36:59 2019 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 12:36:59 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d0102f79
Fix leftover issues from merge commit
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
bin/phase-functions.sh | 2 --
bin/phase-helpers.sh | 5 +++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index f98d78f8a..e6c8bc360 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -578,8 +578,6 @@ __dyn_test() {
SANDBOX_PREDICT=${save_sp}
fi
- done
-
trap - SIGINT SIGQUIT
}
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 0a326b7d9..20336b310 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -239,8 +239,8 @@ use() {
# a full profile with IUSE_IMPLICIT and stuff (see bug #456830).
elif declare -f ___in_portage_iuse >/dev/null &&
[[ -n ${EBUILD_PHASE} && -n ${PORTAGE_INTERNAL_CALLER} ]] ; then
- if ( [[ ! " ${FEATURES} " == *" force-multilib "* && $u == multilib ]] && \
- if ! ___in_portage_iuse "${u}"; then
+ if ! ___in_portage_iuse "${u}" ]]; then
+ if [[ ! " ${FEATURES} " == *" force-multilib "* && $u == multilib ]] ; then
if [[ ${EMERGE_FROM} != binary &&
! ${EAPI} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]] ; then
# This is only strict starting with EAPI 5, since implicit IUSE
@@ -250,6 +250,7 @@ use() {
eqawarn "QA Notice: USE Flag '${u}' not" \
"in IUSE for ${CATEGORY}/${PF}"
fi
+ fi
fi
local IFS=$' \t\n' prev_shopts=$- ret
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2021-01-15 16:20 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2021-01-15 16:20 UTC (permalink / raw
To: gentoo-commits
commit: a0a5b84ed6255e982d3496643566c396e8d7c870
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 16:14:30 2021 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 16:19:22 2021 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a0a5b84e
Preserve symlinks for default abi
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
bin/auto-multilib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 010ec1cd6..e12f2a516 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -377,7 +377,7 @@ _finalize_abi_install() {
done
if [[ -d "${D%/}.${DEFAULT_ABI}" ]]; then
cd "${D%/}.${DEFAULT_ABI}"
- find . | tar -c -T - -f - | tar -x -f - -C "${D}"
+ find . | tar -c -T - -f - | tar -x -P -f - -C "${D}"
cd ..
rm -rf "${D%/}.${DEFAULT_ABI}"
fi
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2021-01-15 17:16 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2021-01-15 17:16 UTC (permalink / raw
To: gentoo-commits
commit: 2cf0e1224b7d8f4016dda0c197539c85d86ec65c
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 17:15:46 2021 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 17:15:46 2021 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2cf0e122
Dont loop with readonly variables
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
bin/phase-functions.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 0e87a051c..b74d611d4 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -1164,6 +1164,8 @@ __ebuild_main() {
# >/dev/null = backward compactibility for prerm/postrm
source "${T}"/environment 2>/dev/null || die
fi
+ #dont run more then once with readonly variables
+ grep -q "readonly " "${T}"/environment && break
done
else
export SANDBOX_ON="0"
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2021-01-23 9:52 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2021-01-23 9:52 UTC (permalink / raw
To: gentoo-commits
commit: 226639dfaaa4bc329b07bd24d214d7323c9ba6e3
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 09:50:23 2021 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 09:50:23 2021 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=226639df
Avoid sandbox violations for symlinks
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
bin/auto-multilib.sh | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index e12f2a516..c5e70ada7 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -377,7 +377,17 @@ _finalize_abi_install() {
done
if [[ -d "${D%/}.${DEFAULT_ABI}" ]]; then
cd "${D%/}.${DEFAULT_ABI}"
+ #disable sandbox for symlinks
+ local x=
+ if [[ -n $SANDBOX_ON ]] ; then
+ x=$SANDBOX_ON
+ export SANDBOX_ON=0
+ fi
find . | tar -c -T - -f - | tar -x -P -f - -C "${D}"
+ if [[ -n $x ]] ; then
+ export SANDBOX_ON=$x
+ fi
+ unset x
cd ..
rm -rf "${D%/}.${DEFAULT_ABI}"
fi
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2021-07-25 11:42 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2021-07-25 11:42 UTC (permalink / raw
To: gentoo-commits
commit: 9073e2eabf3e905011d5bd747d2c17a02654bedf
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 11:39:12 2021 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jul 25 11:42:14 2021 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9073e2ea
Update some llvm exceptions
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
bin/auto-multilib.sh | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index c5e70ada7..103565209 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -269,13 +269,20 @@ _finalize_abi_install() {
if [ "${ABI}" != "${first_installed_abi}" ]; then
__vecho ">>> Removing installed symlinks $(_get_abi_string)"
for i in $(find ${D} -type l) ; do
- [[ -L "${D%/}".${first_installed_abi}/${i/${D}} ]] && rm -f ${i}
+ [[ -L "${D%/}".${first_installed_abi}/${i/${D}} ]] && [[ "${PN}" != "llvm" ]] && rm -f ${i}
done
fi
# Create wrapper symlink for *-config files
local i=
- prep_ml_binaries $(find "${D}"/usr/bin "${D}"/usr/sbin "${D}"/bin "${D}"/sbin "${D}"/usr/lib/llvm/*/bin -type f -name '*-config' 2>/dev/null)
+ prep_ml_binaries $(find "${D}"/usr/bin "${D}"/usr/sbin "${D}"/bin "${D}"/sbin -type f -name '*-config' 2>/dev/null)
+ if [[ "${PN}" == "llvm" ]] ; then
+ if [[ ${ABI} == ${first_installed_abi} ]] ; then
+ prep_ml_binaries "${D}"/usr/lib/llvm/*/bin/llvm-config
+ else
+ ln -s i686-pc-linux-gnu-llvm-config "${D}"/usr/lib/llvm/"${PV//.*}"/bin/llvm-config-x86
+ fi
+ fi
local noabi=()
for i in ${MULTILIB_ABIS}; do
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: bin/
@ 2021-10-30 9:33 Thomas Sachau
0 siblings, 0 replies; 49+ messages in thread
From: Thomas Sachau @ 2021-10-30 9:33 UTC (permalink / raw
To: gentoo-commits
commit: be19c869f7ac79ddc79599a857d9d2b0603b13ab
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 22 12:46:36 2021 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Aug 22 12:46:36 2021 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=be19c869
Add some extra code for libgpg-error
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
bin/auto-multilib.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 103565209..2df2d9b4e 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -283,6 +283,17 @@ _finalize_abi_install() {
ln -s i686-pc-linux-gnu-llvm-config "${D}"/usr/lib/llvm/"${PV//.*}"/bin/llvm-config-x86
fi
fi
+ if [[ "${PN}" == "libgpg-error" ]] ; then
+ if [[ ${ABI} == ${first_installed_abi} ]] ; then
+ mv "${D}"/usr/bin/x86_64-pc-linux-gnu-gpg-error-config-amd64 "${D}"/usr/bin/gpg-error-config-amd64 || die
+ rm "${D}"/usr/bin/{x86_64-pc-linux-gnu-gpg-error-config,gpg-error-config} || die
+ ln -s /bin/abi-wrapper "${D}"/usr/bin/gpg-error-config || die
+ ln -s gpg-error-config "${D}"/usr/bin/x86_64-pc-linux-gnu-gpg-error-config || die
+ else
+ mv "${D}"/usr/bin/i686-pc-linux-gnu-gpg-error-config-x86 "${D}"/usr/bin/gpg-error-config-x86 || die
+ ln -s gpg-error-config "${D}"/usr/bin/i686-pc-linux-gnu-gpg-error-config || die
+ fi
+ fi
local noabi=()
for i in ${MULTILIB_ABIS}; do
^ permalink raw reply related [flat|nested] 49+ messages in thread
end of thread, other threads:[~2021-10-30 9:33 UTC | newest]
Thread overview: 49+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-07 9:30 [gentoo-commits] proj/portage:multilib commit in: bin/ Thomas Sachau
-- strict thread matches above, loose matches on Subject: below --
2021-10-30 9:33 Thomas Sachau
2021-07-25 11:42 Thomas Sachau
2021-01-23 9:52 Thomas Sachau
2021-01-15 17:16 Thomas Sachau
2021-01-15 16:20 Thomas Sachau
2019-12-26 12:37 Thomas Sachau
2018-09-01 11:03 Thomas Sachau
2018-04-14 12:32 Thomas Sachau
2018-03-03 15:18 Thomas Sachau
2018-01-07 9:30 Thomas Sachau
2016-02-28 12:57 Thomas Sachau
2015-05-05 13:22 Thomas Sachau
2015-05-05 12:05 Thomas Sachau
2015-05-05 12:05 Thomas Sachau
2013-09-17 13:02 Thomas Sachau
2013-03-03 13:44 Thomas Sachau
2013-02-27 19:44 Thomas Sachau
2012-12-20 20:38 Thomas Sachau
2012-09-24 20:42 Thomas Sachau
2012-09-22 15:30 Thomas Sachau
2012-07-08 10:03 Thomas Sachau
2012-07-02 5:22 Zac Medico
2012-07-01 11:58 Thomas Sachau
2012-03-25 17:38 Thomas Sachau
2012-03-18 15:25 Thomas Sachau
2012-03-16 21:23 Thomas Sachau
2012-03-16 19:37 Thomas Sachau
2012-03-16 19:26 Thomas Sachau
2012-03-16 19:23 Thomas Sachau
2012-02-26 16:27 Thomas Sachau
2012-02-26 16:27 Thomas Sachau
2012-02-26 16:27 Thomas Sachau
2011-11-17 17:59 Thomas Sachau
2011-11-14 21:11 Thomas Sachau
2011-11-14 21:07 Thomas Sachau
2011-11-14 21:05 Thomas Sachau
2011-11-14 20:58 Thomas Sachau
2011-10-31 19:50 Thomas Sachau
2011-10-03 12:40 Thomas Sachau
2011-10-03 12:34 Thomas Sachau
2011-10-02 14:00 Thomas Sachau
2011-09-09 13:16 Thomas Sachau
2011-07-15 13:43 Thomas Sachau
2011-07-15 13:33 Thomas Sachau
2011-07-05 17:34 Thomas Sachau
2011-03-03 19:53 Thomas Sachau
2011-02-06 13:09 Thomas Sachau
2011-02-06 13:09 Thomas Sachau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox