Attachment 578363 Details for Bug 813825 – Patch to fix linker problem

[patch] Patch to fix linker problem

0001-gtest-add-pthread-to-fix-missing-symbols.patch (text/plain), 2.84 KB, created by Tim Niemueller on 2012-04-18 14:00:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Niemueller

Created: 2012-04-18 14:00:43 UTC

Size: 2.84 KB

patch

obsolete

>From 4dcfb01b1b9fc18ef4f1b37a4766e88f11d3cf76 Mon Sep 17 00:00:00 2001
>From: Tim Niemueller <niemueller@kbsg.rwth-aachen.de>
>Date: Wed, 18 Apr 2012 14:45:30 +0200
>Subject: [PATCH] gtest: add pthread to fix missing symbols
>
>On F-16 when building dependent packages (in my case pcl-1.5) a build
>failure is reported like this:
>.../libgtest.so: undefined reference to `pthread_key_create'
>
>The problem is fixed by forcing gtest to not only link using -pthread,
>but also add -lpthread.
>---
> gtest-1.5.0-pthread.patch |   12 ++++++++++++
> gtest.spec                |   10 ++++++----
> 2 files changed, 18 insertions(+), 4 deletions(-)
> create mode 100644 gtest-1.5.0-pthread.patch
>
>diff --git a/gtest-1.5.0-pthread.patch b/gtest-1.5.0-pthread.patch
>new file mode 100644
>index 0000000..24da3f3
>--- /dev/null
>+++ b/gtest-1.5.0-pthread.patch
>@@ -0,0 +1,12 @@
>+diff -urN gtest-1.5.0/Makefile.am gtest-1.5.0.pthread/Makefile.am
>+--- gtest-1.5.0/Makefile.am	2012-04-18 14:17:41.360399331 +0200
>++++ gtest-1.5.0.pthread/Makefile.am	2012-04-18 14:17:53.489399890 +0200
>+@@ -170,7 +170,7 @@
>+ 
>+ # Modifies compiler and linker flags for pthreads compatibility.
>+ if HAVE_PTHREADS
>+-  AM_CXXFLAGS = @PTHREAD_CFLAGS@ -DGTEST_HAS_PTHREAD=1
>++  AM_CXXFLAGS = @PTHREAD_CFLAGS@ -DGTEST_HAS_PTHREAD=1 -lpthread
>+   AM_LIBS = @PTHREAD_LIBS@
>+ else
>+   AM_CXXFLAGS = -DGTEST_HAS_PTHREAD=0
>diff --git a/gtest.spec b/gtest.spec
>index 7952cbc..7a7c50a 100644
>--- a/gtest.spec
>+++ b/gtest.spec
>@@ -7,6 +7,7 @@ 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
>+Patch1:         gtest-1.5.0-pthread.patch
> BuildRequires:  python libtool autoconf
> BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
> 
>@@ -30,6 +31,7 @@ This package contains development files for %{name}.
> %prep
> %setup -q
> %patch0 -p1
>+%patch1 -p1
> 
> # keep a clean copy of samples.
> cp -pr ./samples ./samples.orig
>@@ -39,7 +41,7 @@ libtoolize -f -c
> autoreconf
> 
> %build
>-%configure --disable-static
>+%configure --disable-static --with-pthreads
> # omit unused direct shared library dependencies.
> sed -i -e's| -shared | -Wl,--as-needed\0|g' libtool
> ## remove rpath
>@@ -83,10 +85,10 @@ rm -rf %{buildroot}
> %{_includedir}/gtest
> 
> %changelog
>-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-6
>-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
>+* Wed Apr 18 2012 Tim Niemueller <tim@niemueller.de> - 1.5.0-6
>+- Add patch to fix pthread problems
> 
>-* Thu Sep 15 2011 Akira TAGOH <tagoh@redhat.com> j- 1.5.0-5
>+* Thu Sep 15 2011 Akira TAGOH <tagoh@redhat.com> - 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
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 813825: 578363