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

dd4hep: apply patches for PRs 1066, 1071, 1105, 1106 #489

Merged
merged 1 commit into from
Jul 5, 2023
Merged

dd4hep: apply patches for PRs 1066, 1071, 1105, 1106 #489

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
19 changes: 17 additions & 2 deletions packages/dd4hep/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ class Dd4hep(BuiltinDd4hep):
sha256="1c5697eabab65d4c2d49d710c14a33673e92b0349ed8299041c9da2d7878831b",
when="@1.24 -frames",
)
patch(
"https://github.com/AIDASoft/DD4hep/pull/1066.patch?full_index=1",
sha256="c6df47768279c65f6a9d3cee57b038f37cb35c845deef22476876ea607ff14a1",
when="@1.25.1",
)
patch(
"https://github.com/AIDASoft/DD4hep/pull/1068.patch?full_index=1",
sha256="401a349435ca6673a2817c32c39e2fa73ca17241fb2bf3f836c110a2f1c90431",
Expand All @@ -36,8 +41,8 @@ class Dd4hep(BuiltinDd4hep):
when="@1.24:1.25.1",
)
patch(
"pr1106-1-25-1.patch",
sha256="73932633e95272f77c1f6ad8edf06d426b198c30a9c9467167c04f3a3f7f5d12",
"https://github.com/AIDASoft/DD4hep/pull/1071.patch?full_index=1",
sha256="8a71caf957a4b0ecb05a2fc5e39265e79e0af0d98e89b75406957815442c7b30",
when="@1.25.1",
)
patch(
Expand All @@ -53,6 +58,16 @@ def setup_run_environment(self, env):
def setup_dependent_build_environment(self, env, dependent_spec):
super().setup_dependent_build_environment(env, dependent_spec)
env.set("CXXFLAGS", "-DDD4HEP_FIELD_TYPE_OVERRIDE=field_type")
patch(
"https://github.com/AIDASoft/DD4hep/pull/1105.patch?full_index=1",
sha256="bcfa71a74368034818ff4810cd5738a13fc56d1d49742b19abe7397de1531596",
when="@1.19:1.25.1",
)
patch(
"https://github.com/AIDASoft/DD4hep/pull/1106.patch?full_index=1",
sha256="5a0ed96babc56d01663f157e50455a746bba63a4a7f27779325fa5e097cf7bb5",
when="@:1.25.1",
)
patch(
"https://github.com/AIDASoft/DD4hep/commit/8693a29669d03dec5e06b61e6df7cc0df1e0aa5c.patch",
sha256="28fb1c17eb1c06c24b304511308fd3b0af708f2ba3aec3e4cb13d7da6abbc51c",
Expand Down
36 changes: 0 additions & 36 deletions packages/dd4hep/pr1106-1-25-1.patch
View file
Open in desktop

This file was deleted.