From fd0e75b82247cda60f086b04c34d90d793e35a6f Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Thu, 11 Jul 2019 17:00:12 -0400 Subject: [PATCH] ThirdParty: libccmio. Usual adjustments when moving to a newer version of macOS/OSX. In this case, macOS 10.14.5 (darwin18) --- ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 | 8 ++++++-- ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 b/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 index 49c212c0c..7a6032342 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,14 @@ +@@ -34,6 +34,15 @@ 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 ;; @@ -19,6 +19,7 @@ diff -ruN libccmio-2.6.1_orig/config/config.gnu.to.star libccmio-2.6.1/config/co + i386-apple-darwin15-null) echo i386-apple-darwin15 ;; + i386-apple-darwin16-null) echo i386-apple-darwin16 ;; + i386-apple-darwin17-null) echo i386-apple-darwin17 ;; ++ i386-apple-darwin18-null) echo i386-apple-darwin18 ;; *) echo unknown ;; esac @@ -40,7 +41,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,33 @@ +@@ -87,6 +87,36 @@ i386-apple-darwin8.11.1) echo i386-apple-darwin8 ;; @@ -70,6 +71,9 @@ diff -ruN libccmio-2.6.1_orig/config/config.system libccmio-2.6.1/config/config. + + i386-apple-darwin17.* ) + echo i386-apple-darwin17 ;; ++ ++ i386-apple-darwin18.* ) ++ echo i386-apple-darwin18 ;; + *) echo unknown diff --git a/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec b/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec index 53806ea6c..59249c4c3 100644 --- a/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec +++ b/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec @@ -107,6 +107,7 @@ Patch0: libccmio-2.6.1.patch_0 [ ! -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 + [ ! -d config/i386-apple-darwin18 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin18 %endif # Warning: # 1: The name of the ADF library will be renamed to libadf_ccmio since this