diff options
| author | roland <roland> | 2005-12-12 05:51:54 +0000 |
|---|---|---|
| committer | roland <roland> | 2005-12-12 05:51:54 +0000 |
| commit | 4d9087fcfe475185ef08a16fef31942f06d60f54 (patch) | |
| tree | a04eb7820ff55199979c721c1c13f523705e185d /systemtap.spec.in | |
| parent | c89b8e696681cbb8372db43da4ebf458ed387b6c (diff) | |
| download | systemtap-steved-4d9087fcfe475185ef08a16fef31942f06d60f54.tar.gz systemtap-steved-4d9087fcfe475185ef08a16fef31942f06d60f54.tar.xz systemtap-steved-4d9087fcfe475185ef08a16fef31942f06d60f54.zip | |
2005-12-11 Roland McGrath <roland@redhat.com>
* configure.ac: Bump version to 0.5.1 for test builds.
* systemtap.spec.in: Remove ExclusiveArch.
* configure: Regenerated.
PR 1916
* configure.ac: Grok --with-elfutils.
* Makefile.am [BUILD_ELFUTILS] (install-elfutils, stamp-elfutils):
New targets.
[BUILD_ELFUTILS] (stap_LDFLAGS, stap_LDFLAGS): Add flags
to point at local elfutils build.
[BUILD_ELFUTILS] (BUILT_SOURCES): Add stamp-elfutils.
[BUILD_ELFUTILS] (stap_DEPENDENCIES): New variable.
[BUILD_ELFUTILS] (lib-elfutils/libdw.so): New target.
[BUILD_ELFUTILS] (install-exec-local): Depend on install-elfutils.
(loc2c_test_LDADD): Set this to $(stap_LDADD).
(loc2c_test_CPPFLAGS, loc2c_test_LDFLAGS): New variables.
* Makefile.in: Regenerated.
* compile: New file from automakeland.
* systemtap.spec.in (elfutils_version): Require 0.118 or later.
[bundled_elfutils]: Remove old hacks for building elfutils, and rely
on configure --with-elfutils instead.
Diffstat (limited to 'systemtap.spec.in')
| -rw-r--r-- | systemtap.spec.in | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/systemtap.spec.in b/systemtap.spec.in index eb412743..e4cd45a8 100644 --- a/systemtap.spec.in +++ b/systemtap.spec.in @@ -1,5 +1,5 @@ %define bundled_elfutils 1 -%define elfutils_version 0.116 +%define elfutils_version 0.118 Name: systemtap Version: @VERSION@ @@ -10,8 +10,6 @@ License: GPL URL: http://sourceware.org/systemtap/ Source: ftp://sourceware.org/pub/%{name}/%{name}-%{version}.tar.gz -ExclusiveArch: %{ix86} x86_64 ppc ia64 - BuildRoot: %{_tmppath}/%{name}-root Requires: kernel >= 2.6.9-11 @@ -50,29 +48,7 @@ cd .. %if %{bundled_elfutils} # Build our own copy of elfutils. -elfutils_includedir="`pwd`/include-elfutils" -elfutils_libdir="`pwd`/lib-elfutils" -mkdir build-elfutils -cd build-elfutils -cat > configure <<\EOF -#!/bin/sh -exec ../elfutils-%{elfutils_version}/configure "$@" -EOF -chmod +x configure -LDFLAGS=-Wl,--enable-new-dtags,-rpath,%{_libdir}/%{name} -export LDFLAGS -%configure --enable-libebl-subdir=%{name} -make %{?_smp_mflags} -for dir in libelf libebl libdw libdwfl; do - make -C $dir install includedir=$elfutils_includedir libdir=$elfutils_libdir -done -cd .. - -# 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,%{_libdir}/%{name}" -export CPPFLAGS LDFLAGS +%define elfutils_config --with-elfutils=elfutils-%{elfutils_version} # We have to prevent the standard dependency generation from identifying # our private elfutils libraries in our provides and requires. @@ -85,7 +61,7 @@ export CPPFLAGS LDFLAGS %define elfutils_mflags LD_LIBRARY_PATH=`pwd`/lib-elfutils %endif -%configure +%configure %{?elfutils_config} make %{?_smp_mflags} %install @@ -93,12 +69,6 @@ rm -rf ${RPM_BUILD_ROOT} %makeinstall -%if %{bundled_elfutils} -installed_elfutils=${RPM_BUILD_ROOT}%{_libdir}/%{name} -mkdir -p ${installed_elfutils} -cp -P lib-elfutils/*.so* lib-elfutils/%{name}/*.so* ${installed_elfutils}/ -%endif - mkdir -p $RPM_BUILD_ROOT/var/cache/systemtap %check @@ -130,6 +100,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Dec 7 2005 Roland McGrath <roland@redhat.com> - 0.5.1-1 +- elfutils update, build changes + * Fri Dec 02 2005 Frank Ch. Eigler <fche@redhat.com> - 0.5-1 - Many fixes and improvements: 1425, 1536, 1505, 1380, 1329, 1828, 1271, 1339, 1340, 1345, 1837, 1917, 1903, 1336, 1868, 1594, 1564, 1276, 1295 |