diff options
Diffstat (limited to 'systemtap.spec.in')
| -rw-r--r-- | systemtap.spec.in | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/systemtap.spec.in b/systemtap.spec.in index c3f59428..9b06cf8c 100644 --- a/systemtap.spec.in +++ b/systemtap.spec.in @@ -1,5 +1,5 @@ %define bundled_elfutils 1 -%define elfutils_version 0.109 +%define elfutils_version 0.111 Name: systemtap Version: @VERSION@ @@ -65,14 +65,11 @@ for dir in libelf libebl libdw libdwfl; do make -C $dir install includedir=$elfutils_includedir libdir=$elfutils_libdir done cd .. -libdwfl_h=$elfutils_includedir/elfutils/libdwfl.h -sed 's%<libdw.h>%<elfutils/libdw.h>%' ${libdwfl_h} > ${libdwfl_h}.new -mv -f ${libdwfl_h}.new ${libdwfl_h} # We'll configure with these options to use the local headers and libraries. CPPFLAGS="-I${elfutils_includedir}" LDFLAGS="-L${elfutils_libdir} -Wl,-rpath-link,${elfutils_libdir} \ --Wl,--enable-new-dtags,-rpath,\\\$\$\$\$ORIGIN/../\\\$\$\$\$LIB/%{name}" +-Wl,--enable-new-dtags,-rpath,%{_libdir}/%{name}" export CPPFLAGS LDFLAGS # We have to prevent the standard dependency generation from identifying @@ -81,6 +78,9 @@ export CPPFLAGS LDFLAGS %define filter_eulibs() /bin/sh -c "%{1} | sed '/libelf/d;/libdw/d;/libebl/d'" %define __find_provides %{filter_eulibs /usr/lib/rpm/find-provides} %define __find_requires %{filter_eulibs /usr/lib/rpm/find-requires} + +# This will be needed for running stap when not installed, for the test suite. +%define elfutils_mflags LD_LIBRARY_PATH=`pwd`/lib-elfutils %endif %configure @@ -90,7 +90,7 @@ make docs %install rm -rf ${RPM_BUILD_ROOT} -%makeinstall libexecdir=${RPM_BUILD_ROOT}%{_libexecdir}/systemtap +%makeinstall libexecdir=${RPM_BUILD_ROOT}%{_libexecdir}/systemtap %if %{bundled_elfutils} installed_elfutils=${RPM_BUILD_ROOT}%{_libdir}/%{name} @@ -98,6 +98,8 @@ mkdir -p ${installed_elfutils} cp -P lib-elfutils/*.so* lib-elfutils/%{name}/*.so* ${installed_elfutils}/ %endif +%check +make check %{?elfutils_mflags} || : %clean rm -rf ${RPM_BUILD_ROOT} @@ -108,10 +110,12 @@ rm -rf ${RPM_BUILD_ROOT} %doc README AUTHORS NEWS runtime/docs/html %{_bindir}/stap +%{_mandir}/man1/* %{_libexecdir}/systemtap/stpd %dir %{_datadir}/systemtap %{_datadir}/systemtap/runtime +%{_datadir}/systemtap/tapset %if %{bundled_elfutils} %dir %{_libdir}/%{name} @@ -120,6 +124,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Jul 29 2005 Roland McGrath <roland@redhat.com> - 0.2-1 +- New version 0.2, requires elfutils 0.111 + * Mon Jul 25 2005 Roland McGrath <roland@redhat.com> - Clean up spec file, build bundled elfutils. |