Revert "contrib: Build fat binary using binary contrib on Mac OS X."

This reverts commit 2e024847e1bbfad3ddf4aa9fcb01c90c0e41c854.

Conflicts:

	extras/contrib/Makefile

We can't use a fat set of contribs, because the headers do differ
between 32bits & 64 bits builds

example:

../x86_64-apple-darwin10/include/freetype2/freetype/config/ftconfig.h
2010-01-04 12:49:02.000000000 +0100
+++ ../i686-apple-darwin10/include/freetype2/freetype/config/ftconfig.h
2010-01-04 12:47:12.000000000 +0100
@@ -80,7 +80,7 @@
 #ifdef FT_USE_AUTOCONF_SIZEOF_TYPES

   #define SIZEOF_INT 4
   -#define SIZEOF_LONG 8
   +#define SIZEOF_LONG 4

Moreover the pkgconfig & *-config files still referenced the x86_64
directory

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index 0b2402849da1f393e50e552c2a9237cc88b61a7a..7ccc993d9b8b85d50b93f00a18db07a6ba73ac12 100644 (file)
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -29,7 +29,7 @@ include ./config.mak
 BUILDDIRS = hosts build
 
 ifdef HAVE_DARWIN_OS
-TARGETALL=fat-bin
+TARGETALL=using-bin
 else
 TARGETALL=using-src
 endif
@@ -70,29 +70,10 @@ ifdef HAVE_DARWIN_10
        (cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig)
        (cd src && $(MAKE) .iconv)
 endif
-       touch $@
+       touch hosts/$(HOST)/.$(CONTRIBREV)
 
 using-bin: hosts/$(HOST)/.$(CONTRIBREV) 
 
-hosts/fat/.$(CONTRIBREV)-from-archs:
-       @if test -d tmp; then \
-               echo "Move away ./tmp, it's in the way" ; \
-               exit 1 ; \
-       fi
-       # FIXME - Doing this without rerunning bootstrap & make would be nicer
-       ./bootstrap i686-apple-darwin10 && make using-bin && \
-       ./bootstrap x86_64-apple-darwin10 && make using-bin && \
-       mkdir tmp;
-       cp -R hosts/x86_64-apple-darwin10/ tmp;
-       (cd tmp/lib && find . -name "*.dylib" -or -name "*.a") | while read lib; do rm tmp/lib/$$lib; \
-          lipo -create hosts/x86_64-apple-darwin10/lib/$$lib hosts/i686-apple-darwin10/lib/$$lib -output tmp/lib/$$lib; \
-       done;
-       rm -Rf hosts/fat && \
-       mv tmp hosts/fat && \
-       touch $@
-        
-fat-bin: hosts/fat/.$(CONTRIBREV)-from-archs
-
 endif
 
 clean-src: