diff --git a/cadabra2-2.1.7.patch b/cadabra2-2.1.7.patch new file mode 100644 index 0000000..ca5220d --- /dev/null +++ b/cadabra2-2.1.7.patch @@ -0,0 +1,12 @@ +diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cadabra2-2.1.7/CMakeLists.txt ./CMakeLists.txt +--- ../orig-cadabra2-2.1.7/CMakeLists.txt 2017-11-19 20:27:27.000000000 +0100 ++++ ./CMakeLists.txt 2017-12-29 09:34:50.496366051 +0100 +@@ -202,7 +202,7 @@ + include(CPack) + + if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -pthread") + endif() + + if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") diff --git a/cadabra2.changes b/cadabra2.changes index 1a355a7..e81f0b6 100644 --- a/cadabra2.changes +++ b/cadabra2.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Fri Dec 29 08:33:37 UTC 2017 - kkaempf@suse.com + +- fix build, add -pthread to CMAKE_CXX_FLAGS + added cadabra2-2.1.7.patch + ------------------------------------------------------------------- Wed Nov 22 09:19:49 UTC 2017 - badshah400@gmail.com -- Update to version 2.1.6: +- Update to version 2.1.7: * Another interim release to fix bugs and sort out the build process on new distros. diff --git a/cadabra2.spec b/cadabra2.spec index 4367a64..050100d 100644 --- a/cadabra2.spec +++ b/cadabra2.spec @@ -26,6 +26,8 @@ Url: http://cadabra.science/ Source0: https://github.com/kpeeters/cadabra2/archive/%{version}.tar.gz Source1: %{name}-rpmlintrc Source2: %{name}-gtk.appdata.xml +# PATCH-FIX-OPENSUSE add -pthread to CMAKE_CXX_FLAGS (as adivised in https://github.com/potree/PotreeConverter/issues/136) kkaempf@suse.de +Patch1: cadabra2-2.1.7.patch BuildRequires: appstream-glib BuildRequires: cmake BuildRequires: doxygen @@ -161,6 +163,7 @@ This package provides documentation in the form of a PDF file for %{name}. %prep %setup -q +%patch1 -p1 %build mkdir build && pushd build