Fix FTBFS issue; update libtool files instead of disabling rpath things.
This commit is contained in:
parent
e30424b9bd
commit
f5f928d7f6
17
gtest.spec
17
gtest.spec
@ -1,13 +1,13 @@
|
||||
Summary: Google C++ testing framework
|
||||
Name: gtest
|
||||
Version: 1.5.0
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
License: BSD
|
||||
Group: Development/Tools
|
||||
URL: http://code.google.com/p/googletest/
|
||||
Source0: http://googletest.googlecode.com/files/gtest-%{version}.tar.bz2
|
||||
Patch0: gtest-1.5.0-make-check.patch
|
||||
BuildRequires: python
|
||||
BuildRequires: python libtool autoconf
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
|
||||
%description
|
||||
@ -34,13 +34,17 @@ This package contains development files for %{name}.
|
||||
# keep a clean copy of samples.
|
||||
cp -pr ./samples ./samples.orig
|
||||
|
||||
# Keep the latest libtool as the working copy
|
||||
libtoolize -f -c
|
||||
autoreconf
|
||||
|
||||
%build
|
||||
%configure --disable-static
|
||||
# omit unused direct shared library dependencies.
|
||||
sed -i -e's| -shared | -Wl,--as-needed\0|g' libtool
|
||||
# remove rpath
|
||||
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
|
||||
## remove rpath
|
||||
#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
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
@ -79,6 +83,9 @@ rm -rf %{buildroot}
|
||||
%{_includedir}/gtest
|
||||
|
||||
%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
|
||||
- add patch from Dan Horák to let 'make check' work
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user