diff --git a/gbl.spec b/gbl.spec index b1499f03593..85a41c1a8ed 100644 --- a/gbl.spec +++ b/gbl.spec @@ -1,6 +1,6 @@ -### RPM external gbl V02-04-01 +### RPM external gbl V03-01-01 ## INCLUDE cpp-standard -%define tag 31e726d777fe93cdbed0c363dc15f803f7767f40 +%define tag 59c2d99ea96bc739321fd251096504c91467be24 Source: git+https://gitlab.desy.de/claus.kleinwort/general-broken-lines.git?obj=main/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz BuildRequires: cmake @@ -8,6 +8,8 @@ Requires: eigen %prep %setup -q -n %{n}-%{realversion} +grep -q 'CMAKE_CXX_STANDARD *11' cpp/CMakeLists.txt +sed -i -e 's|CMAKE_CXX_STANDARD *11|CMAKE_CXX_STANDARD %{cms_cxx_standard}|' cpp/CMakeLists.txt %build rm -rf build @@ -21,11 +23,10 @@ cmake ../cpp \ -DEIGEN3_INCLUDE_DIR=${EIGEN_ROOT}/include/eigen3 \ -DSUPPORT_ROOT=False \ %ifarch x86_64 - -DCMAKE_CXX_FLAGS="-DEIGEN_MAX_ALIGN_BYTES=64 -msse3" \ + -DCMAKE_CXX_FLAGS="-DEIGEN_MAX_ALIGN_BYTES=64 -msse3" %else - -DCMAKE_CXX_FLAGS="-DEIGEN_MAX_ALIGN_BYTES=64" \ + -DCMAKE_CXX_FLAGS="-DEIGEN_MAX_ALIGN_BYTES=64" %endif - -DCMAKE_CXX_STANDARD=%{cms_cxx_standard} make %{makeprocesses} diff --git a/millepede.spec b/millepede.spec index c0eb031c52e..ca0187dd131 100644 --- a/millepede.spec +++ b/millepede.spec @@ -1,4 +1,4 @@ -### RPM external millepede V04-14-00 +### RPM external millepede V04-16-00 Source: https://gitlab.desy.de/claus.kleinwort/millepede-ii/-/archive/%{realversion}/%{n}-ii-%{realversion}.tar.gz Requires: zlib