diff --git a/macros.in b/macros.in index 756283a..96d91c0 100644 --- a/macros.in +++ b/macros.in @@ -600,6 +600,7 @@ %{?_cleanup_method:export RPM_CLEANUP_METHOD=\"%_cleanup_method\"}\ %{?_compress_method:export RPM_COMPRESS_METHOD=\"%_compress_method\"}\ %{?_strip_method:export RPM_STRIP_METHOD=\"%_strip_method\"}\ + %{?_strip_autoskip:export RPM_STRIP_AUTOSKIP=\"%_strip_autoskip\"}\ %{?_verify_elf_method:export RPM_VERIFY_ELF_METHOD=\"%_verify_elf_method\"}\ %{?_findreq_method:export RPM_FINDREQ_METHOD=\"%_findreq_method\"}\ %{?_findprov_method:export RPM_FINDPROV_METHOD=\"%_findprov_method\"}\ diff --git a/platform.in b/platform.in index 44ea2a0..1914207 100644 --- a/platform.in +++ b/platform.in @@ -357,11 +357,13 @@ @alt@%_compress_method auto @alt@%_verify_elf_method normal @alt@%_strip_method %{?_enable_debug:none}%{!?_enable_debug:executable shared} +@alt@%_strip_autoskip */debug/* @alt@%_findreq_default_method files lib pam perl shell @alt@%_findprov_default_method pam lib perl @alt@ @alt@%set_compress_method() %global _compress_method %* @alt@%set_strip_method() %global _strip_method %* +@alt@%set_strip_autoskip() %global _strip_autoskip %* @alt@%set_verify_elf_method() %global _verify_elf_method %* @alt@ @alt@%strip_executable RPM_STRIP_METHOD=executable @RPMCONFIGDIR@/brp-strip diff --git a/scripts/brp-strip.in b/scripts/brp-strip.in index 96d76e8..5c19232 100755 --- a/scripts/brp-strip.in +++ b/scripts/brp-strip.in @@ -73,7 +73,7 @@ eval set -- "$TEMP" : ${TOPDIR:=$RPM_BUILD_ROOT} export STRIP_FORCED= export STRIP_FORCED_OPTS= -export STRIP_AUTOSKIP= +export STRIP_AUTOSKIP="$RPM_STRIP_AUTOSKIP" AddForcedOpts() {