From 34a0f9da38c1a18baa1023c486e7ce1e2a4c8083 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Tue, 9 Apr 2019 12:16:12 +0200 Subject: [PATCH] Update dd4hep with latest changes on master and remove ppc64 patch --- dd4hep-add-ppc64-macro-check.patch | 13 ------------- dd4hep.spec | 10 ++-------- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 dd4hep-add-ppc64-macro-check.patch diff --git a/dd4hep-add-ppc64-macro-check.patch b/dd4hep-add-ppc64-macro-check.patch deleted file mode 100644 index c702229ec50..00000000000 --- a/dd4hep-add-ppc64-macro-check.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/DDCore/src/Primitives.cpp b/DDCore/src/Primitives.cpp -index b319624..bafb16a 100644 ---- a/DDCore/src/Primitives.cpp -+++ b/DDCore/src/Primitives.cpp -@@ -25,7 +25,7 @@ - #include - #include - --#if defined(__linux) || defined(__APPLE__) -+#if defined(__linux) || defined(__APPLE__) || defined(__powerpc64__) - #include - #ifndef __APPLE__ - typedef abi::__class_type_info class_t; diff --git a/dd4hep.spec b/dd4hep.spec index 4db00c95836..1c1803849d4 100644 --- a/dd4hep.spec +++ b/dd4hep.spec @@ -1,25 +1,19 @@ ### RPM external dd4hep v01-10x -%define tag 0a44b413788a34fcadb6646ed83ee3f17fdf0bd9 -%define branch cms/master/9835d18 +%define tag 88e428e1c81b1d7a51f9d046bd116ae23a7fb992 +%define branch cms/master/052a2b2 %define github_user cms-externals %define keep_archives true Source: git+https://github.com/%{github_user}/DD4hep.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz BuildRequires: cmake Requires: root boost clhep xerces-c geant4 - Patch0: dd4hep-build-static -Patch1: dd4hep-add-ppc64-macro-check %prep %setup -n %{n}-%{realversion} -%ifarch ppc64le -%patch1 -p1 -%endif - %build export BOOST_ROOT