diff options
author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-07-01 18:28:26 -0400 |
---|---|---|
committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-07-01 22:31:49 +0000 |
commit | d57051446bec7f63cf8bcf6e7045632e3636a09f (patch) | |
tree | e4f8156013342a89cd269de9f6221da7111a846a /packaging | |
parent | 44b8729a0ce41d322858f0cc03b714c80f78c04e (diff) | |
download | wireshark-d57051446bec7f63cf8bcf6e7045632e3636a09f.tar.gz |
Get rid of rpath when we're building RPMs.
Fedora prohibits it, we don't need it, and it gets in the way some times.
Change-Id: I92cee959f471866ff90efe9f96e4fa519c357dd9
Reviewed-on: https://code.wireshark.org/review/2763
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
(cherry picked from commit a4a624e4c5f16ad75ab9124e390f82efaca06512)
Reviewed-on: https://code.wireshark.org/review/2765
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index ae233ec505..ad180e290f 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -210,6 +210,12 @@ Contains the Qt Wireshark GUI and desktop integration files. %{?_with_qt} \ --disable-warnings-as-errors +# Remove rpath. It's prohibited in Fedora[1] and anyway we don't need it (and +# sometimes it gets in the way). +# [1] https://fedoraproject.org/wiki/Packaging:Guidelines#Beware_of_Rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + # Suggestion: put this in your ~/.rpmmacros (without the hash sign, of course): # %_smp_mflags -j %(grep -c processor /proc/cpuinfo) make %{?_smp_mflags} |