From 714a12ab02e5c7d93ad1fa29ab14ead2b0e05a4c Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Mon, 27 Sep 2010 01:12:56 +1000
Subject: use the more recent gcc42 on OSX

---
 Makefile       | 1 +
 doc/index.html | 6 +++---
 src/glib.mk    | 6 ++++--
 src/openexr.mk | 2 ++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index a7f6a68..58ba0f4 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ PATCH      := $(shell gpatch --help >/dev/null 2>&1 && echo g)patch
 INSTALL    := $(shell ginstall --help >/dev/null 2>&1 && echo g)install
 LIBTOOLIZE := $(shell glibtoolize --help >/dev/null 2>&1 && echo g)libtoolize
 VERSION    := $(shell $(SED) -n 's,^.*<span id="latest-version">\([^<]*\)</span>.*$$,\1,p' '$(TOP_DIR)/doc/index.html')
+OSX_CC_ENV := $(shell [ $$(uname -s) == "Darwin" ] && echo CC="'gcc -arch `uname -m`'")
 
 # unexport any environment variables that might cause trouble
 unexport AR CC CFLAGS CPP CPPFLAGS CROSS CXX CXXCPP CXXFLAGS EXEEXT
diff --git a/doc/index.html b/doc/index.html
index 84c9a75..92b4825 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -661,8 +661,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
     <!-- http://www.macports.org/ports.php -->
     <pre>sudo port install autoconf automake bison cmake flex \
                   gsed libtool openssl p5-xml-parser \
-                  pkgconfig scons wget xz-devel gcc_select
-sudo gcc_select gcc40</pre>
+                  pkgconfig scons wget xz-devel</pre>
 
     <h3>MacOS X (≤ 10.5)</h3>
 
@@ -676,7 +675,8 @@ sudo gcc_select gcc40</pre>
     <!-- http://www.macports.org/ports.php -->
     <pre>sudo port install autoconf automake bison cmake flex \
                   gmake gsed libtool openssl p5-xml-parser \
-                  pkgconfig scons wget xz-devel</pre>
+                  pkgconfig scons wget xz-devel gcc_select
+sudo gcc_select gcc42</pre>
 
     <h3 id="requirements-opensolaris">Open Solaris 2009.06</h3>
 
diff --git a/src/glib.mk b/src/glib.mk
index be527f4..ddb9d52 100644
--- a/src/glib.mk
+++ b/src/glib.mk
@@ -31,7 +31,8 @@ define $(PKG)_BUILD
     cd '$(1).native' && $(call UNPACK_PKG_ARCHIVE,libiconv)
     cd '$(1).native/$(libiconv_SUBDIR)' && ./configure \
         --disable-shared \
-        --disable-nls
+        --disable-nls \
+        $(OSX_CC_ENV)
     $(MAKE) -C '$(1).native/$(libiconv_SUBDIR)' -j '$(JOBS)'
 
     # native build for glib-genmarshal, without pkg-config, gettext and zlib
@@ -47,7 +48,8 @@ define $(PKG)_BUILD
         --with-libiconv=gnu \
         --with-pcre=internal \
         CPPFLAGS='-I$(1).native/$(libiconv_SUBDIR)/include' \
-        LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs'
+        LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs' \
+        $(OSX_CC_ENV)
     $(SED) -i 's,#define G_ATOMIC.*,,' '$(1).native/config.h'
     $(MAKE) -C '$(1).native/glib'    -j '$(JOBS)'
     $(MAKE) -C '$(1).native/gthread' -j '$(JOBS)'
diff --git a/src/openexr.mk b/src/openexr.mk
index dd3362a..d22b2a9 100644
--- a/src/openexr.mk
+++ b/src/openexr.mk
@@ -22,6 +22,8 @@ endef
 define $(PKG)_BUILD
     # unpack and build a native version of ilmbase
     cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,ilmbase)
+    $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/ilmbase-*.patch)),
+        (cd '$(1)/$(ilmbase_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH))
     cd '$(1)/$(ilmbase_SUBDIR)' && $(SHELL) ./configure \
         --disable-shared \
         --prefix='$(1)/ilmbase' \
-- 
cgit v0.12