diff --git a/hwloc.spec b/hwloc.spec index a668dfc..f5bc923 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -19,7 +19,6 @@ BuildRequires: libXNVCtrl-devel BuildRequires: ncurses-devel BuildRequires: transfig doxygen w3m BuildRequires: texlive-latex texlive-makeindex -BuildRequires: autoconf automake libtool BuildRequires: desktop-file-utils %ifnarch s390 s390x %{arm} BuildRequires: numactl-devel @@ -81,9 +80,10 @@ Requires: %{name}-plugins%{?_isa} = %{version}-%{release} %autosetup -p1 %build -# Remove rpaths -autoreconf --force --install %configure --enable-plugins --disable-silent-rules +# Remove rpaths +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 make %{?_smp_mflags} %install @@ -108,7 +108,7 @@ ln %{buildroot}%{_mandir}/man1/lstopo-no-graphics.1 %{buildroot}%{_mandir}/man1/ rm %{buildroot}%{_datadir}/%{name}/hwloc-dump-hwdata.service %check -make check +LD_LIBRARY_PATH=$PWD/src/.libs make check %post libs -p /sbin/ldconfig