commit: 650d70eb5d91265329e2f730bc1aed0fa5863db6
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 14 06:57:44 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Oct 14 06:58:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=650d70eb
sys-libs/glibc: disable stripping for cross-glibc
commit e14229b10b513a164f8379ff14cc8c644c071f27 dropped
special stripping and relied on standard ${CHOST}-strip.
Unfortunately one special case wa missing:
cross-*/glibc ebuilds use ${CTARGET} as a target and are
installed into the host. That causes ${CHOST}-strip to be
called on ${CTARGET} binaries. If multitarget is not enabled
strip either breaks such bianries or makes them untouched.
Disable tripping until we migrated off off cross-*/glibc ebuilds.
Reported-by: Johannes Geiss
Closes: https://bugs.gentoo.org/697428
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-libs/glibc/glibc-2.19-r2.ebuild | 3 +++
sys-libs/glibc/glibc-2.24-r4.ebuild | 3 +++
sys-libs/glibc/glibc-2.25-r11.ebuild | 3 +++
sys-libs/glibc/glibc-2.26-r7.ebuild | 3 +++
sys-libs/glibc/glibc-2.27-r6.ebuild | 3 +++
sys-libs/glibc/glibc-2.28-r6.ebuild | 3 +++
sys-libs/glibc/glibc-2.29-r2.ebuild | 3 +++
sys-libs/glibc/glibc-2.29-r4.ebuild | 3 +++
sys-libs/glibc/glibc-2.29-r5.ebuild | 3 +++
sys-libs/glibc/glibc-2.30-r1.ebuild | 3 +++
sys-libs/glibc/glibc-2.30.ebuild | 3 +++
sys-libs/glibc/glibc-9999.ebuild | 3 +++
12 files changed, 36 insertions(+)
diff --git a/sys-libs/glibc/glibc-2.19-r2.ebuild
b/sys-libs/glibc/glibc-2.19-r2.ebuild
index 0fedbb8e940..20b236f9037 100644
--- a/sys-libs/glibc/glibc-2.19-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r2.ebuild
@@ -56,6 +56,9 @@ export CTARGET=${CTARGET:-${CHOST}}
if [[ ${CTARGET} == ${CHOST} ]] ; then
if [[ ${CATEGORY} == cross-* ]] ; then
export CTARGET=${CATEGORY#cross-}
+ # portage's attempt to strip breaks non-native bianries
+ # at least on arm: bug #697428
+ RESTRICT=strip
fi
fi
diff --git a/sys-libs/glibc/glibc-2.24-r4.ebuild
b/sys-libs/glibc/glibc-2.24-r4.ebuild
index b808611bd31..4c862498855 100644
--- a/sys-libs/glibc/glibc-2.24-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.24-r4.ebuild
@@ -49,6 +49,9 @@ export CTARGET=${CTARGET:-${CHOST}}
if [[ ${CTARGET} == ${CHOST} ]] ; then
if [[ ${CATEGORY} == cross-* ]] ; then
export CTARGET=${CATEGORY#cross-}
+ # portage's attempt to strip breaks non-native bianries
+ # at least on arm: bug #697428
+ RESTRICT=strip
fi
fi
diff --git a/sys-libs/glibc/glibc-2.25-r11.ebuild
b/sys-libs/glibc/glibc-2.25-r11.ebuild
index e2a0f9131bb..4b3ac83a890 100644
--- a/sys-libs/glibc/glibc-2.25-r11.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r11.ebuild
@@ -51,6 +51,9 @@ export CTARGET=${CTARGET:-${CHOST}}
if [[ ${CTARGET} == ${CHOST} ]] ; then
if [[ ${CATEGORY} == cross-* ]] ; then
export CTARGET=${CATEGORY#cross-}
+ # portage's attempt to strip breaks non-native bianries
+ # at least on arm: bug #697428
+ RESTRICT=strip
fi
fi
diff --git a/sys-libs/glibc/glibc-2.26-r7.ebuild
b/sys-libs/glibc/glibc-2.26-r7.ebuild
index 34d8fb8a7ac..80530db6e45 100644
--- a/sys-libs/glibc/glibc-2.26-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r7.ebuild
@@ -55,6 +55,9 @@ export CTARGET=${CTARGET:-${CHOST}}
if [[ ${CTARGET} == ${CHOST} ]] ; then
if [[ ${CATEGORY} == cross-* ]] ; then
export CTARGET=${CATEGORY#cross-}
+ # portage's attempt to strip breaks non-native bianries
+ # at least on arm: bug #697428
+ RESTRICT=strip
fi
fi
diff --git a/sys-libs/glibc/glibc-2.27-r6.ebuild
b/sys-libs/glibc/glibc-2.27-r6.ebuild
index f1409e36cf3..2b333181bf7 100644
--- a/sys-libs/glibc/glibc-2.27-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.27-r6.ebuild
@@ -55,6 +55,9 @@ export CTARGET=${CTARGET:-${CHOST}}
if [[ ${CTARGET} == ${CHOST} ]] ; then
if [[ ${CATEGORY} == cross-* ]] ; then
export CTARGET=${CATEGORY#cross-}
+ # portage's attempt to strip breaks non-native bianries
+ # at least on arm: bug #697428
+ RESTRICT=strip
fi
fi
diff --git a/sys-libs/glibc/glibc-2.28-r6.ebuild
b/sys-libs/glibc/glibc-2.28-r6.ebuild
index aa318b7e0f1..2a512a62aec 100644
--- a/sys-libs/glibc/glibc-2.28-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.28-r6.ebuild
@@ -55,6 +55,9 @@ export CTARGET=${CTARGET:-${CHOST}}
if [[ ${CTARGET} == ${CHOST} ]] ; then
if [[ ${CATEGORY} == cross-* ]] ; then
export CTARGET=${CATEGORY#cross-}
+ # portage's attempt to strip breaks non-native bianries
+ # at least on arm: bug #697428
+ RESTRICT=strip
fi
fi
diff --git a/sys-libs/glibc/glibc-2.29-r2.ebuild
b/sys-libs/glibc/glibc-2.29-r2.ebuild
index b80ddd00814..bd08c9a208a 100644
--- a/sys-libs/glibc/glibc-2.29-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r2.ebuild
@@ -57,6 +57,9 @@ export CTARGET=${CTARGET:-${CHOST}}
if [[ ${CTARGET} == ${CHOST} ]] ; then
if [[ ${CATEGORY} == cross-* ]] ; then
export CTARGET=${CATEGORY#cross-}
+ # portage's attempt to strip breaks non-native bianries
+ # at least on arm: bug #697428
+ RESTRICT=strip
fi
fi
diff --git a/sys-libs/glibc/glibc-2.29-r4.ebuild
b/sys-libs/glibc/glibc-2.29-r4.ebuild
index 7282d89d8ee..0f388a106c6 100644
--- a/sys-libs/glibc/glibc-2.29-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r4.ebuild
@@ -57,6 +57,9 @@ export CTARGET=${CTARGET:-${CHOST}}
if [[ ${CTARGET} == ${CHOST} ]] ; then
if [[ ${CATEGORY} == cross-* ]] ; then
export CTARGET=${CATEGORY#cross-}
+ # portage's attempt to strip breaks non-native bianries
+ # at least on arm: bug #697428
+ RESTRICT=strip
fi
fi
diff --git a/sys-libs/glibc/glibc-2.29-r5.ebuild
b/sys-libs/glibc/glibc-2.29-r5.ebuild
index 1c3f4a15dde..6ac0497d07c 100644
--- a/sys-libs/glibc/glibc-2.29-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r5.ebuild
@@ -57,6 +57,9 @@ export CTARGET=${CTARGET:-${CHOST}}
if [[ ${CTARGET} == ${CHOST} ]] ; then
if [[ ${CATEGORY} == cross-* ]] ; then
export CTARGET=${CATEGORY#cross-}
+ # portage's attempt to strip breaks non-native bianries
+ # at least on arm: bug #697428
+ RESTRICT=strip
fi
fi
diff --git a/sys-libs/glibc/glibc-2.30-r1.ebuild
b/sys-libs/glibc/glibc-2.30-r1.ebuild
index b3da5c0345e..51bf1cbd9f3 100644
--- a/sys-libs/glibc/glibc-2.30-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.30-r1.ebuild
@@ -58,6 +58,9 @@ export CTARGET=${CTARGET:-${CHOST}}
if [[ ${CTARGET} == ${CHOST} ]] ; then
if [[ ${CATEGORY} == cross-* ]] ; then
export CTARGET=${CATEGORY#cross-}
+ # portage's attempt to strip breaks non-native bianries
+ # at least on arm: bug #697428
+ RESTRICT=strip
fi
fi
diff --git a/sys-libs/glibc/glibc-2.30.ebuild b/sys-libs/glibc/glibc-2.30.ebuild
index 5a8933d5d96..544eec7b687 100644
--- a/sys-libs/glibc/glibc-2.30.ebuild
+++ b/sys-libs/glibc/glibc-2.30.ebuild
@@ -58,6 +58,9 @@ export CTARGET=${CTARGET:-${CHOST}}
if [[ ${CTARGET} == ${CHOST} ]] ; then
if [[ ${CATEGORY} == cross-* ]] ; then
export CTARGET=${CATEGORY#cross-}
+ # portage's attempt to strip breaks non-native bianries
+ # at least on arm: bug #697428
+ RESTRICT=strip
fi
fi
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index d529e346178..6894e04b796 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -58,6 +58,9 @@ export CTARGET=${CTARGET:-${CHOST}}
if [[ ${CTARGET} == ${CHOST} ]] ; then
if [[ ${CATEGORY} == cross-* ]] ; then
export CTARGET=${CATEGORY#cross-}
+ # portage's attempt to strip breaks non-native bianries
+ # at least on arm: bug #697428
+ RESTRICT=strip
fi
fi
