Mercurial > mxe-octave

changeset 1201:fca60b5b5afb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rollback previous commit
author Tony Theodore <tonyt@logyst.com>
date Mon, 27 Sep 2010 01:25:24 +1000
parents d516fda09eef
children 0c8281632379
files Makefile doc/index.html src/glib.mk src/openexr.mk
diffstat 4 files changed, 5 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Sep 27 01:12:56 2010 +1000
+++ b/Makefile	Mon Sep 27 01:25:24 2010 +1000
@@ -20,7 +20,6 @@
 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	Mon Sep 27 01:12:56 2010 +1000
+++ b/doc/index.html	Mon Sep 27 01:25:24 2010 +1000
@@ -661,7 +661,8 @@
     <!-- 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</pre>
+                  pkgconfig scons wget xz-devel gcc_select
+sudo gcc_select gcc40</pre>
 
     <h3>MacOS X (≤ 10.5)</h3>
 
@@ -675,8 +676,7 @@
     <!-- 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 gcc_select
-sudo gcc_select gcc42</pre>
+                  pkgconfig scons wget xz-devel</pre>
 
     <h3 id="requirements-opensolaris">Open Solaris 2009.06</h3>
 
--- a/src/glib.mk	Mon Sep 27 01:12:56 2010 +1000
+++ b/src/glib.mk	Mon Sep 27 01:25:24 2010 +1000
@@ -31,8 +31,7 @@
     cd '$(1).native' && $(call UNPACK_PKG_ARCHIVE,libiconv)
     cd '$(1).native/$(libiconv_SUBDIR)' && ./configure \
         --disable-shared \
-        --disable-nls \
-        $(OSX_CC_ENV)
+        --disable-nls
     $(MAKE) -C '$(1).native/$(libiconv_SUBDIR)' -j '$(JOBS)'
 
     # native build for glib-genmarshal, without pkg-config, gettext and zlib
@@ -48,8 +47,7 @@
         --with-libiconv=gnu \
         --with-pcre=internal \
         CPPFLAGS='-I$(1).native/$(libiconv_SUBDIR)/include' \
-        LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs' \
-        $(OSX_CC_ENV)
+        LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs'
     $(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	Mon Sep 27 01:12:56 2010 +1000
+++ b/src/openexr.mk	Mon Sep 27 01:25:24 2010 +1000
@@ -22,8 +22,6 @@
 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' \