| 1 |
commit: 9735a747c4a5d9cd79d3a04b37dffb0e0ee26a49 |
| 2 |
Author: Nathan Phillip Brink <binki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 27 01:25:10 2011 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 27 01:41:35 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9735a747 |
| 7 |
|
| 8 |
Fix portage-multilib compilation of asm files (for autotools projects) when the user has set CCASFLAGS in make.conf. |
| 9 |
|
| 10 |
During ./configure, if CCASFLAGS is unest it will default to CFLAGS |
| 11 |
(or in essence, ${CCASFLAGS:=${CFLAGS}}). The old portage-multilib |
| 12 |
behavior was to not define CCASFLAGS. However, certain users may wish |
| 13 |
to define CCASFLAGS. In such a scenario, -m32 would never enter into |
| 14 |
CCASFLAGS because the user's CCASFLAGS would be used by ./configure |
| 15 |
instead of CFLAGS. |
| 16 |
|
| 17 |
This patch causes portage-multilib to set CCASFLAGS to CFLAGS if it is |
| 18 |
unset and then append the ABI-specific CFLAGS (such as -m32). This |
| 19 |
allows a user to have different CCASFLAGS and still have successful |
| 20 |
multilib builds. |
| 21 |
|
| 22 |
--- |
| 23 |
bin/auto-multilib.sh | 1 + |
| 24 |
1 files changed, 1 insertions(+), 0 deletions(-) |
| 25 |
|
| 26 |
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh |
| 27 |
index 9fc3b01..73259d9 100755 |
| 28 |
--- a/bin/auto-multilib.sh |
| 29 |
+++ b/bin/auto-multilib.sh |
| 30 |
@@ -227,6 +227,7 @@ _setup_abi_env() { |
| 31 |
export CHOST=$(get_abi_var CHOST $1) |
| 32 |
export CBUILD=$(get_abi_var CHOST $1) |
| 33 |
export CDEFINE="$(get_abi_var CDEFINE $1)" |
| 34 |
+ export CCASFLAGS="${CCASFLAGS:-${CFLAGS}} $(get_abi_var CFLAGS)" |
| 35 |
export CFLAGS="${CFLAGS} $(get_abi_var CFLAGS)" |
| 36 |
export CPPFLAGS="${CPPFLAGS} $(get_abi_var CPPFLAGS)" |
| 37 |
export CXXFLAGS="${CXXFLAGS} $(get_abi_var CFLAGS)" |
Archives