From 993ec264a82c988f032dda14c8adc0e25ef99e83 Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Sep 08 2015 20:16:58 +0000 Subject: Add new patch. --- diff --git a/psi4-staticlib.patch b/psi4-staticlib.patch new file mode 100644 index 0000000..06579cb --- /dev/null +++ b/psi4-staticlib.patch @@ -0,0 +1,24 @@ +diff -up psi4public-1881450f30d3bd2ac91dbc4fc6a4eaa5c9f03ae5/src/lib/libparallel2/CMakeLists.txt.staticlib psi4public-1881450f30d3bd2ac91dbc4fc6a4eaa5c9f03ae5/src/lib/libparallel2/CMakeLists.txt +--- psi4public-1881450f30d3bd2ac91dbc4fc6a4eaa5c9f03ae5/src/lib/libparallel2/CMakeLists.txt.staticlib 2015-08-05 10:37:14.000000000 -0700 ++++ psi4public-1881450f30d3bd2ac91dbc4fc6a4eaa5c9f03ae5/src/lib/libparallel2/CMakeLists.txt 2015-09-08 13:11:35.454250886 -0700 +@@ -14,7 +14,7 @@ add_subdirectory(CommEnvGuts) + add_subdirectory(Schedulers) + add_subdirectory(TaskJobGuts) + add_subdirectory(Util) +-add_library(parallel2 ${LPSRC} ${CEGSRC} ${SSRC} ${TJGSRC} ${UTILSRC}) ++add_library(parallel2 STATIC ${LPSRC} ${CEGSRC} ${SSRC} ${TJGSRC} ${UTILSRC}) + set_property(GLOBAL APPEND PROPERTY LIBLIST parallel2) + if(BUILD_CUSTOM_BOOST) + add_dependencies(parallel2 custom_boost) +diff -up psi4public-1881450f30d3bd2ac91dbc4fc6a4eaa5c9f03ae5/src/lib/libPsiUtil/CMakeLists.txt.staticlib psi4public-1881450f30d3bd2ac91dbc4fc6a4eaa5c9f03ae5/src/lib/libPsiUtil/CMakeLists.txt +--- psi4public-1881450f30d3bd2ac91dbc4fc6a4eaa5c9f03ae5/src/lib/libPsiUtil/CMakeLists.txt.staticlib 2015-08-05 10:37:14.000000000 -0700 ++++ psi4public-1881450f30d3bd2ac91dbc4fc6a4eaa5c9f03ae5/src/lib/libPsiUtil/CMakeLists.txt 2015-09-08 13:11:06.531702529 -0700 +@@ -16,7 +16,7 @@ set(SRC ProgressBar.h + Implementations/ProgressBar.cc + Implementations/Exception2.cc + ) +-add_library(PsiUtil ${SRC}) ++add_library(PsiUtil STATIC ${SRC}) + add_dependencies(PsiUtil parallel2) + include_directories(libparallel2) + set_property(GLOBAL APPEND PROPERTY LIBLIST PsiUtil) diff --git a/psi4.spec b/psi4.spec index dea1e03..c1b93e8 100644 --- a/psi4.spec +++ b/psi4.spec @@ -11,7 +11,7 @@ Name: psi4 Epoch: 1 Version: 0.3 -Release: 1.%{shortcommit}git%{?dist} +Release: 2.%{shortcommit}git%{?dist} Summary: An ab initio quantum chemistry package Group: Applications/Engineering License: GPLv2+ and MIT @@ -27,6 +27,8 @@ Patch1: psi4-systemboost.patch Patch2: psi4-gitversion.patch # Install headers into psi4 specific directory Patch3: psi4-includeinst.patch +# Add some missing static library definitions +Patch4: psi4-staticlib.patch BuildRequires: cmake BuildRequires: atlas-devel @@ -94,6 +96,7 @@ This package contains static libraries and development headers for psi. %patch1 -p1 -b .systemboost %patch2 -p1 -b .gitversion %patch3 -p1 -b .includeinst +%patch4 -p1 -b .staticlib # Get rid of bundled boost rm -rf boost/ # Get rid of bundled libint @@ -155,6 +158,9 @@ ctest -L quicktests %{_libdir}/psi4/ %changelog +* Tue Sep 08 2015 Susi Lehtola - 1:0.3-2.1881450fgit +- Patch to fix broken linkage. + * Sun Sep 06 2015 Susi Lehtola - 1:0.3-1.1881450fgit - Update to newest release, switched to using github release tags.