Mercurial > mxe-octave
changeset 1200:d516fda09eef
use the more recent gcc42 on OSX
author | Tony Theodore <tonyt@logyst.com> |
---|---|
date | Mon, 27 Sep 2010 01:12:56 +1000 |
parents | 762fcdbfa1c6 |
children | fca60b5b5afb |
files | Makefile doc/index.html src/glib.mk src/openexr.mk |
diffstat | 4 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Sep 26 16:51:42 2010 +0200 +++ b/Makefile Mon Sep 27 01:12:56 2010 +1000 @@ -20,6 +20,7 @@ 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
--- a/doc/index.html Sun Sep 26 16:51:42 2010 +0200 +++ b/doc/index.html Mon Sep 27 01:12:56 2010 +1000 @@ -661,8 +661,7 @@ <!-- 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 @@ <!-- 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>
--- a/src/glib.mk Sun Sep 26 16:51:42 2010 +0200 +++ b/src/glib.mk Mon Sep 27 01:12:56 2010 +1000 @@ -31,7 +31,8 @@ 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 @@ --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)'
--- a/src/openexr.mk Sun Sep 26 16:51:42 2010 +0200 +++ b/src/openexr.mk Mon Sep 27 01:12:56 2010 +1000 @@ -22,6 +22,8 @@ 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' \