Fix FTBFS issue; update libtool files instead of disabling rpath things.

epel9
Akira TAGOH 14 years ago
parent e30424b9bd
commit f5f928d7f6

@ -1,13 +1,13 @@
Summary: Google C++ testing framework Summary: Google C++ testing framework
Name: gtest Name: gtest
Version: 1.5.0 Version: 1.5.0
Release: 4%{?dist} Release: 5%{?dist}
License: BSD License: BSD
Group: Development/Tools Group: Development/Tools
URL: http://code.google.com/p/googletest/ URL: http://code.google.com/p/googletest/
Source0: http://googletest.googlecode.com/files/gtest-%{version}.tar.bz2 Source0: http://googletest.googlecode.com/files/gtest-%{version}.tar.bz2
Patch0: gtest-1.5.0-make-check.patch Patch0: gtest-1.5.0-make-check.patch
BuildRequires: python BuildRequires: python libtool autoconf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%description %description
@ -34,13 +34,17 @@ This package contains development files for %{name}.
# keep a clean copy of samples. # keep a clean copy of samples.
cp -pr ./samples ./samples.orig cp -pr ./samples ./samples.orig
# Keep the latest libtool as the working copy
libtoolize -f -c
autoreconf
%build %build
%configure --disable-static %configure --disable-static
# omit unused direct shared library dependencies. # omit unused direct shared library dependencies.
sed -i -e's| -shared | -Wl,--as-needed\0|g' libtool sed -i -e's| -shared | -Wl,--as-needed\0|g' libtool
# remove rpath ## remove rpath
sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool #sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool #sed -i -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags} make %{?_smp_mflags}
%check %check
@ -79,6 +83,9 @@ rm -rf %{buildroot}
%{_includedir}/gtest %{_includedir}/gtest
%changelog %changelog
* Thu Sep 15 2011 Akira TAGOH <tagoh@redhat.com> j- 1.5.0-5
- Fix FTBFS issue; update libtool files instead of disabling rpath things.
* Sun Mar 20 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.5.0-4 * Sun Mar 20 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.5.0-4
- add patch from Dan Horák to let 'make check' work - add patch from Dan Horák to let 'make check' work

Loading…
Cancel
Save