From 084a033843ed2e8693454de9760c8cb98952bf72 Mon Sep 17 00:00:00 2001 From: Vanja Skuric Date: Fri, 9 Feb 2018 09:52:36 +0100 Subject: [PATCH] Bugfix (MacOS): Fixed compilation of libccmio and ParMGridGen for High Sierra --- ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_darwin | 2 +- ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 | 8 ++++++-- ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_darwin b/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_darwin index 2f793fb40..1e8a4bc61 100644 --- a/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_darwin +++ b/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_darwin @@ -129,7 +129,7 @@ diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in # What archiving to use -AR = ar rv -+AR = gcc -dynamiclib -undefined dynamic_lookup -shared -o ++AR = clang -dynamiclib -headerpad_max_install_names -undefined dynamic_lookup -shared -o # What to use for indexing the archive #RANLIB = ranlib diff --git a/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 b/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 index 4a82e7fcf..49c212c0c 100644 --- a/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 +++ b/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 @@ -7,7 +7,7 @@ diff -ruN libccmio-2.6.1_orig/config/config.gnu.to.star libccmio-2.6.1/config/co # $Id: config.gnu.to.star,v 1.4 2006/06/05 21:12:16 geoffp Exp $ -@@ -34,6 +34,13 @@ +@@ -34,6 +34,14 @@ x86_64-unknown-linux-gnu-null) echo linux64_2.4-x86-glibc_2.2.5 ;; ppc64-unknown-linux-gnu-null) echo linux64_2.6-pwr4-glibc_2.3.3 ;; i386-apple-darwin8-null) echo i386-apple-darwin8 ;; @@ -18,6 +18,7 @@ diff -ruN libccmio-2.6.1_orig/config/config.gnu.to.star libccmio-2.6.1/config/co + i386-apple-darwin14-null) echo i386-apple-darwin14 ;; + i386-apple-darwin15-null) echo i386-apple-darwin15 ;; + i386-apple-darwin16-null) echo i386-apple-darwin16 ;; ++ i386-apple-darwin17-null) echo i386-apple-darwin17 ;; *) echo unknown ;; esac @@ -39,7 +40,7 @@ diff -ruN libccmio-2.6.1_orig/config/config.system libccmio-2.6.1/config/config. # $Id: config.system,v 1.2 2005/09/29 22:19:19 geoffp Exp $ -@@ -87,6 +87,30 @@ +@@ -87,6 +87,33 @@ i386-apple-darwin8.11.1) echo i386-apple-darwin8 ;; @@ -66,6 +67,9 @@ diff -ruN libccmio-2.6.1_orig/config/config.system libccmio-2.6.1/config/config. + + i386-apple-darwin16.* ) + echo i386-apple-darwin16 ;; ++ ++ i386-apple-darwin17.* ) ++ echo i386-apple-darwin17 ;; + *) echo unknown diff --git a/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec b/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec index b62d21d0f..53806ea6c 100644 --- a/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec +++ b/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec @@ -106,6 +106,7 @@ Patch0: libccmio-2.6.1.patch_0 [ ! -d config/i386-apple-darwin14 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin14 [ ! -d config/i386-apple-darwin15 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin15 [ ! -d config/i386-apple-darwin16 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin16 + [ ! -d config/i386-apple-darwin17 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin17 %endif # Warning: # 1: The name of the ADF library will be renamed to libadf_ccmio since this