From ff8fa8c270b472b8d4a5c8fd208a66cbf4a1ef1d Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Mon, 19 Oct 2015 23:39:12 -0400 Subject: [PATCH] ThirdParty : adjustments for MacOSX 10.11 (El Capitan) --- 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 844afd855..dbbcb47aa 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,11 @@ +@@ -34,6 +34,12 @@ 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 ;; @@ -16,6 +16,7 @@ diff -ruN libccmio-2.6.1_orig/config/config.gnu.to.star libccmio-2.6.1/config/co + i386-apple-darwin12-null) echo i386-apple-darwin12 ;; + i386-apple-darwin13-null) echo i386-apple-darwin13 ;; + i386-apple-darwin14-null) echo i386-apple-darwin14 ;; ++ i386-apple-darwin15-null) echo i386-apple-darwin15 ;; *) echo unknown ;; esac @@ -37,7 +38,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,24 @@ +@@ -87,6 +87,27 @@ i386-apple-darwin8.11.1) echo i386-apple-darwin8 ;; @@ -58,6 +59,9 @@ diff -ruN libccmio-2.6.1_orig/config/config.system libccmio-2.6.1/config/config. + + i386-apple-darwin14.* ) + echo i386-apple-darwin14 ;; ++ ++ i386-apple-darwin15.* ) ++ echo i386-apple-darwin15 ;; + *) echo unknown diff --git a/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec b/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec index efe08a20c..1657ff176 100644 --- a/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec +++ b/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec @@ -104,6 +104,7 @@ Patch0: libccmio-2.6.1.patch_0 [ ! -d config/i386-apple-darwin12 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin12 [ ! -d config/i386-apple-darwin13 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin13 [ ! -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 %endif # Warning: # 1: The name of the ADF library will be renamed to libadf_ccmio since this