- Pass _find_debuginfo_opts -g to eu-strip for executables
- resolves: #1186563 - add_minidebug is not ran when strip_g is set - related: #1186563
This commit is contained in:
parent
4b03dd3bed
commit
fa230ece28
|
@ -90,8 +90,8 @@
|
||||||
chmod u-w "$f"
|
chmod u-w "$f"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
+ $include_minidebug && add_minidebug "${debugfn}" "$f"
|
+ # strip -g implies we have full symtab, don't add mini symtab in that case.
|
||||||
+
|
+ strip_g || ($include_minidebug && add_minidebug "${debugfn}" "$f")
|
||||||
+
|
+
|
||||||
if [ -n "$id" ]; then
|
if [ -n "$id" ]; then
|
||||||
make_id_link "$id" "$dn/$(basename $f)"
|
make_id_link "$id" "$dn/$(basename $f)"
|
||||||
|
|
|
@ -26,10 +26,11 @@
|
||||||
|
|
||||||
debugdir="${RPM_BUILD_ROOT}/usr/lib/debug"
|
debugdir="${RPM_BUILD_ROOT}/usr/lib/debug"
|
||||||
|
|
||||||
@@ -316,6 +318,7 @@ while read nlinks inum f; do
|
@@ -316,6 +318,8 @@
|
||||||
|
|
||||||
$include_minidebug && add_minidebug "${debugfn}" "$f"
|
|
||||||
|
|
||||||
|
# strip -g implies we have full symtab, don't add mini symtab in that case.
|
||||||
|
strip_g || ($include_minidebug && add_minidebug "${debugfn}" "$f")
|
||||||
|
+
|
||||||
+ echo "./${f#$RPM_BUILD_ROOT}" >> "$ELFBINSFILE"
|
+ echo "./${f#$RPM_BUILD_ROOT}" >> "$ELFBINSFILE"
|
||||||
|
|
||||||
if [ -n "$id" ]; then
|
if [ -n "$id" ]; then
|
||||||
|
|
8
rpm.spec
8
rpm.spec
|
@ -27,7 +27,7 @@
|
||||||
Summary: The RPM package management system
|
Summary: The RPM package management system
|
||||||
Name: rpm
|
Name: rpm
|
||||||
Version: %{rpmver}
|
Version: %{rpmver}
|
||||||
Release: %{?snapver:0.%{snapver}.}9%{?dist}
|
Release: %{?snapver:0.%{snapver}.}11%{?dist}
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Url: http://www.rpm.org/
|
Url: http://www.rpm.org/
|
||||||
Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2
|
Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2
|
||||||
|
@ -61,6 +61,8 @@ Patch102: rpm-4.12.0-archive-endian.patch
|
||||||
Patch103: 0001-Fix-find-debuginfo.sh-for-ELF-with-file-warnings.patch
|
Patch103: 0001-Fix-find-debuginfo.sh-for-ELF-with-file-warnings.patch
|
||||||
# Fix --excludedocs option (#1192625)
|
# Fix --excludedocs option (#1192625)
|
||||||
Patch104: rpm-4.12.0-exclude-doc.patch
|
Patch104: rpm-4.12.0-exclude-doc.patch
|
||||||
|
# Pass _find_debuginfo_opts -g to eu-strip for executables (#1186563)
|
||||||
|
Patch105: rpm-4.12.0-eu-strip-g-option.patch
|
||||||
|
|
||||||
# These are not yet upstream
|
# These are not yet upstream
|
||||||
Patch302: rpm-4.7.1-geode-i686.patch
|
Patch302: rpm-4.7.1-geode-i686.patch
|
||||||
|
@ -545,6 +547,10 @@ exit 0
|
||||||
%doc doc/librpm/html/*
|
%doc doc/librpm/html/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 27 2015 Lubos Kardos <lkardos@redhat.com> 4.12.0-11
|
||||||
|
- Pass _find_debuginfo_opts -g to eu-strip for executables (#1186563)
|
||||||
|
- add_minidebug is not ran when strip_g is set (#1186563)
|
||||||
|
|
||||||
* Fri Mar 20 2015 Lubos Kardos <lkardos@redhat.com> 4.12.0-10
|
* Fri Mar 20 2015 Lubos Kardos <lkardos@redhat.com> 4.12.0-10
|
||||||
- Fix "--excludedocs" option (#1192625)
|
- Fix "--excludedocs" option (#1192625)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue