From 9f46ff34435facffd4216e5bb64c46f2bbf7d7bb Mon Sep 17 00:00:00 2001 From: jperkin Date: Sun, 23 Jun 2013 17:39:43 +0000 Subject: Add SunOS 64-bit support. This patch disables the default multiarch build, creating a useable 64-bit-only package, but still leaves it possible to re-enable it if necessary by removing the 'NOMULTIARCH' sections. --- lang/openjdk7/PLIST.SunOS | 152 ++++++++++----------- lang/openjdk7/distinfo | 16 ++- lang/openjdk7/patches/patch-Makefile | 15 ++ lang/openjdk7/patches/patch-ah | 15 +- lang/openjdk7/patches/patch-ao | 24 +++- .../patch-corba_make_common_shared_Platform.gmk | 15 +- .../patch-hotspot_make_solaris_makefiles_gcc.make | 22 ++- .../patches/patch-jdk_make_com_sun_jmx_Makefile | 15 ++ .../patches/patch-jdk_make_common_Program.gmk | 20 ++- lang/openjdk7/patches/patch-jdk_make_java_Makefile | 15 ++ .../patches/patch-jdk_make_sun_rmi_rmi_Makefile | 15 ++ 11 files changed, 226 insertions(+), 98 deletions(-) create mode 100644 lang/openjdk7/patches/patch-Makefile create mode 100644 lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile create mode 100644 lang/openjdk7/patches/patch-jdk_make_java_Makefile create mode 100644 lang/openjdk7/patches/patch-jdk_make_sun_rmi_rmi_Makefile (limited to 'lang/openjdk7') diff --git a/lang/openjdk7/PLIST.SunOS b/lang/openjdk7/PLIST.SunOS index 5d8a4e2d876..786f69041c3 100644 --- a/lang/openjdk7/PLIST.SunOS +++ b/lang/openjdk7/PLIST.SunOS @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.SunOS,v 1.1 2013/06/15 09:31:05 jperkin Exp $ +@comment $NetBSD: PLIST.SunOS,v 1.2 2013/06/23 17:39:43 jperkin Exp $ bin/openjdk7-jar bin/openjdk7-java bin/openjdk7-javac @@ -380,81 +380,81 @@ 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/${MACHINE_ARCH}/client/64/libjvm_db.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/client/64/libjvm_db.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/client/64/libjvm_dtrace.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/client/64/libjvm_dtrace.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/client/Xusage.txt -java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjsig.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjsig.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm_db.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm_db.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm_dtrace.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm_dtrace.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/headless/libmawt.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/jexec -java/openjdk7/jre/lib/${MACHINE_ARCH}/jli/libjli.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/jvm.cfg -java/openjdk7/jre/lib/${MACHINE_ARCH}/libattach.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/libattach.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libawt.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libdt_socket.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/libdt_socket.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libfontmanager.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libfreetype.so.6 -java/openjdk7/jre/lib/${MACHINE_ARCH}/libhprof.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/libhprof.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libinstrument.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/libinstrument.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libj2gss.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libj2pcsc.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libj2pkcs11.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libjaas_unix.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libjava.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libjava_crw_demo.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/libjava_crw_demo.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libjawt.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libjdwp.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libjpeg.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libjsdt.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/libjsdt.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libjsig.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/libjsig.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libjsound.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/liblcms.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libmanagement.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/libmanagement.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libmlib_image.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libnet.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libnio.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libnpt.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/libnpt.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/librmi.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libsaproc.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/libsaproc.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libsctp.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libsplashscreen.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libsunec.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libunpack.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libverify.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/libverify.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/libzip.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/server/64/libjvm_db.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/server/64/libjvm_db.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/server/64/libjvm_dtrace.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/server/64/libjvm_dtrace.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/server/Xusage.txt -java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjsig.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjsig.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm_db.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm_db.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm_dtrace.diz -java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm_dtrace.so -java/openjdk7/jre/lib/${MACHINE_ARCH}/xawt/libmawt.so +${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_db.diz +${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_db.so +${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_dtrace.diz +${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_dtrace.so +${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/Xusage.txt +${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjsig.diz +${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjsig.so +${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm.diz +${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm.so +${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm_db.diz +${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm_db.so +${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm_dtrace.diz +${PLIST.i386}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 +java/openjdk7/jre/lib/${ARCH}/jvm.cfg +java/openjdk7/jre/lib/${ARCH}/libattach.diz +java/openjdk7/jre/lib/${ARCH}/libattach.so +java/openjdk7/jre/lib/${ARCH}/libawt.so +java/openjdk7/jre/lib/${ARCH}/libdt_socket.diz +java/openjdk7/jre/lib/${ARCH}/libdt_socket.so +java/openjdk7/jre/lib/${ARCH}/libfontmanager.so +java/openjdk7/jre/lib/${ARCH}/libfreetype.so.6 +java/openjdk7/jre/lib/${ARCH}/libhprof.diz +java/openjdk7/jre/lib/${ARCH}/libhprof.so +java/openjdk7/jre/lib/${ARCH}/libinstrument.diz +java/openjdk7/jre/lib/${ARCH}/libinstrument.so +java/openjdk7/jre/lib/${ARCH}/libj2gss.so +java/openjdk7/jre/lib/${ARCH}/libj2pcsc.so +java/openjdk7/jre/lib/${ARCH}/libj2pkcs11.so +java/openjdk7/jre/lib/${ARCH}/libjaas_unix.so +java/openjdk7/jre/lib/${ARCH}/libjava.so +java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.diz +java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.so +java/openjdk7/jre/lib/${ARCH}/libjawt.so +java/openjdk7/jre/lib/${ARCH}/libjdwp.so +java/openjdk7/jre/lib/${ARCH}/libjpeg.so +java/openjdk7/jre/lib/${ARCH}/libjsdt.diz +java/openjdk7/jre/lib/${ARCH}/libjsdt.so +java/openjdk7/jre/lib/${ARCH}/libjsig.diz +java/openjdk7/jre/lib/${ARCH}/libjsig.so +java/openjdk7/jre/lib/${ARCH}/libjsound.so +java/openjdk7/jre/lib/${ARCH}/liblcms.so +java/openjdk7/jre/lib/${ARCH}/libmanagement.diz +java/openjdk7/jre/lib/${ARCH}/libmanagement.so +java/openjdk7/jre/lib/${ARCH}/libmlib_image.so +java/openjdk7/jre/lib/${ARCH}/libnet.so +java/openjdk7/jre/lib/${ARCH}/libnio.so +java/openjdk7/jre/lib/${ARCH}/libnpt.diz +java/openjdk7/jre/lib/${ARCH}/libnpt.so +java/openjdk7/jre/lib/${ARCH}/librmi.so +java/openjdk7/jre/lib/${ARCH}/libsaproc.diz +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.diz +java/openjdk7/jre/lib/${ARCH}/libverify.so +java/openjdk7/jre/lib/${ARCH}/libzip.so +${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/server/64/libjvm_db.diz +${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/server/64/libjvm_db.so +${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/server/64/libjvm_dtrace.diz +${PLIST.i386}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.diz +java/openjdk7/jre/lib/${ARCH}/server/libjsig.so +java/openjdk7/jre/lib/${ARCH}/server/libjvm.diz +java/openjdk7/jre/lib/${ARCH}/server/libjvm.so +java/openjdk7/jre/lib/${ARCH}/server/libjvm_db.diz +java/openjdk7/jre/lib/${ARCH}/server/libjvm_db.so +java/openjdk7/jre/lib/${ARCH}/server/libjvm_dtrace.diz +java/openjdk7/jre/lib/${ARCH}/server/libjvm_dtrace.so +java/openjdk7/jre/lib/${ARCH}/xawt/libmawt.so 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 diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo index e825a81aa36..fda22bdb8a3 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: distinfo,v 1.25 2013/06/23 17:39:43 jperkin Exp $ SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253 RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f @@ -54,6 +54,7 @@ Size (openjdk7/openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = 103796914 bytes SHA1 (openjdk7/rhino1_7R3.zip) = 81f39d6e24529d62b23a6a92a1a09af95495d7c1 RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0 Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes +SHA1 (patch-Makefile) = a9e415d19c2a8edb96a60ffdf81c804476a8e2f6 SHA1 (patch-aa) = 6c27af8648ef893100a965ef2a009439e7bae6af SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998 SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6 @@ -61,14 +62,14 @@ SHA1 (patch-ad) = 93ddbb82e8999c581e56e7bc3c194ff87e68d8b9 SHA1 (patch-ae) = 0bc7f2cf43835ce7d1e30e09a570e46a952a03e8 SHA1 (patch-af) = 203f61a448989130552a2fbef73f93d1734f4f66 SHA1 (patch-ag) = 83ec8015b8e0f2657f4289cea84bdc9b6d0c5e88 -SHA1 (patch-ah) = a02db4b415b20146e8703d925b5ac9004606e035 +SHA1 (patch-ah) = 2d358879d2851fb2fb8161c5a1ac5a93aa7a69c2 SHA1 (patch-ai) = bee1b592401d15a91e7d926c9011bcd0d83fb5ec SHA1 (patch-aj) = b8f7f80e41ccc4fe9bb167d857c6a286b3b09f0a SHA1 (patch-ak) = 45beaba484a74fb47f74bec786c418781dc478e2 SHA1 (patch-al) = f52ad9a838357f03348344f09cabf00157bb18cd SHA1 (patch-am) = d9b30616a7803d1f10751a2c6950317c167c5703 SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd -SHA1 (patch-ao) = 258f2a35b66d40c9b1917034eadda307d7a2dfb2 +SHA1 (patch-ao) = 6bfc842ceb0d7e03f9288e80fe762bd1d54cf503 SHA1 (patch-ap) = 0ef305622c8d1ee1d5d6361b5af352251d52929a SHA1 (patch-aq) = 97303ebcdcf0251406eef816ae56c82c703dab9d SHA1 (patch-ar) = 6544d4c7d4f30a3baeac95834e41ce8f7d41f9ec @@ -85,14 +86,14 @@ SHA1 (patch-bk) = cb6f2da6fb2bbecb981dbf454603c851c48f75bc SHA1 (patch-bl) = 34b829c6768fc67c0c0471880ce642284be602bb SHA1 (patch-bn) = e90012a3acbdeec1fe97d53ffa11816379ac90e9 SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = e3b6d4683f1128bc1b2e5d8453608228da54e3d2 -SHA1 (patch-corba_make_common_shared_Platform.gmk) = 88b779af38d2f88db873d74493e5d2721c04531f +SHA1 (patch-corba_make_common_shared_Platform.gmk) = 0b15483bb55eb5d5f67d3fcab6b687a76de64e33 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 85eda2125ef39c5fe5fcfbc072bd8a3591d5c4bf SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14 SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239 SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 5d3003a2b98501cb17695d11f8d3bfc7737657bd SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = d0060b60463f3695a9a9d2e60841266233fd589d SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 03bc8db5ac6623b63860a76d2d5cc4f26c44617b -SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = 805a45d52a715206fb4b964c6e7d533895059c30 +SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = eade4a72ac2d826bb7eb8b84bf49219519ead4bd SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 8028a9aa009ce34e434a62a231747143bd16966a SHA1 (patch-hotspot_make_solaris_makefiles_jvmg.make) = 4b14c61707d739f612943c41ab7f3ccc34106a18 SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 5163ebc52439f6fe1cdfde87b9b930744a485e70 @@ -114,19 +115,22 @@ SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = cf7c6226ad7c322f43df900 SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = 7d244b859debf4f68e49fe6fb36fe2598951fcdb SHA1 (patch-jdk_make_com_sun_Makefile) = 7b3b8163a4343b820f50b00babd4363c141ada67 SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46 +SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 65fa2d6191311766cdb5d9933d760cae7955f664 SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3 SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = 32c0bbd91ec0c85eb725cd721ed759c6d6499f50 SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70 SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6 -SHA1 (patch-jdk_make_common_Program.gmk) = 2ccab79ba7b84aa418c63d7f2a6f2a8b9e519b64 +SHA1 (patch-jdk_make_common_Program.gmk) = e2ac51824f54baeb65d3323adc87dec100c7ed0a SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2 SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = bb5d55282bf100986c397e41b1be4d25e73232dc SHA1 (patch-jdk_make_common_shared_Defs-versions.gmk) = 20a9492180db88cf78bc107f1e2fc4a9101d2eab +SHA1 (patch-jdk_make_java_Makefile) = c670455f8979b14fe44f0a285d0adfb2666d0005 SHA1 (patch-jdk_make_java_instrument_Makefile) = c9bd9bf27d9f2971d59762320e5cf9d25c2c4852 SHA1 (patch-jdk_make_java_nio_Makefile) = d4b8b830ce73841ae107f8485400ab6116b9ca3c SHA1 (patch-jdk_make_java_npt_Makefile) = bf7505c30fe3e9014399bc5ce618c5dc40aef62b SHA1 (patch-jdk_make_sun_awt_Makefile) = 981082d4dfda204f09a66b9fc452bea218d3ce6a SHA1 (patch-jdk_make_sun_awt_mawt.gmk) = aa694522a6b75a5ac30d7fe3a530e3feb6563d30 +SHA1 (patch-jdk_make_sun_rmi_rmi_Makefile) = ef42db5c61e940b66dfead0e9fcf328d125b3460 SHA1 (patch-jdk_make_sun_security_ec_Makefile) = 30e35128a763b8d70e02e302f2e3ae5b7a24a99b SHA1 (patch-jdk_make_sun_splashscreen_Makefile) = fa6e9a60c1e0908c9c31761608a25bffc8093a60 SHA1 (patch-jdk_make_sun_xawt_Makefile) = 735cf251798c2b6a638fc57dc90fe0750433f26d diff --git a/lang/openjdk7/patches/patch-Makefile b/lang/openjdk7/patches/patch-Makefile new file mode 100644 index 00000000000..3dce8ebab15 --- /dev/null +++ b/lang/openjdk7/patches/patch-Makefile @@ -0,0 +1,15 @@ +$NetBSD: patch-Makefile,v 1.1 2013/06/23 17:39:43 jperkin Exp $ + +Disable SunOS multiarch. + +--- Makefile.orig 2012-08-10 16:07:00.000000000 +0000 ++++ Makefile +@@ -210,7 +210,7 @@ create_fresh_fastdebug_bootdir: FRC + + # Create boot image? + ifeq ($(SKIP_BOOT_CYCLE),false) +- ifneq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64) ++ ifneq ($(PLATFORM)$(ARCH_DATA_MODEL),NOMULTIARCHsolaris64) + DO_BOOT_CYCLE=true + endif + endif diff --git a/lang/openjdk7/patches/patch-ah b/lang/openjdk7/patches/patch-ah index bfd3a7a39cd..8e0ac1d9da7 100644 --- a/lang/openjdk7/patches/patch-ah +++ b/lang/openjdk7/patches/patch-ah @@ -1,9 +1,20 @@ -$NetBSD: patch-ah,v 1.4 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-ah,v 1.5 2013/06/23 17:39:43 jperkin Exp $ DragonFly support. ---- jdk/make/common/shared/Platform.gmk.orig 2013-05-29 03:57:57.000000000 +0000 +Disable SunOS multiarch. + +--- jdk/make/common/shared/Platform.gmk.orig 2013-06-21 13:12:13.786915027 +0000 +++ jdk/make/common/shared/Platform.gmk +@@ -119,7 +119,7 @@ ifeq ($(SYSTEM_UNAME), SunOS) + ARCH := $(shell isainfo -n) + # ISA_DIR is used to locate 64-bit specific libraries which are generally + # in the same general place as other libraries under the ./$(ARCH) directory +- ISA_DIR = /$(ARCH) ++ NOMULTIARCHISA_DIR = /$(ARCH) + endif + # Need to maintain the jre/lib/i386 location for 32-bit Intel + ifeq ($(ARCH), i586) @@ -224,6 +224,13 @@ ifeq ($(SYSTEM_UNAME), Linux) MB_OF_MEMORY := $(shell free -m | fgrep Mem: | awk '{print $$2;}' ) endif diff --git a/lang/openjdk7/patches/patch-ao b/lang/openjdk7/patches/patch-ao index 85679e0f284..9449d60e8bd 100644 --- a/lang/openjdk7/patches/patch-ao +++ b/lang/openjdk7/patches/patch-ao @@ -1,9 +1,29 @@ -$NetBSD: patch-ao,v 1.3 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-ao,v 1.4 2013/06/23 17:39:43 jperkin Exp $ Support rhino. ---- jdk/make/common/Release.gmk.orig 2013-05-29 03:57:57.000000000 +0000 +Disable SunOS multiarch. + +--- jdk/make/common/Release.gmk.orig 2013-06-21 13:12:13.781215177 +0000 +++ jdk/make/common/Release.gmk +@@ -67,7 +67,7 @@ EXPORTED_PRIVATE_PKGS = com.sun.servicet + # 64-bit solaris has a few special cases. We define the variable + # SOLARIS64 for use in this Makefile to easily test those cases + ifeq ($(PLATFORM), solaris) +- ifeq ($(ARCH_DATA_MODEL), 64) ++ ifeq ($(ARCH_DATA_MODEL), NOMULTIARCH64) + SOLARIS64 = true + IMAGE_BINDIR = bin/$(ARCH) + endif +@@ -227,7 +227,7 @@ endif + INITIAL_IMAGE_JRE=initial-image-jre + INITIAL_IMAGE_JDK=initial-image-jdk + ifeq ($(PLATFORM), solaris) +- ifeq ($(ARCH_DATA_MODEL), 64) ++ ifeq ($(ARCH_DATA_MODEL), NOMULTIARCH64) + INITIAL_IMAGE_JRE=initial-image-jre-sol64 + INITIAL_IMAGE_JDK=initial-image-jdk-sol64 + endif @@ -842,6 +842,7 @@ initial-image-jre:: initial-image-jre-se $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar diff --git a/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk b/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk index 6a731916d42..9f328ce0cd2 100644 --- a/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk +++ b/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk @@ -1,9 +1,20 @@ -$NetBSD: patch-corba_make_common_shared_Platform.gmk,v 1.1 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-corba_make_common_shared_Platform.gmk,v 1.2 2013/06/23 17:39:43 jperkin Exp $ Avoid warnings when building in a zone. ---- corba/make/common/shared/Platform.gmk.orig 2013-02-20 04:35:29.000000000 +0000 +Disable multiarch support. + +--- corba/make/common/shared/Platform.gmk.orig 2013-06-21 13:12:15.317583446 +0000 +++ corba/make/common/shared/Platform.gmk +@@ -115,7 +115,7 @@ ifeq ($(SYSTEM_UNAME), SunOS) + ARCH := $(shell isainfo -n) + # ISA_DIR is used to locate 64-bit specific libraries which are generally + # in the same general place as other libraries under the ./$(ARCH) directory +- ISA_DIR = /$(ARCH) ++ NOMULTIARCHISA_DIR = /$(ARCH) + endif + # Need to maintain the jre/lib/i386 location for 32-bit Intel + ifeq ($(ARCH), i586) @@ -143,7 +143,7 @@ ifeq ($(SYSTEM_UNAME), SunOS) REQUIRED_FREE_SPACE=1040000 endif diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_gcc.make b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_gcc.make index 3e2a42418f7..0856293b928 100644 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_gcc.make +++ b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_gcc.make @@ -1,7 +1,9 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.2 2013/06/23 17:39:43 jperkin Exp $ GCC support. +Disable SunOS multiarch. + --- hotspot/make/solaris/makefiles/gcc.make.orig 2012-08-10 16:23:14.000000000 +0000 +++ hotspot/make/solaris/makefiles/gcc.make @@ -66,11 +66,23 @@ VM_PICFLAG/LIBJVM = $(PICFLAG) @@ -28,7 +30,17 @@ GCC support. ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) -@@ -103,6 +115,11 @@ ifdef CC_INTERP +@@ -82,7 +94,8 @@ ARCHFLAG/amd64 = -m64 -march=k8 + + # Optional sub-directory in /usr/lib where BUILDARCH libraries are kept. + ISA_DIR=$(ISA_DIR/$(BUILDARCH)) +-ISA_DIR/amd64=/amd64 ++ISA_DIR/amd64= ++NOMULTIARCHISA_DIR/amd64=/amd64 + ISA_DIR/i486= + ISA_DIR/sparcv9=/64 + +@@ -103,6 +116,11 @@ ifdef CC_INTERP CFLAGS += -DCC_INTERP endif @@ -40,7 +52,7 @@ GCC support. # Keep temporary files (.ii, .s) ifdef NEED_ASM CFLAGS += -save-temps -@@ -113,9 +130,18 @@ endif +@@ -113,9 +131,18 @@ endif # Compiler warnings are treated as errors WARNINGS_ARE_ERRORS = -Werror @@ -62,7 +74,7 @@ GCC support. # Special cases CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) -@@ -173,7 +199,7 @@ MAPFLAG = -Xlinker -M -Xlinker FILENAME +@@ -173,7 +200,7 @@ MAPFLAG = -Xlinker -M -Xlinker FILENAME endif # Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj @@ -71,7 +83,7 @@ GCC support. # Build shared library SHARED_FLAG = -shared -@@ -181,17 +207,34 @@ SHARED_FLAG = -shared +@@ -181,17 +208,34 @@ SHARED_FLAG = -shared #------------------------------------------------------------------------ # Debug flags diff --git a/lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile b/lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile new file mode 100644 index 00000000000..0f3b08cc1fd --- /dev/null +++ b/lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile @@ -0,0 +1,15 @@ +$NetBSD: patch-jdk_make_com_sun_jmx_Makefile,v 1.1 2013/06/23 17:39:43 jperkin Exp $ + +Disable SunOS multiarch. + +--- jdk/make/com/sun/jmx/Makefile.orig 2012-08-10 17:21:31.000000000 +0000 ++++ jdk/make/com/sun/jmx/Makefile +@@ -106,7 +106,7 @@ FILES_ties = $(subst javax/management/ + + RMIC_JAVA = $(OUTPUTDIR)/bin/java + # need to treat 64bit solaris differently +-ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64) ++ifeq ($(PLATFORM)-$(LIBARCH), NOMULTIARCHsolaris-amd64) + RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java + endif + ifeq ($(PLATFORM)-$(LIBARCH), solaris-sparcv9) diff --git a/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk b/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk index 5a012228b99..4a93fdb06c4 100644 --- a/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk +++ b/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk @@ -1,8 +1,8 @@ -$NetBSD: patch-jdk_make_common_Program.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $ +$NetBSD: patch-jdk_make_common_Program.gmk,v 1.2 2013/06/23 17:39:43 jperkin Exp $ GCC support. ---- jdk/make/common/Program.gmk.orig 2013-06-11 09:37:03.843509400 +0000 +--- jdk/make/common/Program.gmk.orig 2013-06-18 09:09:41.950128156 +0000 +++ jdk/make/common/Program.gmk @@ -65,7 +65,10 @@ program: $(ACTUAL_PROGRAM) ifndef CROSS_COMPILE_ARCH @@ -16,14 +16,24 @@ GCC support. include $(BUILDDIR)/common/Mapfile-vers.gmk endif -@@ -110,6 +113,7 @@ ifneq (,$(findstring $(PLATFORM), linux +@@ -110,12 +113,13 @@ ifneq (,$(findstring $(PLATFORM), linux LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli OTHER_LDLIBS += -ljli ifeq ($(PLATFORM), solaris) + LDFLAGS += -R ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}/jli ifeq ($(ARCH_DATA_MODEL), 32) - LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli - LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli +- LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli +- LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli ++# LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli ++# LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli + else # ! ARCH_DATA_MODEL 64-bit +- LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli +- LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli ++# LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli ++# LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli + endif # ARCH_DATA_MODEL + endif # PLATFORM SOLARIS + ifeq ($(PLATFORM), linux) @@ -124,6 +128,9 @@ ifneq (,$(findstring $(PLATFORM), linux LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli diff --git a/lang/openjdk7/patches/patch-jdk_make_java_Makefile b/lang/openjdk7/patches/patch-jdk_make_java_Makefile new file mode 100644 index 00000000000..b224d121f23 --- /dev/null +++ b/lang/openjdk7/patches/patch-jdk_make_java_Makefile @@ -0,0 +1,15 @@ +$NetBSD: patch-jdk_make_java_Makefile,v 1.1 2013/06/23 17:39:43 jperkin Exp $ + +Disable SunOS multiarch. + +--- jdk/make/java/Makefile.orig 2013-06-18 11:53:51.041002241 +0000 ++++ jdk/make/java/Makefile +@@ -48,7 +48,7 @@ SUBDIRS_misc = npt java_crw_demo j + + + ifeq ($(PLATFORM), solaris) +- ifeq ($(ARCH_DATA_MODEL), 32) ++ ifneq ($(ARCH_DATA_MODEL), NOMULTIARCH64) + SUBDIRS += jexec + endif + endif # PLATFORM diff --git a/lang/openjdk7/patches/patch-jdk_make_sun_rmi_rmi_Makefile b/lang/openjdk7/patches/patch-jdk_make_sun_rmi_rmi_Makefile new file mode 100644 index 00000000000..fed4226673a --- /dev/null +++ b/lang/openjdk7/patches/patch-jdk_make_sun_rmi_rmi_Makefile @@ -0,0 +1,15 @@ +$NetBSD: patch-jdk_make_sun_rmi_rmi_Makefile,v 1.1 2013/06/23 17:39:43 jperkin Exp $ + +Disable SunOS multiarch. + +--- jdk/make/sun/rmi/rmi/Makefile.orig 2013-06-18 11:53:51.077890050 +0000 ++++ jdk/make/sun/rmi/rmi/Makefile +@@ -93,7 +93,7 @@ ifeq ($(PLATFORM), linux) + BUILD_TARGETS += bin + endif + ifeq ($(PLATFORM), solaris) +- ifeq ($(ARCH_DATA_MODEL), 32) ++ ifneq ($(ARCH_DATA_MODEL), NOMULTIARCH64) + BUILD_TARGETS += bin + endif + endif -- cgit v1.2.3