--- a/components/ghostscript/Makefile Thu Jan 31 04:53:59 2013 -0800
+++ b/components/ghostscript/Makefile Mon Feb 04 04:08:27 2013 -0800
@@ -19,7 +19,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
# parfait seems to spin when looking at the .bc files, so
@@ -56,14 +56,20 @@
CONFIGURE_OPTIONS += --disable-freetype
CONFIGURE_OPTIONS += --with-fontpath=/usr/share/ghostscript/$(COMPONENT_VERSION)/Resource:/usr/share/ghostscript/$(COMPONENT_VERSION)/Resource/Font:/usr/share/ghostscript/fonts:/usr/openwin/lib/X11/fonts/Type1:/usr/openwin/lib/X11/fonts/TrueType:/usr/openwin/lib/X11/fonts/Type3:/usr/X11/lib/X11/fonts/Type1:/usr/X11/lib/fonts/TrueType:/usr/X11/lib/X11/fonts/Type3:/usr/X11/lib/X11/fonts/Resource:/usr/X11/lib/X11/Resource/Font
+# configure options to generate 64 bit binaries
+$(BUILD_DIR)/$(MACH64)/.configured: CONFIGURE_OPTIONS += CC="$(CC) -m64"
+$(BUILD_DIR)/$(MACH64)/ijs/.configured: CONFIGURE_OPTIONS += CC="$(CC) -m64"
+
# config env
CONFIGURE_ENV += LDFLAGS_SO="-G"
CONFIGURE_ENV += CUPSCONFIG=/usr/bin/cups-config
GS_VARIANT = $(BUILD_DIR)/$(MACH32)
+GS_VARIANT_64 = $(BUILD_DIR)/$(MACH64)
IJS_VARIANT = $(BUILD_DIR)/$(MACH32)/ijs
+IJS_VARIANT_64 = $(BUILD_DIR)/$(MACH64)/ijs
-VARIANTS = $(GS_VARIANT) $(IJS_VARIANT)
+VARIANTS = $(GS_VARIANT) $(IJS_VARIANT) $(GS_VARIANT_64) $(IJS_VARIANT_64)
# autoconf - Generate configuration scripts
COMPONENT_PREP_ACTION = \
@@ -76,10 +82,21 @@
install-exec install-so install-scripts install-data \
install-contrib-extras
+$(GS_VARIANT_64)/.configured: COMPONENT_PRE_CONFIGURE_ACTION = \
+ ($(CLONEY) $(SOURCE_DIR) $(@D))
+
+$(GS_VARIANT_64)/.installed: COMPONENT_INSTALL_TARGETS += \
+ install-exec install-so install-scripts install-data \
+ install-contrib-extras
+
$(IJS_VARIANT)/.configured: COMPONENT_PRE_CONFIGURE_ACTION = \
($(CLONEY) $(SOURCE_DIR)/ijs $(@D); \
cd $(@D) ; $(ENV) $(CONFIGURE_ENV) ./autogen.sh )
+$(IJS_VARIANT_64)/.configured: COMPONENT_PRE_CONFIGURE_ACTION = \
+ ($(CLONEY) $(SOURCE_DIR)/ijs $(@D); \
+ cd $(@D) ; $(ENV) $(CONFIGURE_ENV) ./autogen.sh )
+
CONFIGURE_SCRIPT = ./configure
# build gs and ijs
--- a/components/ghostscript/ghostscript.p5m Thu Jan 31 04:53:59 2013 -0800
+++ b/components/ghostscript/ghostscript.p5m Mon Feb 04 04:08:27 2013 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -37,13 +37,16 @@
dir path=etc/cups group=lp
dir path=usr
dir path=usr/bin
+dir path=usr/bin/$(MACH64)
dir path=usr/include
dir path=usr/include/ghostscript
dir path=usr/include/ijs
dir path=usr/lib
dir path=usr/lib/cups
dir path=usr/lib/cups/filter
+dir path=usr/lib/cups/filter/$(MACH64)
dir path=usr/lib/pkgconfig
+dir path=usr/lib/$(MACH64)
dir path=usr/sfw
dir path=usr/sfw/bin
dir path=usr/share
@@ -75,14 +78,17 @@
file path=usr/bin/fixmswrd.pl
file path=usr/bin/font2c
file path=usr/bin/gs
+file path=usr/bin/$(MACH64)/gs
file path=usr/bin/gsbj
file path=usr/bin/gsc
+file path=usr/bin/$(MACH64)/gsc
file path=usr/bin/gsdj
file path=usr/bin/gsdj500
file path=usr/bin/gslj
file path=usr/bin/gslp
file path=usr/bin/gsnd
file path=usr/bin/gsx
+file path=usr/bin/$(MACH64)/gsx
file path=usr/bin/ijs-config
file path=usr/bin/lprsetup.sh
file path=usr/bin/pdf2dsc
@@ -110,10 +116,13 @@
file path=usr/include/ijs/ijs_client.h
file path=usr/include/ijs/ijs_server.h
file path=usr/lib/cups/filter/pdftoraster mode=0555
+file build/$(MACH64)/bin/pdftoraster path=usr/lib/cups/filter/$(MACH64)/pdftoraster mode=0555
file path=usr/lib/cups/filter/pstopxl mode=0555
file path=usr/lib/cups/filter/pstoraster mode=0555
file path=usr/lib/libgs.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/libgs.so.$(COMPONENT_VERSION)
file path=usr/lib/libijs.a
+file build/$(MACH64)/ijs/.libs/libijs.a path=usr/lib/$(MACH64)/libijs.a
file path=usr/lib/pkgconfig/ijs.pc
file path=usr/share/cups/model/pxlcolor.ppd
file path=usr/share/cups/model/pxlmono.ppd
@@ -939,6 +948,9 @@
link path=usr/lib/libgs.so target=libgs.so.$(COMPONENT_VERSION)
link path=usr/lib/libgs.so.9 target=libgs.so.$(COMPONENT_VERSION)
link path=usr/lib/libgs.so.8 target=libgs.so.9
+link path=usr/lib/$(MACH64)/libgs.so target=libgs.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/libgs.so.9 target=libgs.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/libgs.so.8 target=libgs.so.9
link path=usr/sfw/bin/bdftops target=../../bin/bdftops
link path=usr/sfw/bin/dumphint target=../../bin/dumphint
link path=usr/sfw/bin/dvipdf target=../../bin/dvipdf