Mercurial > mxe-octave

changeset 220:32eef23cb982

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
portability fixes for MacOS X
author Volker Grabsch <vog@notjusthosting.com>
date Tue, 03 Feb 2009 21:48:46 +0100
parents dc72b46ffb67
children b588e9bb1dcc
files src/boost.mk src/fltk.mk src/fontconfig.mk src/proj.mk
diffstat 4 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/boost.mk	Tue Feb 03 02:45:05 2009 +0100
+++ b/src/boost.mk	Tue Feb 03 21:48:46 2009 +0100
@@ -21,7 +21,7 @@
     $(SED) 's,<target-os>windows : lib ;,<target-os>windows : a ;,' -i '$(1)/tools/build/v2/tools/types/lib.jam'
     # compile boost jam
     cd '$(1)/tools/jam/src' && ./build.sh
-    cd '$(1)' && tools/jam/src/bin.linuxx86/bjam \
+    cd '$(1)' && tools/jam/src/bin.*/bjam \
         -j '$(JOBS)' \
         --user-config=user-config.jam \
         target-os=windows \
--- a/src/fltk.mk	Tue Feb 03 02:45:05 2009 +0100
+++ b/src/fltk.mk	Tue Feb 03 21:48:46 2009 +0100
@@ -25,5 +25,5 @@
         --enable-threads \
         LIBS='-lws2_32'
     $(SED) 's,-fno-exceptions,,' -i '$(1)/makeinclude'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install DIRS=src
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install DIRS=src LIBCOMMAND='$(TARGET)-ar cr'
 endef
--- a/src/fontconfig.mk	Tue Feb 03 02:45:05 2009 +0100
+++ b/src/fontconfig.mk	Tue Feb 03 21:48:46 2009 +0100
@@ -27,5 +27,6 @@
         --with-arch='$(TARGET)' \
         --with-freetype-config='$(PREFIX)/$(TARGET)/bin/freetype-config' \
         --with-expat='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/proj.mk	Tue Feb 03 02:45:05 2009 +0100
+++ b/src/proj.mk	Tue Feb 03 21:48:46 2009 +0100
@@ -21,5 +21,6 @@
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef