From 00509f57d00cf565bacacef139559e912d5de521 Mon Sep 17 00:00:00 2001 From: ellson Date: Mon, 10 Nov 2008 23:18:03 +0000 Subject: [PATCH] work in progress --- macosx/prebuild/Makefile.tiger | 87 ++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/macosx/prebuild/Makefile.tiger b/macosx/prebuild/Makefile.tiger index 97f9a2000..0208dc752 100644 --- a/macosx/prebuild/Makefile.tiger +++ b/macosx/prebuild/Makefile.tiger @@ -4,29 +4,32 @@ CURL=curl MAKE=make TAR=tar -# local - -LOCAL=$(CURDIR)/usr/local -LOCAL_INCLUDE=$(LOCAL)/include -LOCAL_LIB=$(LOCAL)/lib -LOCAL_BIN=$(LOCAL)/bin +PREFIX=$(HOME)/FIX/tiger +PREFIX_INCLUDE=$(PREFIX)/include +PREFIX_LIB=$(PREFIX)/lib +PREFIX_BIN=$(PREFIX)/bin # package URL PKGCONFIG_URL=http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz -LIBPNG_URL=ftp://ftp.simplesystems.org/pub/png/src/libpng-1.2.29.tar.gz +#LIBPNG_URL=ftp://ftp.simplesystems.org/pub/png/src/libpng-1.2.29.tar.gz +LIBPNG_URL=http://prdownloads.sourceforge.net/libpng/libpng-1.2.31.tar.gz GD_URL=http://www.libgd.org/releases/gd-2.0.35.tar.gz -PIXMAN_URL=http://cairographics.org/releases/pixman-0.10.0.tar.gz -CAIRO_URL=http://cairographics.org/releases/cairo-1.6.4.tar.gz +#PIXMAN_URL=http://cairographics.org/releases/pixman-0.10.0.tar.gz +#CAIRO_URL=http://cairographics.org/releases/cairo-1.6.4.tar.gz +PIXMAN_URL=http://cairographics.org/releases/pixman-0.12.0.tar.gz +CAIRO_URL=http://cairographics.org/releases/cairo-1.8.0.tar.gz LIBICONV_URL=http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.12.tar.gz GETTEXT_URL=ftp://mirrors.kernel.org/gnu/gettext/gettext-0.17.tar.gz -GLIB_URL=http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-2.16.3.tar.gz -PANGO_URL=http://ftp.gnome.org/pub/GNOME/sources/pango/1.20/pango-1.20.2.tar.gz +GLIB_URL=http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-2.18.2.tar.gz +#PANGO_URL=http://ftp.gnome.org/pub/GNOME/sources/pango/1.20/pango-1.20.2.tar.gz +PANGO_URL=http://ftp.gnome.org/pub/GNOME/sources/pango/1.22/pango-1.22.1.tar.gz # libraries PKGCONFIG=pkg-config LIBPNG=libpng.la +LIBICONV=libiconv.la GD=libgd.la PIXMAN=libpixman-1.la CAIRO=libcairo.la @@ -49,7 +52,7 @@ PANGO_DIR=$(call dirname, $(PANGO_URL)) # # target # -# --prefix to dump results into usr/local not /usr/local +# --prefix to dump results into $PREFIX not /usr/local # --disable-dependency-tracking since this is one-off build # --enable-static=yes since this builds static libraries # --enable-shared=no since this doesn't build dynamic libraries @@ -57,10 +60,10 @@ PANGO_DIR=$(call dirname, $(PANGO_URL)) # -arch to build 32-bit/64-bit Universal Binaries # pkgconfig to look for X11 libraries too -BASE_CONFIG=--prefix=$(LOCAL) --disable-dependency-tracking --enable-static=yes --enable-shared=no PKG_CONFIG="$(LOCAL_BIN)/pkg-config" PKG_CONFIG_PATH="/usr/X11/lib/pkgconfig:/usr/X11R6/lib/pkgconfig" +BASE_CONFIG=--prefix=$(PREFIX) --disable-dependency-tracking --enable-static=yes --enable-shared=no PKG_CONFIG="$(PREFIX_BIN)/pkg-config" PKG_CONFIG_PATH="$(PREFIX)/lib/pkgconfig:/usr/X11/lib/pkgconfig:/usr/X11R6/lib/pkgconfig" FLAG_CONFIG=CFLAGS="-O2 -arch ppc -arch i386 -arch ppc64" LDFLAGS="-arch ppc -arch i386 -arch ppc64" -install: $(LOCAL_LIB)/$(PANGO) $(LOCAL_LIB)/$(GD) +install: $(PREFIX_LIB)/$(PANGO) $(PREFIX_LIB)/$(GD) uninstall: $(MAKE) -C $(PANGO_DIR) uninstall @@ -101,7 +104,7 @@ distclean: # --with-included-modules=yes to embed pango modules within pango itself # link also to CoreFoundation and CoreServices because of gettext dependency -$(LOCAL_LIB)/$(PANGO): $(PANGO_DIR)/pango/$(PANGO) +$(PREFIX_LIB)/$(PANGO): $(PANGO_DIR)/pango/$(PANGO) @echo @echo INSTALLING PANGO... @echo @@ -112,9 +115,9 @@ $(PANGO_DIR)/pango/$(PANGO): $(PANGO_DIR)/Makefile @echo MAKING PANGO... @echo if [[ -e $@ ]]; then $(MAKE) -C $(PANGO_DIR) clean; fi && \ - PATH=$(PATH):$(LOCAL_BIN) $(MAKE) -C $(PANGO_DIR) + PATH=$(PATH):$(PREFIX_BIN) $(MAKE) -C $(PANGO_DIR) -$(PANGO_DIR)/Makefile: $(LOCAL_LIB)/$(CAIRO) $(LOCAL_LIB)/$(GLIB) | $(LOCAL_BIN)/$(PKGCONFIG) $(PANGO_DIR)/configure +$(PANGO_DIR)/Makefile: $(PREFIX_LIB)/$(CAIRO) $(PREFIX_LIB)/$(GLIB) | $(PREFIX_BIN)/$(PKGCONFIG) $(PANGO_DIR)/configure @echo @echo CONFIGURING PANGO... @echo @@ -140,7 +143,7 @@ $(PANGO_DIR).tar.gz: # run configure once for each architecture, capturing config.h and glibconfig.h # run configure again for Universal Binary, recomposing config.h and glibconfig.h from captured versions -$(LOCAL_LIB)/$(GLIB): $(GLIB_DIR)/glib/$(GLIB) +$(PREFIX_LIB)/$(GLIB): $(GLIB_DIR)/glib/$(GLIB) @echo @echo INSTALLING GLIB... @echo @@ -153,7 +156,7 @@ $(GLIB_DIR)/glib/$(GLIB): $(GLIB_DIR)/Makefile if [[ -e $@ ]]; then $(MAKE) -C $(GLIB_DIR) clean; fi && \ $(MAKE) -C $(GLIB_DIR) -$(GLIB_DIR)/Makefile: $(LOCAL_LIB)/$(INTL) | $(LOCAL_BIN)/$(PKGCONFIG) $(GLIB_DIR)/configure +$(GLIB_DIR)/Makefile: $(PREFIX_LIB)/$(INTL) | $(PREFIX_BIN)/$(PKGCONFIG) $(GLIB_DIR)/configure @echo @echo CONFIGURING GLIB... @echo @@ -168,29 +171,29 @@ $(GLIB_DIR)/Makefile: $(LOCAL_LIB)/$(INTL) | $(LOCAL_BIN)/$(PKGCONFIG) $(GLIB_DI echo "ac_cv_func_posix_getgrgid_r=yes" >>darwin.cache && \ echo "ac_cv_func_vsnprintf_c99=yes" >>darwin.cache && \ echo "ac_cv_func_printf_unix98=yes" >>darwin.cache && \ - PATH=$(LOCAL_BIN):gobject:$$PATH && \ + PATH=$(PREFIX_BIN):gobject:$$PATH && \ echo --- GLIB-GENMARSHAL PASS --- && \ - ./configure $(BASE_CONFIG) CFLAGS="-I$(LOCAL_INCLUDE)" LDFLAGS="-L$(LOCAL_LIB)" && \ + ./configure $(BASE_CONFIG) --with-libiconv=gnu CFLAGS="-I$(PREFIX_INCLUDE)" LDFLAGS="-L$(PREFIX_LIB)" && \ $(MAKE) -C glib && \ $(MAKE) -C gobject glib-genmarshal && \ cp darwin.cache darwinian.cache && \ echo --- PPC PASS --- && \ - ./configure --cache-file=darwinian.cache --build=$$BUILD --host=powerpc-apple-darwin$$OSREL $(BASE_CONFIG) CFLAGS="-O2 -arch ppc -I$(LOCAL_INCLUDE)" LDFLAGS="-arch ppc -L$(LOCAL_LIB)" && \ + ./configure --cache-file=darwinian.cache --build=$$BUILD --host=powerpc-apple-darwin$$OSREL $(BASE_CONFIG) --with-libiconv=gnu CFLAGS="-O2 -arch ppc -I$(PREFIX_INCLUDE)" LDFLAGS="-arch ppc -L$(PREFIX_LIB)" && \ cp config.h config.ppc.h && \ cp glibconfig.h glibconfig.ppc.h && \ cp darwin.cache darwinian.cache && \ echo --- I386 PASS --- && \ - ./configure --cache-file=darwinian.cache --build=$$BUILD --host=i686-apple-darwin$$OSREL $(BASE_CONFIG) CFLAGS="-O2 -arch i386 -I$(LOCAL_INCLUDE)" LDFLAGS="-arch i386 -L$(LOCAL_LIB)" && \ + ./configure --cache-file=darwinian.cache --build=$$BUILD --host=i686-apple-darwin$$OSREL $(BASE_CONFIG) --with-libiconv=gnu CFLAGS="-O2 -arch i386 -I$(PREFIX_INCLUDE)" LDFLAGS="-arch i386 -L$(PREFIX_LIB)" && \ cp config.h config.i386.h && \ cp glibconfig.h glibconfig.i386.h && \ cp darwin.cache darwinian.cache && \ echo --- PPC64 PASS --- && \ - ./configure --cache-file=darwinian.cache --build=$$BUILD --host=powerpc-apple-darwin$$OSREL $(BASE_CONFIG) CFLAGS="-O2 -arch ppc64 -I$(LOCAL_INCLUDE)" LDFLAGS="-arch ppc64 -L$(LOCAL_LIB)" && \ + ./configure --cache-file=darwinian.cache --build=$$BUILD --host=powerpc-apple-darwin$$OSREL $(BASE_CONFIG) --with-libiconv=gnu CFLAGS="-O2 -arch ppc64 -I$(PREFIX_INCLUDE)" LDFLAGS="-arch ppc64 -L$(PREFIX_LIB)" && \ cp config.h config.ppc64.h && \ cp glibconfig.h glibconfig.ppc64.h && \ cp darwin.cache darwinian.cache && \ echo --- UNIVERSAL BINARY PASS --- && \ - ./configure $(BASE_CONFIG) CFLAGS="-O2 -arch ppc -arch i386 -arch ppc64 -I$(LOCAL_INCLUDE)" LDFLAGS="-arch ppc -arch i386 -arch ppc64 -L$(LOCAL_LIB)" && \ + ./configure $(BASE_CONFIG) --with-libiconv=gnu CFLAGS="-O2 -arch ppc -arch i386 -arch ppc64 -I$(PREFIX_INCLUDE)" LDFLAGS="-arch ppc -arch i386 -arch ppc64 -L$(PREFIX_LIB)" && \ rm config.h && \ echo "#if defined(__ppc__)" >>config.h && \ cat config.ppc.h >>config.h && \ @@ -214,7 +217,7 @@ $(GLIB_DIR)/configure: | $(GLIB_DIR).tar.gz @echo @echo CONFIGURING GLIB... @echo - $(TAR) xzf $| && patch -p0