Commit d4748057 authored by Rafaël Carré's avatar Rafaël Carré

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

This reverts commit 2e024847.

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
parent ca5e15a9
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment