[net-snmp] Work around removed rpath from libtool and the test suite not working without it. TODO: analyze what
Jan Šafránek
jsafrane at fedoraproject.org
Tue Oct 26 13:45:05 UTC 2010
commit fa245696664d45dca0800ab3cac28cff7b44d090
Author: Jan Safranek <jsafrane at redhat.com>
Date: Tue Oct 26 15:44:58 2010 +0200
Work around removed rpath from libtool and the test suite not working without it.
TODO: analyze what is wrong here, I don't have time for it now
net-snmp.spec | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/net-snmp.spec b/net-snmp.spec
index d1ca812..4be4f92 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -202,6 +202,8 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
--with-sys-contact="root at localhost" <<EOF
EOF
+# store original libtool file, we will need it later
+cp libtool libtool.orig
# remove rpath from libtool
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
@@ -299,6 +301,8 @@ install -m 644 agent/mibgroup/util_funcs/*.h $RPM_BUILD_ROOT/usr/include/net-sn
%check
%if %{netsnmp_check}
+# restore libtool, for unknown reason it does not work with the one without rpath
+cp -f libtool.orig libtool
LD_LIBRARY_PATH=${RPM_BUILD_ROOT}/%{_libdir} make test
%endif
More information about the scm-commits
mailing list