[votca-csg] Fix FTBFS.
Susi Lehtola
jussilehtola at fedoraproject.org
Sat Mar 9 14:38:49 UTC 2013
commit d4ee5463c7eef18f256b4422ec379e1636258f95
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date: Sat Mar 9 16:38:40 2013 +0200
Fix FTBFS.
votca-csg-1.2.3-dso.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
votca-csg.spec | 5 ++++-
2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/votca-csg-1.2.3-dso.patch b/votca-csg-1.2.3-dso.patch
new file mode 100644
index 0000000..c2a1d40
--- /dev/null
+++ b/votca-csg-1.2.3-dso.patch
@@ -0,0 +1,43 @@
+# HG changeset patch
+# User Christoph Junghans <junghans at votca.org>
+# Date 1362765945 25200
+# Branch stable
+# Node ID 0a8664d9ed8f8279709266d311553cc1138709e4
+# Parent 1234c5028e9d1488bbe16d1af7cdef7ea42e9eef
+link pthreads into libvotca_csg to make it DSO confrom
+
+diff -r 1234c5028e9d -r 0a8664d9ed8f CMakeLists.txt
+--- a/CMakeLists.txt Thu Aug 25 15:41:29 2011 +0200
++++ b/CMakeLists.txt Fri Mar 08 11:05:45 2013 -0700
+@@ -46,6 +46,8 @@
+ ########################################################################
+ #Find external packages
+ ########################################################################
++find_package(Threads REQUIRED)
++set(THREAD_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+ find_package(TXT2TAGS)
+ option(EXTERNAL_BOOST "Use external boost" ON)
+ if (EXTERNAL_BOOST)
+diff -r 1234c5028e9d -r 0a8664d9ed8f src/libcsg/CMakeLists.txt
+--- a/src/libcsg/CMakeLists.txt Thu Aug 25 15:41:29 2011 +0200
++++ b/src/libcsg/CMakeLists.txt Fri Mar 08 11:05:45 2013 -0700
+@@ -49,7 +49,7 @@
+ add_library(votca_csg ${VOTCA_SOURCES} ${GMX_SOURCES} ${IO_SOURCES})
+ add_dependencies(votca_csg hgversion)
+ set_target_properties(votca_csg PROPERTIES SOVERSION ${SOVERSION})
+-target_link_libraries(votca_csg ${VOTCA_TOOLS_LIBRARIES} ${GROMACS_LIBRARIES} ${BOOST_LIBRARIES})
++target_link_libraries(votca_csg ${VOTCA_TOOLS_LIBRARIES} ${GROMACS_LIBRARIES} ${BOOST_LIBRARIES} ${THREAD_LIBRARIES})
+ install(TARGETS votca_csg LIBRARY DESTINATION ${LIB} ARCHIVE DESTINATION ${LIB})
+
+ configure_file(libvotca_csg.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libvotca_csg.pc @ONLY)
+diff -r 1234c5028e9d -r 0a8664d9ed8f src/libcsg/libvotca_csg.pc.in
+--- a/src/libcsg/libvotca_csg.pc.in Thu Aug 25 15:41:29 2011 +0200
++++ b/src/libcsg/libvotca_csg.pc.in Fri Mar 08 11:05:45 2013 -0700
+@@ -7,6 +7,6 @@
+ URL: http://www.votca.org
+ Version: @VERSION@
+ Requires: libvotca_tools @GROMACS_PKG@ @BOOST_PKG@
+-Libs: -L${libdir} -lvotca_csg @BOOST_LIBS_PKG@
++Libs: -L${libdir} -lvotca_csg @BOOST_LIBS_PKG@ @THREAD_LIBRARIES@
+ Libs.private: -lm
+ Cflags: -I${includedir} @BOOST_CFLAGS_PKG@
diff --git a/votca-csg.spec b/votca-csg.spec
index 488bee7..e56d1ff 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -7,12 +7,14 @@ License: ASL 2.0
URL: http://www.votca.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://votca.googlecode.com/files/%{name}-%{version}.tar.gz
+# Properly link against pthreads
+Patch0: votca-csg-1.2.3-dso.patch
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: gromacs-devel
BuildRequires: votca-tools-devel = %{version}
-BuildRequires: txt2tags
+BuildRequires: txt2tags
Requires: %{name}-common = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
@@ -81,6 +83,7 @@ engine.
%prep
%setup -q
+%patch0 -p1
%build
mkdir %{_target_platform}
More information about the scm-commits
mailing list