reinstate ppc64 for leopard only

diff --git a/macosx/build/Makefile.leopard b/macosx/build/Makefile.leopard
index 2e362700e70fd4fd48edd8bf5525ddce6bc46aae..45532e8d3a4fb5d939fa4722431f049affdfb2d1 100644 (file)
--- 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 be4815d7b89e1dc5c82e667cb9b0a32bf1f18370..31f071baa0e7d92f21705f6bd7e02ae1b2dab962 100644 (file)
--- 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