Removed rpath from python bindings better way
This commit is contained in:
parent
f0cc9e833c
commit
f556587545
12
rrdtool-1.7.2-python-rpath-fix.patch
Normal file
12
rrdtool-1.7.2-python-rpath-fix.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
|
||||||
|
index 3632b3c..cd1df6a 100644
|
||||||
|
--- a/bindings/Makefile.am
|
||||||
|
+++ b/bindings/Makefile.am
|
||||||
|
@@ -69,7 +69,6 @@ python:
|
||||||
|
&& env \
|
||||||
|
ABS_TOP_SRCDIR=${abs_top_srcdir} \
|
||||||
|
ABS_TOP_BUILDDIR=${abs_top_builddir} \
|
||||||
|
- LD_RUN_PATH=$(libdir) \
|
||||||
|
$(PYTHON) ${abs_srcdir}/$@/setup.py build_ext $(PYTHON_RPATH) \
|
||||||
|
&& env \
|
||||||
|
ABS_TOP_SRCDIR=${abs_top_srcdir} \
|
11
rrdtool.spec
11
rrdtool.spec
@ -18,7 +18,7 @@
|
|||||||
Summary: Round Robin Database Tool to store and display time-series data
|
Summary: Round Robin Database Tool to store and display time-series data
|
||||||
Name: rrdtool
|
Name: rrdtool
|
||||||
Version: 1.7.2
|
Version: 1.7.2
|
||||||
Release: 18%{?dist}
|
Release: 19%{?dist}
|
||||||
License: GPLv2+ with exceptions
|
License: GPLv2+ with exceptions
|
||||||
URL: https://oss.oetiker.ch/rrdtool/
|
URL: https://oss.oetiker.ch/rrdtool/
|
||||||
Source0: https://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
|
Source0: https://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
|
||||||
@ -29,6 +29,7 @@ Patch2: rrdtool-1.4.7-php55.patch
|
|||||||
Patch3: rrdtool-1.6.0-ruby-2-fix.patch
|
Patch3: rrdtool-1.6.0-ruby-2-fix.patch
|
||||||
# enable php bindings on ppc
|
# enable php bindings on ppc
|
||||||
Patch4: rrdtool-1.4.8-php-ppc-fix.patch
|
Patch4: rrdtool-1.4.8-php-ppc-fix.patch
|
||||||
|
Patch5: rrdtool-1.7.2-python-rpath-fix.patch
|
||||||
|
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -177,6 +178,7 @@ The %{name}-lua package includes RRDtool bindings for Lua.
|
|||||||
%patch3 -p1 -b .ruby-2-fix
|
%patch3 -p1 -b .ruby-2-fix
|
||||||
%endif
|
%endif
|
||||||
%patch4 -p1 -b .php-ppc-fix
|
%patch4 -p1 -b .php-ppc-fix
|
||||||
|
%patch5 -p1 -b .python-rpath-fix
|
||||||
|
|
||||||
# Fix to find correct python dir on lib64
|
# Fix to find correct python dir on lib64
|
||||||
perl -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \
|
perl -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \
|
||||||
@ -225,10 +227,6 @@ cp -p /usr/lib/rpm/redhat/config.{guess,sub} php4/
|
|||||||
--disable-static \
|
--disable-static \
|
||||||
--with-pic
|
--with-pic
|
||||||
|
|
||||||
# Remove rpath from python
|
|
||||||
sed -i 's|\bsetup.py build_ext\b|setup.py build_ext -R '"''"'|g' \
|
|
||||||
bindings/Makefile
|
|
||||||
|
|
||||||
# Fix another rpath issue
|
# Fix another rpath issue
|
||||||
perl -pi.orig -e 's|-Wl,--rpath -Wl,\$rp||g' \
|
perl -pi.orig -e 's|-Wl,--rpath -Wl,\$rp||g' \
|
||||||
bindings/perl-shared/Makefile.PL
|
bindings/perl-shared/Makefile.PL
|
||||||
@ -410,6 +408,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 26 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.2-19
|
||||||
|
- Removed rpath from python bindings better way
|
||||||
|
|
||||||
* Sat May 22 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.2-18
|
* Sat May 22 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.2-18
|
||||||
- Perl 5.34 rebuild
|
- Perl 5.34 rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user