Permalink
Browse files

Made the package build 32bit, see TODO

  • Loading branch information...
1 parent 1a8714a commit 02831ea55e83ce59735b772b6eaf4afc09b590bd @mamash mamash committed Jul 16, 2012
Showing with 149 additions and 51 deletions.
  1. +2 −1 openjdk7/Makefile
  2. +131 −26 openjdk7/PLIST
  3. +6 −0 openjdk7/TODO
  4. +1 −2 openjdk7/distinfo
  5. +9 −0 openjdk7/patches/patch-bm
  6. +0 −22 openjdk7/patches/patch-jdk_make_sun_splashscreen_Makefile
View
@@ -69,7 +69,8 @@ MAKE_ENV+= SKIP_COMPARE_IMAGES=true
MAKE_ENV+= SKIP_FASTDEBUG_BUILD=yes
MAKE_ENV+= SKIP_DEBUG_BUILD=yes
-MAKE_ENV+= EXTRA_CFLAGS="-DDEFAULT_LIBPATH=\\\"${PREFIX}/lib/jni:${PREFIX}/lib:/lib:/usr/lib\\\" -fpermissive"
+#MAKE_ENV+= EXTRA_CFLAGS="-DDEFAULT_LIBPATH=\\\"${PREFIX}/lib/jni:${PREFIX}/lib:/lib:/usr/lib\\\" -fpermissive"
+MAKE_ENV+= EXTRA_CFLAGS="-DDEFAULT_LIBPATH=\\\"${PREFIX}/lib/jni:${PREFIX}/lib:/lib:/usr/lib\\\""
BUILDDIR= ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/}-${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/}
PLIST_SUBST+= ARCH=${MACHINE_ARCH:S/x86_64/amd64/}
View
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2011/08/21 22:57:54 tnn Exp $
+@comment $NetBSD$
bin/openjdk7-jar
bin/openjdk7-java
bin/openjdk7-javac
@@ -51,9 +51,6 @@ java/openjdk7/bin/serialver
java/openjdk7/bin/servertool
java/openjdk7/bin/tnameserv
java/openjdk7/bin/unpack200
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/Xusage.txt
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjsig.so
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm.so
java/openjdk7/bin/wsgen
java/openjdk7/bin/wsimport
java/openjdk7/bin/xjc
@@ -199,6 +196,10 @@ java/openjdk7/demo/jfc/TableExample/src.zip
java/openjdk7/demo/jfc/TransparentRuler/README.txt
java/openjdk7/demo/jfc/TransparentRuler/TransparentRuler.jar
java/openjdk7/demo/jfc/TransparentRuler/src.zip
+java/openjdk7/demo/jni/Poller/Poller.jar
+java/openjdk7/demo/jni/Poller/README.txt
+java/openjdk7/demo/jni/Poller/lib/libPoller.so
+java/openjdk7/demo/jni/Poller/src.zip
java/openjdk7/demo/jpda/com/sun/tools/example/README
java/openjdk7/demo/jpda/examples.jar
java/openjdk7/demo/jpda/src.zip
@@ -356,6 +357,34 @@ java/openjdk7/jre/bin/rmiregistry
java/openjdk7/jre/bin/servertool
java/openjdk7/jre/bin/tnameserv
java/openjdk7/jre/bin/unpack200
+java/openjdk7/jre/lib/applet/.keep
+java/openjdk7/jre/lib/calendars.properties
+java/openjdk7/jre/lib/charsets.jar
+java/openjdk7/jre/lib/classlist
+java/openjdk7/jre/lib/cmm/CIEXYZ.pf
+java/openjdk7/jre/lib/cmm/GRAY.pf
+java/openjdk7/jre/lib/cmm/LINEAR_RGB.pf
+java/openjdk7/jre/lib/cmm/PYCC.pf
+java/openjdk7/jre/lib/cmm/sRGB.pf
+java/openjdk7/jre/lib/content-types.properties
+java/openjdk7/jre/lib/currency.data
+java/openjdk7/jre/lib/ext/dnsns.jar
+java/openjdk7/jre/lib/ext/localedata.jar
+java/openjdk7/jre/lib/ext/meta-index
+java/openjdk7/jre/lib/ext/sunec.jar
+java/openjdk7/jre/lib/ext/sunjce_provider.jar
+java/openjdk7/jre/lib/ext/sunpkcs11.jar
+java/openjdk7/jre/lib/ext/zipfs.jar
+java/openjdk7/jre/lib/flavormap.properties
+java/openjdk7/jre/lib/fontconfig.bfc
+java/openjdk7/jre/lib/fontconfig.properties.src
+java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_db.so
+java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_dtrace.so
+java/openjdk7/jre/lib/${ARCH}/client/Xusage.txt
+java/openjdk7/jre/lib/${ARCH}/client/libjsig.so
+java/openjdk7/jre/lib/${ARCH}/client/libjvm.so
+java/openjdk7/jre/lib/${ARCH}/client/libjvm_db.so
+java/openjdk7/jre/lib/${ARCH}/client/libjvm_dtrace.so
java/openjdk7/jre/lib/${ARCH}/headless/libmawt.so
java/openjdk7/jre/lib/${ARCH}/jexec
java/openjdk7/jre/lib/${ARCH}/jli/libjli.so
@@ -386,36 +415,20 @@ java/openjdk7/jre/lib/${ARCH}/libnio.so
java/openjdk7/jre/lib/${ARCH}/libnpt.so
java/openjdk7/jre/lib/${ARCH}/librmi.so
java/openjdk7/jre/lib/${ARCH}/libsaproc.so
+java/openjdk7/jre/lib/${ARCH}/libsctp.so
java/openjdk7/jre/lib/${ARCH}/libsplashscreen.so
java/openjdk7/jre/lib/${ARCH}/libsunec.so
java/openjdk7/jre/lib/${ARCH}/libunpack.so
java/openjdk7/jre/lib/${ARCH}/libverify.so
java/openjdk7/jre/lib/${ARCH}/libzip.so
+java/openjdk7/jre/lib/${ARCH}/server/64/libjvm_db.so
+java/openjdk7/jre/lib/${ARCH}/server/64/libjvm_dtrace.so
java/openjdk7/jre/lib/${ARCH}/server/Xusage.txt
java/openjdk7/jre/lib/${ARCH}/server/libjsig.so
java/openjdk7/jre/lib/${ARCH}/server/libjvm.so
+java/openjdk7/jre/lib/${ARCH}/server/libjvm_db.so
+java/openjdk7/jre/lib/${ARCH}/server/libjvm_dtrace.so
java/openjdk7/jre/lib/${ARCH}/xawt/libmawt.so
-java/openjdk7/jre/lib/applet/.keep
-java/openjdk7/jre/lib/calendars.properties
-java/openjdk7/jre/lib/charsets.jar
-java/openjdk7/jre/lib/classlist
-java/openjdk7/jre/lib/cmm/CIEXYZ.pf
-java/openjdk7/jre/lib/cmm/GRAY.pf
-java/openjdk7/jre/lib/cmm/LINEAR_RGB.pf
-java/openjdk7/jre/lib/cmm/PYCC.pf
-java/openjdk7/jre/lib/cmm/sRGB.pf
-java/openjdk7/jre/lib/content-types.properties
-java/openjdk7/jre/lib/currency.data
-java/openjdk7/jre/lib/ext/dnsns.jar
-java/openjdk7/jre/lib/ext/localedata.jar
-java/openjdk7/jre/lib/ext/meta-index
-java/openjdk7/jre/lib/ext/sunec.jar
-java/openjdk7/jre/lib/ext/sunjce_provider.jar
-java/openjdk7/jre/lib/ext/sunpkcs11.jar
-java/openjdk7/jre/lib/ext/zipfs.jar
-java/openjdk7/jre/lib/flavormap.properties
-java/openjdk7/jre/lib/fontconfig.bfc
-java/openjdk7/jre/lib/fontconfig.properties.src
java/openjdk7/jre/lib/images/cursors/cursors.properties
java/openjdk7/jre/lib/images/cursors/invalid32x32.gif
java/openjdk7/jre/lib/images/cursors/motif_CopyDrop32x32.gif
@@ -440,12 +453,14 @@ java/openjdk7/jre/lib/psfontj2d.properties
java/openjdk7/jre/lib/resources.jar
java/openjdk7/jre/lib/rhino.jar
java/openjdk7/jre/lib/rt.jar
+java/openjdk7/jre/lib/sdp/sdp.conf.template
${PLIST.jce}java/openjdk7/jre/lib/security/README.txt
java/openjdk7/jre/lib/security/US_export_policy.jar
java/openjdk7/jre/lib/security/cacerts
java/openjdk7/jre/lib/security/java.policy
java/openjdk7/jre/lib/security/java.security
java/openjdk7/jre/lib/security/local_policy.jar
+java/openjdk7/jre/lib/security/sunpkcs11-solaris.cfg
java/openjdk7/jre/lib/servicetag/jdk_header.png
java/openjdk7/jre/lib/sound.properties
java/openjdk7/jre/lib/zi/Africa/Abidjan
@@ -905,7 +920,80 @@ java/openjdk7/lib/jconsole.jar
java/openjdk7/lib/orb.idl
java/openjdk7/lib/sa-jdi.jar
java/openjdk7/lib/tools.jar
-java/openjdk7/man/ja
+java/openjdk7/man/ja/man1/appletviewer.1
+java/openjdk7/man/ja/man1/extcheck.1
+java/openjdk7/man/ja/man1/idlj.1
+java/openjdk7/man/ja/man1/jar.1
+java/openjdk7/man/ja/man1/jarsigner.1
+java/openjdk7/man/ja/man1/java.1
+java/openjdk7/man/ja/man1/javac.1
+java/openjdk7/man/ja/man1/javadoc.1
+java/openjdk7/man/ja/man1/javah.1
+java/openjdk7/man/ja/man1/javap.1
+java/openjdk7/man/ja/man1/jconsole.1
+java/openjdk7/man/ja/man1/jdb.1
+java/openjdk7/man/ja/man1/jhat.1
+java/openjdk7/man/ja/man1/jinfo.1
+java/openjdk7/man/ja/man1/jmap.1
+java/openjdk7/man/ja/man1/jps.1
+java/openjdk7/man/ja/man1/jrunscript.1
+java/openjdk7/man/ja/man1/jsadebugd.1
+java/openjdk7/man/ja/man1/jstack.1
+java/openjdk7/man/ja/man1/jstat.1
+java/openjdk7/man/ja/man1/jstatd.1
+java/openjdk7/man/ja/man1/keytool.1
+java/openjdk7/man/ja/man1/native2ascii.1
+java/openjdk7/man/ja/man1/orbd.1
+java/openjdk7/man/ja/man1/pack200.1
+java/openjdk7/man/ja/man1/policytool.1
+java/openjdk7/man/ja/man1/rmic.1
+java/openjdk7/man/ja/man1/rmid.1
+java/openjdk7/man/ja/man1/rmiregistry.1
+java/openjdk7/man/ja/man1/schemagen.1
+java/openjdk7/man/ja/man1/serialver.1
+java/openjdk7/man/ja/man1/servertool.1
+java/openjdk7/man/ja/man1/tnameserv.1
+java/openjdk7/man/ja/man1/unpack200.1
+java/openjdk7/man/ja/man1/wsgen.1
+java/openjdk7/man/ja/man1/wsimport.1
+java/openjdk7/man/ja/man1/xjc.1
+java/openjdk7/man/ja_JP.PCK/man1/appletviewer.1
+java/openjdk7/man/ja_JP.PCK/man1/extcheck.1
+java/openjdk7/man/ja_JP.PCK/man1/idlj.1
+java/openjdk7/man/ja_JP.PCK/man1/jar.1
+java/openjdk7/man/ja_JP.PCK/man1/jarsigner.1
+java/openjdk7/man/ja_JP.PCK/man1/java.1
+java/openjdk7/man/ja_JP.PCK/man1/javac.1
+java/openjdk7/man/ja_JP.PCK/man1/javadoc.1
+java/openjdk7/man/ja_JP.PCK/man1/javah.1
+java/openjdk7/man/ja_JP.PCK/man1/javap.1
+java/openjdk7/man/ja_JP.PCK/man1/jconsole.1
+java/openjdk7/man/ja_JP.PCK/man1/jdb.1
+java/openjdk7/man/ja_JP.PCK/man1/jhat.1
+java/openjdk7/man/ja_JP.PCK/man1/jinfo.1
+java/openjdk7/man/ja_JP.PCK/man1/jmap.1
+java/openjdk7/man/ja_JP.PCK/man1/jps.1
+java/openjdk7/man/ja_JP.PCK/man1/jrunscript.1
+java/openjdk7/man/ja_JP.PCK/man1/jsadebugd.1
+java/openjdk7/man/ja_JP.PCK/man1/jstack.1
+java/openjdk7/man/ja_JP.PCK/man1/jstat.1
+java/openjdk7/man/ja_JP.PCK/man1/jstatd.1
+java/openjdk7/man/ja_JP.PCK/man1/keytool.1
+java/openjdk7/man/ja_JP.PCK/man1/native2ascii.1
+java/openjdk7/man/ja_JP.PCK/man1/orbd.1
+java/openjdk7/man/ja_JP.PCK/man1/pack200.1
+java/openjdk7/man/ja_JP.PCK/man1/policytool.1
+java/openjdk7/man/ja_JP.PCK/man1/rmic.1
+java/openjdk7/man/ja_JP.PCK/man1/rmid.1
+java/openjdk7/man/ja_JP.PCK/man1/rmiregistry.1
+java/openjdk7/man/ja_JP.PCK/man1/schemagen.1
+java/openjdk7/man/ja_JP.PCK/man1/serialver.1
+java/openjdk7/man/ja_JP.PCK/man1/servertool.1
+java/openjdk7/man/ja_JP.PCK/man1/tnameserv.1
+java/openjdk7/man/ja_JP.PCK/man1/unpack200.1
+java/openjdk7/man/ja_JP.PCK/man1/wsgen.1
+java/openjdk7/man/ja_JP.PCK/man1/wsimport.1
+java/openjdk7/man/ja_JP.PCK/man1/xjc.1
java/openjdk7/man/ja_JP.UTF-8/man1/appletviewer.1
java/openjdk7/man/ja_JP.UTF-8/man1/extcheck.1
java/openjdk7/man/ja_JP.UTF-8/man1/idlj.1
@@ -981,6 +1069,23 @@ java/openjdk7/man/man1/wsgen.1
java/openjdk7/man/man1/wsimport.1
java/openjdk7/man/man1/xjc.1
java/openjdk7/release
+java/openjdk7/sample/dtrace/README.txt
+java/openjdk7/sample/dtrace/helpers/dtrace_helper.d
+java/openjdk7/sample/dtrace/hotspot/README.txt
+java/openjdk7/sample/dtrace/hotspot/class_loading_stat.d
+java/openjdk7/sample/dtrace/hotspot/gc_time_stat.d
+java/openjdk7/sample/dtrace/hotspot/hotspot_calls_tree.d
+java/openjdk7/sample/dtrace/hotspot/method_compile_stat.d
+java/openjdk7/sample/dtrace/hotspot/method_invocation_stat.d
+java/openjdk7/sample/dtrace/hotspot/method_invocation_stat_filter.d
+java/openjdk7/sample/dtrace/hotspot/method_invocation_tree.d
+java/openjdk7/sample/dtrace/hotspot/monitors.d
+java/openjdk7/sample/dtrace/hotspot/object_allocation_stat.d
+java/openjdk7/sample/dtrace/hotspot_jni/CriticalSection.d
+java/openjdk7/sample/dtrace/hotspot_jni/CriticalSection_slow.d
+java/openjdk7/sample/dtrace/hotspot_jni/README.txt
+java/openjdk7/sample/dtrace/hotspot_jni/hotspot_jni_calls_stat.d
+java/openjdk7/sample/dtrace/hotspot_jni/hotspot_jni_calls_tree.d
java/openjdk7/sample/forkjoin/mergesort/MergeDemo.java
java/openjdk7/sample/forkjoin/mergesort/MergeSort.java
java/openjdk7/sample/jmx/jmx-scandir/build.properties
View
@@ -0,0 +1,6 @@
+The package now builds and installs 32bit. The conditions are:
+
+* Only builds with Studio (used 12.3)
+* Needs hotspot/make/solaris/makefiles/sparcWorks.make patched
+ to remove the line that specifies the "-Qoption ..." arg passed
+ (no idea why that doesn't work any more, yet).
View
@@ -61,7 +61,7 @@ SHA1 (patch-bi) = c733f906c23a37aeb5ca93f136205563cc5fab64
SHA1 (patch-bj) = 4198e1aa8e3c65434fbb947a00eed49e73106291
SHA1 (patch-bk) = 66bccfdf42fcc6f6995f3f18fc2515d55cab46c6
SHA1 (patch-bl) = a3b3bd6007c83664538baf401447fd0df9f4143b
-SHA1 (patch-bm) = 40c83ad219f529c3ca130547560681ab57b44bf8
+SHA1 (patch-bm) = a7150d57264b7a50221bb7e31a29e3d3997fde94
SHA1 (patch-bn) = 5b34da35e39e08c935c805b5ef7b2c8cc8d285da
SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = 51692e0a999218217fcd4d76d38cf81fc260ee71
SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = 87762db5680508ba3bd4b564e8528b20292f4a9d
@@ -70,4 +70,3 @@ SHA1 (patch-hotspot_make_solaris_makefiles_sparcWorks.make) = 52e10df6c11b2888fa
SHA1 (patch-hotspot_src__os_cpu__solaris_x86__vm__atomic_solaris_x86.inline.hpp) = f6e3ee242803798a75834e54a67b1a7837010c07
SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = 561088ecf32dfee4418506a847f20d6f61a9a953
SHA1 (patch-jdk_make_sun_awt_Makefile) = d25b475654027409b38236f820b93f5b4f25a0b8
-SHA1 (patch-jdk_make_sun_splashscreen_Makefile) = 98b7444db3ae4503f8d9d6754001c96f9f28ebb6
@@ -11,3 +11,12 @@ $NetBSD: patch-bm,v 1.1 2009/10/18 10:21:01 tnn Exp $
CPPFLAGS += -I$(PACKAGE_PATH)/include
OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
else
+@@ -79,7 +79,7 @@ ifneq ($(PLATFORM), windows)
+ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -pthread
+ else
+ CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
+- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
++ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext -liconv $(LIBM) -lpthread
+ endif
+ else # PLATFORM
+ CFLAGS += -DWITH_WIN32
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- jdk/make/sun/splashscreen/Makefile.orig 2012-05-22 07:32:41.776599265 +0000
-+++ jdk/make/sun/splashscreen/Makefile
-@@ -67,7 +67,7 @@ ifneq ($(PLATFORM), windows)
- ifeq ($(OS_VENDOR), Apple)
- OTHER_LDLIBS += -liconv
- else
-- ifneq ($(OS_NAME), netbsd)
-+ ifeq ($(OS_NAME), freebsd)
- CPPFLAGS += -I$(PACKAGE_PATH)/include
- OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
- else
-@@ -79,7 +79,7 @@ ifneq ($(PLATFORM), windows)
- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -pthread
- else
- CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
-- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
-+ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext -liconv $(LIBM) -lpthread
- endif
- else # PLATFORM
- CFLAGS += -DWITH_WIN32

0 comments on commit 02831ea

Please sign in to comment.