From 923f4cd6a4a2ae5c46309f11bac51ffd54314212 Mon Sep 17 00:00:00 2001 From: ellson Date: Wed, 12 Jan 2011 04:25:08 +0000 Subject: [PATCH] reinstate ppc64 for leopard only --- macosx/build/Makefile.leopard | 4 ++-- macosx/prebuild/Makefile.leopard | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/macosx/build/Makefile.leopard b/macosx/build/Makefile.leopard index 2e362700e..45532e8d3 100644 --- a/macosx/build/Makefile.leopard +++ b/macosx/build/Makefile.leopard @@ -50,7 +50,7 @@ postinstall: echo "/usr/local/bin/dot -c" >>$@ make -n -C ../../tclpkg install-data-hook >>$@ echo "arch -arch i386 -arch ppc /usr/local/bin/gv-fc-cache" >>$@ - echo 'if test `sysctl -n hw.cpu64bit_capable` = 1; then arch -arch x86_64 /usr/local/bin/gv-fc-cache; fi' >>$@ + echo 'if test `sysctl -n hw.cpu64bit_capable` = 1; then arch -arch x86_64 -arch ppc64 /usr/local/bin/gv-fc-cache; fi' >>$@ $(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile @echo @@ -66,4 +66,4 @@ $(GV_DIR)/Makefile: $(GV_DIR)/configure @echo @echo CONFIGURING GRAPHVIZ... @echo - cd $(GV_DIR) && ./configure --disable-dependency-tracking --with-ipsepcola --with-quartz --with-smyrna CFLAGS="-O2 -arch ppc -arch i386 -arch x86_64 -I$(PREFIX)/include" CXXFLAGS="-O2 -arch ppc -arch i386 -arch x86_64 -I$(PREFIX)/include" OBJCFLAGS="-O2 -arch ppc -arch i386 -arch x86_64 -I$(PREFIX)/include" LDFLAGS="-arch ppc -arch i386 -arch x86_64 -L$(PREFIX)/lib -Wl,-dead_strip" GDLIB_CONFIG="$(PREFIX)/bin/gdlib-config" PKG_CONFIG="$(PREFIX)/bin/pkg-config" PKG_CONFIG_PATH="$(PREFIX)/lib/pkgconfig:/usr/X11/lib/pkgconfig" + cd $(GV_DIR) && ./configure --disable-dependency-tracking --with-ipsepcola --with-quartz --with-smyrna CFLAGS="-O2 -arch ppc -arch i386 -arch ppc64 -arch x86_64 -I$(PREFIX)/include" CXXFLAGS="-O2 -arch ppc -arch i386 -arch ppc64 -arch x86_64 -I$(PREFIX)/include" OBJCFLAGS="-O2 -arch ppc -arch i386 -arch ppc64 -arch x86_64 -I$(PREFIX)/include" LDFLAGS="-arch ppc -arch i386 -arch ppc64 -arch x86_64 -L$(PREFIX)/lib -Wl,-dead_strip" GDLIB_CONFIG="$(PREFIX)/bin/gdlib-config" PKG_CONFIG="$(PREFIX)/bin/pkg-config" PKG_CONFIG_PATH="$(PREFIX)/lib/pkgconfig:/usr/X11/lib/pkgconfig" diff --git a/macosx/prebuild/Makefile.leopard b/macosx/prebuild/Makefile.leopard index be4815d7b..31f071baa 100644 --- a/macosx/prebuild/Makefile.leopard +++ b/macosx/prebuild/Makefile.leopard @@ -6,7 +6,7 @@ TAR=tar PREFIX=$(HOME)/FIX/leopard -ARCHS=-arch ppc -arch i386 -arch x86_64 +ARCHS=-arch ppc -arch i386 -arch ppc64 -arch x86_64 # package URL -- 2.40.0