diff --git a/libguestfs.perl.no-rpath.patch b/libguestfs.perl.no-rpath.patch deleted file mode 100644 index 0505a31..0000000 --- a/libguestfs.perl.no-rpath.patch +++ /dev/null @@ -1,19 +0,0 @@ -[ 193s] ERROR: RPATH "/home/abuild/rpmbuild/BUILD/libguestfs-1.19.30/src/.libs" on /home/abuild/rpmbuild/BUILDROOT/libguestfs-1.19.30-1.x86_64/usr/lib/perl5/site_perl/5.16.0/x86_64-linux-thread-multi/auto/Sys/Guestfs/Guestfs.so is not allowed -[ 193s] ERROR: RPATH "/home/abuild/rpmbuild/BUILD/libguestfs-1.19.30/src/.libs" on /home/abuild/rpmbuild/BUILDROOT/libguestfs-1.19.30-1.x86_64/usr/lib/perl5/site_perl/5.16.0/x86_64-linux-thread-multi/auto/Sys/Guestfs/Guestfs.so is not allowed ---- - perl/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -Index: b/perl/Makefile.am -=================================================================== ---- a/perl/Makefile.am -+++ b/perl/Makefile.am -@@ -65,6 +65,8 @@ all: Makefile-pl src_deps - - Makefile-pl: Makefile.PL - perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix) -+ @set -x ; \ -+ for i in `grep -wl ^LD_RUN_PATH Makefile*` ; do sed -i~ 's@^LD_RUN_PATH.*@LD_RUN_PATH=@' $$i ; done - - # No! Otherwise it is deleted before the clean-local rule runs. - #CLEANFILES = Makefile-pl diff --git a/libguestfs.spec b/libguestfs.spec index 5a00d45..7688729 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -138,7 +138,6 @@ Version: 1.19.37 Release: 0 Patch0: libguestfs-1.19.37.patch Patch5: libguestfs-1.13.14-ruby.patch -Patch101: libguestfs.perl.no-rpath.patch Source0: %{name}-%{version}.tar.gz Source10: libguestfs.mkinitrd.boot.sh Source11: libguestfs.mkinitrd.setup.sh @@ -299,7 +298,6 @@ virtual machines. %setup -q %patch0 -p1 %patch5 -p1 -%patch101 -p1 %build # disable qemu test. @@ -332,6 +330,7 @@ autoreconf -fi # 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir instead of the site dir make \ INSTALLDIRS=vendor \ + LD_RUN_PATH= \ %{?jobs:-j%jobs} %install