From 1b6505c313336e54a8ee4de7faf20eac149acbd8 Mon Sep 17 00:00:00 2001
From: Volker Grabsch <vog@notjusthosting.com>
Date: Tue, 3 Feb 2009 21:48:46 +0100
Subject: portability fixes for MacOS X

---
 src/boost.mk      | 2 +-
 src/fltk.mk       | 2 +-
 src/fontconfig.mk | 3 ++-
 src/proj.mk       | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/boost.mk b/src/boost.mk
index beab28b..475fb3e 100644
--- a/src/boost.mk
+++ b/src/boost.mk
@@ -21,7 +21,7 @@ define $(PKG)_BUILD
     $(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 \
diff --git a/src/fltk.mk b/src/fltk.mk
index 2a6dc68..2ec1a80 100644
--- a/src/fltk.mk
+++ b/src/fltk.mk
@@ -25,5 +25,5 @@ define $(PKG)_BUILD
         --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
diff --git a/src/fontconfig.mk b/src/fontconfig.mk
index 0bec576..03d2bff 100644
--- a/src/fontconfig.mk
+++ b/src/fontconfig.mk
@@ -27,5 +27,6 @@ define $(PKG)_BUILD
         --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
diff --git a/src/proj.mk b/src/proj.mk
index 7d19293..46d37f6 100644
--- a/src/proj.mk
+++ b/src/proj.mk
@@ -21,5 +21,6 @@ define $(PKG)_BUILD
         --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
-- 
cgit v0.12