diff options
| -rw-r--r-- | platform.in | 1 | ||||
| -rw-r--r-- | scripts/Makefile.am | 4 | ||||
| -rw-r--r-- | scripts/brp-strip-shared | 25 |
3 files changed, 2 insertions, 28 deletions
diff --git a/platform.in b/platform.in index b634b07aa..ac6999bbb 100644 --- a/platform.in +++ b/platform.in @@ -92,7 +92,6 @@ %__brp_python_bytecompile %{_rpmconfigdir}/brp-python-bytecompile "" "%{?_python_bytecompile_errors_terminate_build}" "%{?_python_bytecompile_extra}" %__brp_strip %{_rpmconfigdir}/brp-strip %{__strip} %__brp_strip_comment_note %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} -%__brp_strip_shared %{_rpmconfigdir}/brp-strip-shared %__brp_strip_static_archive %{_rpmconfigdir}/brp-strip-static-archive %{__strip} %__brp_elfperms %{_rpmconfigdir}/brp-elfperms diff --git a/scripts/Makefile.am b/scripts/Makefile.am index a70e4903b..efaf73c7d 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -8,7 +8,7 @@ CLEANFILES = EXTRA_DIST = \ brp-compress brp-python-bytecompile brp-java-gcjcompile \ brp-strip brp-strip-comment-note brp-python-hardlink \ - brp-strip-shared brp-strip-static-archive brp-elfperms \ + brp-strip-static-archive brp-elfperms \ check-files check-prereqs \ check-buildroot check-rpaths check-rpaths-worker \ find-debuginfo.sh find-lang.sh \ @@ -25,7 +25,7 @@ EXTRA_DIST = \ rpmconfig_SCRIPTS = \ brp-compress brp-python-bytecompile brp-java-gcjcompile \ brp-strip brp-strip-comment-note brp-python-hardlink \ - brp-strip-shared brp-strip-static-archive brp-elfperms \ + brp-strip-static-archive brp-elfperms \ check-files check-prereqs \ check-buildroot check-rpaths check-rpaths-worker \ find-lang.sh find-requires find-provides \ diff --git a/scripts/brp-strip-shared b/scripts/brp-strip-shared deleted file mode 100644 index 94113a4b2..000000000 --- a/scripts/brp-strip-shared +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# Conectiva brp - strip shared libraries. Based on Red Hat's brp-strip. -# Thu Apr 20 - Guilherme Manika <gwm@conectiva.com.br> -# Created file - -if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_BUILD_ROOT" = "/" ]; then - exit 0 -fi - -STRIP=${1:-strip} - -case `uname -a` in -Darwin*) exit 0 ;; -*) ;; -esac - -# Strip ELF shared objects -# Please note we don't restrict our search to executable files because -# our libraries are not (should not be, at least) +x. -for f in `find "$RPM_BUILD_ROOT" -type f -a -exec file {} \; | \ - grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \ - grep ' shared object,' | \ - sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped.*/\1/p'`; do - $STRIP --strip-unneeded "$f" -done |