diff --git a/clhep.spec b/clhep.spec index 142a138ec84..b712467baa3 100644 --- a/clhep.spec +++ b/clhep.spec @@ -1,6 +1,6 @@ -### RPM external clhep 2.4.5.1 +### RPM external clhep 2.4.6.0 -%define tag f256fe37039681f7856f0e324ccf9337cdc35b51 +%define tag 06b39fc5f06924728af27f6b0df1ffdac174dff3 %define branch cms/v%{realversion} %define github_user cms-externals Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz diff --git a/dd4hep.spec b/dd4hep.spec index 0b9e8288181..aa36502b081 100644 --- a/dd4hep.spec +++ b/dd4hep.spec @@ -9,6 +9,18 @@ Source: git+https://github.com/%{github_user}/DD4hep.git?obj=%{branch}/%{tag}&ex BuildRequires: cmake Requires: root boost clhep xerces-c geant4 +%define cmake_fixed_args \\\ + -DCMAKE_INSTALL_PREFIX='%{i}' \\\ + -DBoost_NO_BOOST_CMAKE=ON \\\ + -DDD4HEP_USE_XERCESC=ON \\\ + -DDD4HEP_USE_PYROOT=ON \\\ + -DCMAKE_CXX_STANDARD=17 \\\ + -DCMAKE_BUILD_TYPE=Release \\\ + -DCMAKE_CXX_FLAGS_RELEASE='-O2 -DNDEBUG' \\\ + -DDD4HEP_USE_GEANT4_UNITS=ON \\\ + -DXERCESC_ROOT_DIR=${XERCES_C_ROOT} \\\ + -DCMAKE_PREFIX_PATH="${CLHEP_ROOT};${XERCES_C_ROOT}" + %prep %setup -n %{n}-%{realversion} @@ -16,25 +28,16 @@ Requires: root boost clhep xerces-c geant4 %build export BOOST_ROOT -CMAKE_ARGS="-DCMAKE_INSTALL_PREFIX='%{i}' \ - -DBoost_NO_BOOST_CMAKE=ON \ - -DDD4HEP_USE_XERCESC=ON \ - -DXERCESC_ROOT_DIR=${XERCES_C_ROOT} \ - -DDD4HEP_USE_PYROOT=ON \ - -DCMAKE_CXX_STANDARD=17 \ - -DCMAKE_BUILD_TYPE=Release \ - -DDD4HEP_USE_GEANT4_UNITS=ON \ - -DCMAKE_PREFIX_PATH=${CLHEP_ROOT};${XERCES_C_ROOT}" #Build normal Shared D4Hep without Geant4 rm -rf ../build; mkdir ../build; cd ../build -cmake $CMAKE_ARGS -DBUILD_SHARED_LIBS=ON ../%{n}-%{realversion} +cmake %{cmake_fixed_args} -DBUILD_SHARED_LIBS=ON ../%{n}-%{realversion} make %{makeprocesses} VERBOSE=1 make install #Building DDG4 static rm -rf ../build-g4; mkdir ../build-g4; cd ../build-g4 -cmake $CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF -DDD4HEP_USE_GEANT4=ON ../%{n}-%{realversion} +cmake %{cmake_fixed_args} -DBUILD_SHARED_LIBS=OFF -DDD4HEP_USE_GEANT4=ON ../%{n}-%{realversion} cd DDG4 make %{makeprocesses} VERBOSE=1 for lib in $(ls ../lib/libDDG4*.a | sed 's|.a$||'); do diff --git a/geant4.spec b/geant4.spec index bfc0ce90405..7c618d4e069 100644 --- a/geant4.spec +++ b/geant4.spec @@ -51,6 +51,7 @@ cmake ../%{n}.%{realversion} \ -DCMAKE_INSTALL_PREFIX:PATH="%i" \ -DCMAKE_CXX_STANDARD:STRING="17" \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG" \ -DGEANT4_USE_GDML=ON \ -DGEANT4_BUILD_TLS_MODEL:STRING="global-dynamic" \ -DGEANT4_ENABLE_TESTING=OFF \ diff --git a/vecgeom.spec b/vecgeom.spec index b9fbbaeaf57..df3aa63eee7 100644 --- a/vecgeom.spec +++ b/vecgeom.spec @@ -1,6 +1,6 @@ -### RPM external vecgeom v1.2.0 +### RPM external vecgeom v1.2.1 ## INCLUDE compilation_flags -%define tag 14d3a5c3d851794da4ca48d7659980dbf73384d4 +%define tag 12fc8ba12efe93de5aaa9ff8e51e093ae93a1633 Source: git+https://gitlab.cern.ch/VecGeom/VecGeom.git?obj=master/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz BuildRequires: cmake gmake %define keep_archives true @@ -23,6 +23,7 @@ cmake ../%{n}-%{realversion} \ -DCMAKE_AR=$(which gcc-ar) \ -DCMAKE_RANLIB=$(which gcc-ranlib) \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG" \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ %if "%{?arch_build_flags}" -DCMAKE_CXX_FLAGS="%{arch_build_flags}" \