sys-libs/glibc: disable stripping for cross-glibc

commit e14229b 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 <[email protected]>
hanetzer · Oct 14, 2019 · 650d70e · 650d70e
1 parent 6d1a3bb
commit 650d70e
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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