Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[14.0.X] Backport Update gbl to V03-01-01 and millepede to V04-16-00 #9057

Merged
merged 1 commit into from
Mar 11, 2024
Merged

[14.0.X] Backport Update gbl to V03-01-01 and millepede to V04-16-00 #9057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions gbl.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
### 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
Requires: eigen

%prep
%setup -q -n %{n}-%{realversion}
##Remove these line when new version of gbl is released
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
Expand All @@ -21,11 +24,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}

Expand Down
2 changes: 1 addition & 1 deletion millepede.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down