Sun Jun 23 17:39:43 2013 UTC ()
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.


(jperkin)
diff -r1.1 -r1.2 pkgsrc/lang/openjdk7/PLIST.SunOS
diff -r1.24 -r1.25 pkgsrc/lang/openjdk7/distinfo
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-Makefile
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_java_Makefile
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_sun_rmi_rmi_Makefile
diff -r1.4 -r1.5 pkgsrc/lang/openjdk7/patches/patch-ah
diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/patch-ao
diff -r1.1 -r1.2 pkgsrc/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk
diff -r1.1 -r1.2 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_gcc.make
diff -r1.1 -r1.2 pkgsrc/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk
cvs diff -r1.1 -r1.2 pkgsrc/lang/openjdk7/Attic/PLIST.SunOS (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/PLIST.SunOS 2013/06/15 09:31:05 1.1
+++ pkgsrc/lang/openjdk7/Attic/PLIST.SunOS 2013/06/23 17:39:43 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.SunOS,v 1.1 2013/06/15 09:31:05 jperkin Exp $ 1@comment $NetBSD: PLIST.SunOS,v 1.2 2013/06/23 17:39:43 jperkin Exp $
2bin/openjdk7-jar 2bin/openjdk7-jar
3bin/openjdk7-java 3bin/openjdk7-java
4bin/openjdk7-javac 4bin/openjdk7-javac
5bin/openjdk7-javadoc 5bin/openjdk7-javadoc
6bin/openjdk7-javah 6bin/openjdk7-javah
7bin/openjdk7-javap 7bin/openjdk7-javap
8bin/openjdk7-keytool 8bin/openjdk7-keytool
9bin/openjdk7-orbd 9bin/openjdk7-orbd
10bin/openjdk7-policytool 10bin/openjdk7-policytool
11bin/openjdk7-rmid 11bin/openjdk7-rmid
12bin/openjdk7-rmiregistry 12bin/openjdk7-rmiregistry
13bin/openjdk7-servertool 13bin/openjdk7-servertool
14bin/openjdk7-tnameserv 14bin/openjdk7-tnameserv
@@ -370,101 +370,101 @@ java/openjdk7/jre/lib/cmm/PYCC.pf @@ -370,101 +370,101 @@ java/openjdk7/jre/lib/cmm/PYCC.pf
370java/openjdk7/jre/lib/cmm/sRGB.pf 370java/openjdk7/jre/lib/cmm/sRGB.pf
371java/openjdk7/jre/lib/content-types.properties 371java/openjdk7/jre/lib/content-types.properties
372java/openjdk7/jre/lib/currency.data 372java/openjdk7/jre/lib/currency.data
373java/openjdk7/jre/lib/ext/dnsns.jar 373java/openjdk7/jre/lib/ext/dnsns.jar
374java/openjdk7/jre/lib/ext/localedata.jar 374java/openjdk7/jre/lib/ext/localedata.jar
375java/openjdk7/jre/lib/ext/meta-index 375java/openjdk7/jre/lib/ext/meta-index
376java/openjdk7/jre/lib/ext/sunec.jar 376java/openjdk7/jre/lib/ext/sunec.jar
377java/openjdk7/jre/lib/ext/sunjce_provider.jar 377java/openjdk7/jre/lib/ext/sunjce_provider.jar
378java/openjdk7/jre/lib/ext/sunpkcs11.jar 378java/openjdk7/jre/lib/ext/sunpkcs11.jar
379java/openjdk7/jre/lib/ext/zipfs.jar 379java/openjdk7/jre/lib/ext/zipfs.jar
380java/openjdk7/jre/lib/flavormap.properties 380java/openjdk7/jre/lib/flavormap.properties
381java/openjdk7/jre/lib/fontconfig.bfc 381java/openjdk7/jre/lib/fontconfig.bfc
382java/openjdk7/jre/lib/fontconfig.properties.src 382java/openjdk7/jre/lib/fontconfig.properties.src
383java/openjdk7/jre/lib/${MACHINE_ARCH}/client/64/libjvm_db.diz 383${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_db.diz
384java/openjdk7/jre/lib/${MACHINE_ARCH}/client/64/libjvm_db.so 384${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_db.so
385java/openjdk7/jre/lib/${MACHINE_ARCH}/client/64/libjvm_dtrace.diz 385${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_dtrace.diz
386java/openjdk7/jre/lib/${MACHINE_ARCH}/client/64/libjvm_dtrace.so 386${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_dtrace.so
387java/openjdk7/jre/lib/${MACHINE_ARCH}/client/Xusage.txt 387${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/Xusage.txt
388java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjsig.diz 388${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjsig.diz
389java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjsig.so 389${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjsig.so
390java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm.diz 390${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm.diz
391java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm.so 391${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm.so
392java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm_db.diz 392${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm_db.diz
393java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm_db.so 393${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm_db.so
394java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm_dtrace.diz 394${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm_dtrace.diz
395java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm_dtrace.so 395${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm_dtrace.so
396java/openjdk7/jre/lib/${MACHINE_ARCH}/headless/libmawt.so 396java/openjdk7/jre/lib/${ARCH}/headless/libmawt.so
397java/openjdk7/jre/lib/${MACHINE_ARCH}/jexec 397java/openjdk7/jre/lib/${ARCH}/jexec
398java/openjdk7/jre/lib/${MACHINE_ARCH}/jli/libjli.so 398java/openjdk7/jre/lib/${ARCH}/jli/libjli.so
399java/openjdk7/jre/lib/${MACHINE_ARCH}/jvm.cfg 399java/openjdk7/jre/lib/${ARCH}/jvm.cfg
400java/openjdk7/jre/lib/${MACHINE_ARCH}/libattach.diz 400java/openjdk7/jre/lib/${ARCH}/libattach.diz
401java/openjdk7/jre/lib/${MACHINE_ARCH}/libattach.so 401java/openjdk7/jre/lib/${ARCH}/libattach.so
402java/openjdk7/jre/lib/${MACHINE_ARCH}/libawt.so 402java/openjdk7/jre/lib/${ARCH}/libawt.so
403java/openjdk7/jre/lib/${MACHINE_ARCH}/libdt_socket.diz 403java/openjdk7/jre/lib/${ARCH}/libdt_socket.diz
404java/openjdk7/jre/lib/${MACHINE_ARCH}/libdt_socket.so 404java/openjdk7/jre/lib/${ARCH}/libdt_socket.so
405java/openjdk7/jre/lib/${MACHINE_ARCH}/libfontmanager.so 405java/openjdk7/jre/lib/${ARCH}/libfontmanager.so
406java/openjdk7/jre/lib/${MACHINE_ARCH}/libfreetype.so.6 406java/openjdk7/jre/lib/${ARCH}/libfreetype.so.6
407java/openjdk7/jre/lib/${MACHINE_ARCH}/libhprof.diz 407java/openjdk7/jre/lib/${ARCH}/libhprof.diz
408java/openjdk7/jre/lib/${MACHINE_ARCH}/libhprof.so 408java/openjdk7/jre/lib/${ARCH}/libhprof.so
409java/openjdk7/jre/lib/${MACHINE_ARCH}/libinstrument.diz 409java/openjdk7/jre/lib/${ARCH}/libinstrument.diz
410java/openjdk7/jre/lib/${MACHINE_ARCH}/libinstrument.so 410java/openjdk7/jre/lib/${ARCH}/libinstrument.so
411java/openjdk7/jre/lib/${MACHINE_ARCH}/libj2gss.so 411java/openjdk7/jre/lib/${ARCH}/libj2gss.so
412java/openjdk7/jre/lib/${MACHINE_ARCH}/libj2pcsc.so 412java/openjdk7/jre/lib/${ARCH}/libj2pcsc.so
413java/openjdk7/jre/lib/${MACHINE_ARCH}/libj2pkcs11.so 413java/openjdk7/jre/lib/${ARCH}/libj2pkcs11.so
414java/openjdk7/jre/lib/${MACHINE_ARCH}/libjaas_unix.so 414java/openjdk7/jre/lib/${ARCH}/libjaas_unix.so
415java/openjdk7/jre/lib/${MACHINE_ARCH}/libjava.so 415java/openjdk7/jre/lib/${ARCH}/libjava.so
416java/openjdk7/jre/lib/${MACHINE_ARCH}/libjava_crw_demo.diz 416java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.diz
417java/openjdk7/jre/lib/${MACHINE_ARCH}/libjava_crw_demo.so 417java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.so
418java/openjdk7/jre/lib/${MACHINE_ARCH}/libjawt.so 418java/openjdk7/jre/lib/${ARCH}/libjawt.so
419java/openjdk7/jre/lib/${MACHINE_ARCH}/libjdwp.so 419java/openjdk7/jre/lib/${ARCH}/libjdwp.so
420java/openjdk7/jre/lib/${MACHINE_ARCH}/libjpeg.so 420java/openjdk7/jre/lib/${ARCH}/libjpeg.so
421java/openjdk7/jre/lib/${MACHINE_ARCH}/libjsdt.diz 421java/openjdk7/jre/lib/${ARCH}/libjsdt.diz
422java/openjdk7/jre/lib/${MACHINE_ARCH}/libjsdt.so 422java/openjdk7/jre/lib/${ARCH}/libjsdt.so
423java/openjdk7/jre/lib/${MACHINE_ARCH}/libjsig.diz 423java/openjdk7/jre/lib/${ARCH}/libjsig.diz
424java/openjdk7/jre/lib/${MACHINE_ARCH}/libjsig.so 424java/openjdk7/jre/lib/${ARCH}/libjsig.so
425java/openjdk7/jre/lib/${MACHINE_ARCH}/libjsound.so 425java/openjdk7/jre/lib/${ARCH}/libjsound.so
426java/openjdk7/jre/lib/${MACHINE_ARCH}/liblcms.so 426java/openjdk7/jre/lib/${ARCH}/liblcms.so
427java/openjdk7/jre/lib/${MACHINE_ARCH}/libmanagement.diz 427java/openjdk7/jre/lib/${ARCH}/libmanagement.diz
428java/openjdk7/jre/lib/${MACHINE_ARCH}/libmanagement.so 428java/openjdk7/jre/lib/${ARCH}/libmanagement.so
429java/openjdk7/jre/lib/${MACHINE_ARCH}/libmlib_image.so 429java/openjdk7/jre/lib/${ARCH}/libmlib_image.so
430java/openjdk7/jre/lib/${MACHINE_ARCH}/libnet.so 430java/openjdk7/jre/lib/${ARCH}/libnet.so
431java/openjdk7/jre/lib/${MACHINE_ARCH}/libnio.so 431java/openjdk7/jre/lib/${ARCH}/libnio.so
432java/openjdk7/jre/lib/${MACHINE_ARCH}/libnpt.diz 432java/openjdk7/jre/lib/${ARCH}/libnpt.diz
433java/openjdk7/jre/lib/${MACHINE_ARCH}/libnpt.so 433java/openjdk7/jre/lib/${ARCH}/libnpt.so
434java/openjdk7/jre/lib/${MACHINE_ARCH}/librmi.so 434java/openjdk7/jre/lib/${ARCH}/librmi.so
435java/openjdk7/jre/lib/${MACHINE_ARCH}/libsaproc.diz 435java/openjdk7/jre/lib/${ARCH}/libsaproc.diz
436java/openjdk7/jre/lib/${MACHINE_ARCH}/libsaproc.so 436java/openjdk7/jre/lib/${ARCH}/libsaproc.so
437java/openjdk7/jre/lib/${MACHINE_ARCH}/libsctp.so 437java/openjdk7/jre/lib/${ARCH}/libsctp.so
438java/openjdk7/jre/lib/${MACHINE_ARCH}/libsplashscreen.so 438java/openjdk7/jre/lib/${ARCH}/libsplashscreen.so
439java/openjdk7/jre/lib/${MACHINE_ARCH}/libsunec.so 439java/openjdk7/jre/lib/${ARCH}/libsunec.so
440java/openjdk7/jre/lib/${MACHINE_ARCH}/libunpack.so 440java/openjdk7/jre/lib/${ARCH}/libunpack.so
441java/openjdk7/jre/lib/${MACHINE_ARCH}/libverify.diz 441java/openjdk7/jre/lib/${ARCH}/libverify.diz
442java/openjdk7/jre/lib/${MACHINE_ARCH}/libverify.so 442java/openjdk7/jre/lib/${ARCH}/libverify.so
443java/openjdk7/jre/lib/${MACHINE_ARCH}/libzip.so 443java/openjdk7/jre/lib/${ARCH}/libzip.so
444java/openjdk7/jre/lib/${MACHINE_ARCH}/server/64/libjvm_db.diz 444${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/server/64/libjvm_db.diz
445java/openjdk7/jre/lib/${MACHINE_ARCH}/server/64/libjvm_db.so 445${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/server/64/libjvm_db.so
446java/openjdk7/jre/lib/${MACHINE_ARCH}/server/64/libjvm_dtrace.diz 446${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/server/64/libjvm_dtrace.diz
447java/openjdk7/jre/lib/${MACHINE_ARCH}/server/64/libjvm_dtrace.so 447${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/server/64/libjvm_dtrace.so
448java/openjdk7/jre/lib/${MACHINE_ARCH}/server/Xusage.txt 448java/openjdk7/jre/lib/${ARCH}/server/Xusage.txt
449java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjsig.diz 449java/openjdk7/jre/lib/${ARCH}/server/libjsig.diz
450java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjsig.so 450java/openjdk7/jre/lib/${ARCH}/server/libjsig.so
451java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm.diz 451java/openjdk7/jre/lib/${ARCH}/server/libjvm.diz
452java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm.so 452java/openjdk7/jre/lib/${ARCH}/server/libjvm.so
453java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm_db.diz 453java/openjdk7/jre/lib/${ARCH}/server/libjvm_db.diz
454java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm_db.so 454java/openjdk7/jre/lib/${ARCH}/server/libjvm_db.so
455java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm_dtrace.diz 455java/openjdk7/jre/lib/${ARCH}/server/libjvm_dtrace.diz
456java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm_dtrace.so 456java/openjdk7/jre/lib/${ARCH}/server/libjvm_dtrace.so
457java/openjdk7/jre/lib/${MACHINE_ARCH}/xawt/libmawt.so 457java/openjdk7/jre/lib/${ARCH}/xawt/libmawt.so
458java/openjdk7/jre/lib/images/cursors/cursors.properties 458java/openjdk7/jre/lib/images/cursors/cursors.properties
459java/openjdk7/jre/lib/images/cursors/invalid32x32.gif 459java/openjdk7/jre/lib/images/cursors/invalid32x32.gif
460java/openjdk7/jre/lib/images/cursors/motif_CopyDrop32x32.gif 460java/openjdk7/jre/lib/images/cursors/motif_CopyDrop32x32.gif
461java/openjdk7/jre/lib/images/cursors/motif_CopyNoDrop32x32.gif 461java/openjdk7/jre/lib/images/cursors/motif_CopyNoDrop32x32.gif
462java/openjdk7/jre/lib/images/cursors/motif_LinkDrop32x32.gif 462java/openjdk7/jre/lib/images/cursors/motif_LinkDrop32x32.gif
463java/openjdk7/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif 463java/openjdk7/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif
464java/openjdk7/jre/lib/images/cursors/motif_MoveDrop32x32.gif 464java/openjdk7/jre/lib/images/cursors/motif_MoveDrop32x32.gif
465java/openjdk7/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif 465java/openjdk7/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif
466java/openjdk7/jre/lib/jce.jar 466java/openjdk7/jre/lib/jce.jar
467java/openjdk7/jre/lib/jsse.jar 467java/openjdk7/jre/lib/jsse.jar
468java/openjdk7/jre/lib/jvm.hprof.txt 468java/openjdk7/jre/lib/jvm.hprof.txt
469java/openjdk7/jre/lib/logging.properties 469java/openjdk7/jre/lib/logging.properties
470java/openjdk7/jre/lib/management-agent.jar 470java/openjdk7/jre/lib/management-agent.jar
cvs diff -r1.24 -r1.25 pkgsrc/lang/openjdk7/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/distinfo 2013/06/15 09:31:05 1.24
+++ pkgsrc/lang/openjdk7/Attic/distinfo 2013/06/23 17:39:43 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.24 2013/06/15 09:31:05 jperkin Exp $ 1$NetBSD: distinfo,v 1.25 2013/06/23 17:39:43 jperkin Exp $
2 2
3SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253 3SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
4RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f 4RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
5Size (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7426 bytes 5Size (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7426 bytes
6SHA1 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = d9e3e83dd9664cfe1dcd4841c082db3f559af922 6SHA1 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = d9e3e83dd9664cfe1dcd4841c082db3f559af922
7RMD160 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = a23e122b76b3dfed5be7bef3388041649df0b346 7RMD160 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = a23e122b76b3dfed5be7bef3388041649df0b346
8Size (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = 4257152 bytes 8Size (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = 4257152 bytes
9SHA1 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 6b3d887dfe3283a28f950bc3f87482200cfe78e2 9SHA1 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 6b3d887dfe3283a28f950bc3f87482200cfe78e2
10RMD160 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 7c6c2067322a4909c306f9a5049fe75f9244bab7 10RMD160 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 7c6c2067322a4909c306f9a5049fe75f9244bab7
11Size (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 22390959 bytes 11Size (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 22390959 bytes
12SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = fa383b2c7d5060a689dcbc5fcdd9f08908270ea4 12SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = fa383b2c7d5060a689dcbc5fcdd9f08908270ea4
13RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = a914780d3c1c0a53f68c07d39a5af36535282efe 13RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = a914780d3c1c0a53f68c07d39a5af36535282efe
14Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = 3208572 bytes 14Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = 3208572 bytes
@@ -44,99 +44,103 @@ RMD160 (openjdk7/jdk-7u21-20130526.diff) @@ -44,99 +44,103 @@ RMD160 (openjdk7/jdk-7u21-20130526.diff)
44Size (openjdk7/jdk-7u21-20130526.diff) = 4388188 bytes 44Size (openjdk7/jdk-7u21-20130526.diff) = 4388188 bytes
45SHA1 (openjdk7/jdk7-jaf-2010_08_19.zip) = 63ea970dcf129fbbba39a132d8f71add19fbf1f0 45SHA1 (openjdk7/jdk7-jaf-2010_08_19.zip) = 63ea970dcf129fbbba39a132d8f71add19fbf1f0
46RMD160 (openjdk7/jdk7-jaf-2010_08_19.zip) = fbadfbb781dc2aa8cfa384b8d5cd618522e55128 46RMD160 (openjdk7/jdk7-jaf-2010_08_19.zip) = fbadfbb781dc2aa8cfa384b8d5cd618522e55128
47Size (openjdk7/jdk7-jaf-2010_08_19.zip) = 70613 bytes 47Size (openjdk7/jdk7-jaf-2010_08_19.zip) = 70613 bytes
48SHA1 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 539bcf80b9a86c97406a3c79e7d10684b213a4be 48SHA1 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 539bcf80b9a86c97406a3c79e7d10684b213a4be
49RMD160 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 49273489651c1950376966955f28e4069165e818 49RMD160 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 49273489651c1950376966955f28e4069165e818
50Size (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 6046353 bytes 50Size (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 6046353 bytes
51SHA1 (openjdk7/openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = ebdf9ef3dd6fa9bbd22f8f97be807b85aac0f439 51SHA1 (openjdk7/openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = ebdf9ef3dd6fa9bbd22f8f97be807b85aac0f439
52RMD160 (openjdk7/openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = ee9837701f7243f6a4edca7d343bcac4a492ad7f 52RMD160 (openjdk7/openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = ee9837701f7243f6a4edca7d343bcac4a492ad7f
53Size (openjdk7/openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = 103796914 bytes 53Size (openjdk7/openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = 103796914 bytes
54SHA1 (openjdk7/rhino1_7R3.zip) = 81f39d6e24529d62b23a6a92a1a09af95495d7c1 54SHA1 (openjdk7/rhino1_7R3.zip) = 81f39d6e24529d62b23a6a92a1a09af95495d7c1
55RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0 55RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0
56Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes 56Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes
 57SHA1 (patch-Makefile) = a9e415d19c2a8edb96a60ffdf81c804476a8e2f6
57SHA1 (patch-aa) = 6c27af8648ef893100a965ef2a009439e7bae6af 58SHA1 (patch-aa) = 6c27af8648ef893100a965ef2a009439e7bae6af
58SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998 59SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998
59SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6 60SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6
60SHA1 (patch-ad) = 93ddbb82e8999c581e56e7bc3c194ff87e68d8b9 61SHA1 (patch-ad) = 93ddbb82e8999c581e56e7bc3c194ff87e68d8b9
61SHA1 (patch-ae) = 0bc7f2cf43835ce7d1e30e09a570e46a952a03e8 62SHA1 (patch-ae) = 0bc7f2cf43835ce7d1e30e09a570e46a952a03e8
62SHA1 (patch-af) = 203f61a448989130552a2fbef73f93d1734f4f66 63SHA1 (patch-af) = 203f61a448989130552a2fbef73f93d1734f4f66
63SHA1 (patch-ag) = 83ec8015b8e0f2657f4289cea84bdc9b6d0c5e88 64SHA1 (patch-ag) = 83ec8015b8e0f2657f4289cea84bdc9b6d0c5e88
64SHA1 (patch-ah) = a02db4b415b20146e8703d925b5ac9004606e035 65SHA1 (patch-ah) = 2d358879d2851fb2fb8161c5a1ac5a93aa7a69c2
65SHA1 (patch-ai) = bee1b592401d15a91e7d926c9011bcd0d83fb5ec 66SHA1 (patch-ai) = bee1b592401d15a91e7d926c9011bcd0d83fb5ec
66SHA1 (patch-aj) = b8f7f80e41ccc4fe9bb167d857c6a286b3b09f0a 67SHA1 (patch-aj) = b8f7f80e41ccc4fe9bb167d857c6a286b3b09f0a
67SHA1 (patch-ak) = 45beaba484a74fb47f74bec786c418781dc478e2 68SHA1 (patch-ak) = 45beaba484a74fb47f74bec786c418781dc478e2
68SHA1 (patch-al) = f52ad9a838357f03348344f09cabf00157bb18cd 69SHA1 (patch-al) = f52ad9a838357f03348344f09cabf00157bb18cd
69SHA1 (patch-am) = d9b30616a7803d1f10751a2c6950317c167c5703 70SHA1 (patch-am) = d9b30616a7803d1f10751a2c6950317c167c5703
70SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd 71SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd
71SHA1 (patch-ao) = 258f2a35b66d40c9b1917034eadda307d7a2dfb2 72SHA1 (patch-ao) = 6bfc842ceb0d7e03f9288e80fe762bd1d54cf503
72SHA1 (patch-ap) = 0ef305622c8d1ee1d5d6361b5af352251d52929a 73SHA1 (patch-ap) = 0ef305622c8d1ee1d5d6361b5af352251d52929a
73SHA1 (patch-aq) = 97303ebcdcf0251406eef816ae56c82c703dab9d 74SHA1 (patch-aq) = 97303ebcdcf0251406eef816ae56c82c703dab9d
74SHA1 (patch-ar) = 6544d4c7d4f30a3baeac95834e41ce8f7d41f9ec 75SHA1 (patch-ar) = 6544d4c7d4f30a3baeac95834e41ce8f7d41f9ec
75SHA1 (patch-as) = 0cef122fb4e8606a9f4923d44079156b89dca0c2 76SHA1 (patch-as) = 0cef122fb4e8606a9f4923d44079156b89dca0c2
76SHA1 (patch-at) = fdba3bdfccab8de333de08bcc0c9c52d3469d9a3 77SHA1 (patch-at) = fdba3bdfccab8de333de08bcc0c9c52d3469d9a3
77SHA1 (patch-aw) = b6de59de25cec67f2f8b776529df7bf23a5d870e 78SHA1 (patch-aw) = b6de59de25cec67f2f8b776529df7bf23a5d870e
78SHA1 (patch-ba) = 97e42aea28e4d7b63f41596690cd9f21c85622bf 79SHA1 (patch-ba) = 97e42aea28e4d7b63f41596690cd9f21c85622bf
79SHA1 (patch-bd) = b192cab222f76b5c05935946c6229117dd905423 80SHA1 (patch-bd) = b192cab222f76b5c05935946c6229117dd905423
80SHA1 (patch-bg) = 90328bd927c52e62d97c72fade2ceb70d42fe273 81SHA1 (patch-bg) = 90328bd927c52e62d97c72fade2ceb70d42fe273
81SHA1 (patch-bh) = 33b56c77da352e710350a9e210660a78b11930a6 82SHA1 (patch-bh) = 33b56c77da352e710350a9e210660a78b11930a6
82SHA1 (patch-bi) = 9323d54054e5b3112e96ba311014c8228009de1a 83SHA1 (patch-bi) = 9323d54054e5b3112e96ba311014c8228009de1a
83SHA1 (patch-bj) = 072939cfa9bc5d358393702f71cf98cae87b1743 84SHA1 (patch-bj) = 072939cfa9bc5d358393702f71cf98cae87b1743
84SHA1 (patch-bk) = cb6f2da6fb2bbecb981dbf454603c851c48f75bc 85SHA1 (patch-bk) = cb6f2da6fb2bbecb981dbf454603c851c48f75bc
85SHA1 (patch-bl) = 34b829c6768fc67c0c0471880ce642284be602bb 86SHA1 (patch-bl) = 34b829c6768fc67c0c0471880ce642284be602bb
86SHA1 (patch-bn) = e90012a3acbdeec1fe97d53ffa11816379ac90e9 87SHA1 (patch-bn) = e90012a3acbdeec1fe97d53ffa11816379ac90e9
87SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = e3b6d4683f1128bc1b2e5d8453608228da54e3d2 88SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = e3b6d4683f1128bc1b2e5d8453608228da54e3d2
88SHA1 (patch-corba_make_common_shared_Platform.gmk) = 88b779af38d2f88db873d74493e5d2721c04531f 89SHA1 (patch-corba_make_common_shared_Platform.gmk) = 0b15483bb55eb5d5f67d3fcab6b687a76de64e33
89SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 85eda2125ef39c5fe5fcfbc072bd8a3591d5c4bf 90SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 85eda2125ef39c5fe5fcfbc072bd8a3591d5c4bf
90SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14 91SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14
91SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239 92SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239
92SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 5d3003a2b98501cb17695d11f8d3bfc7737657bd 93SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 5d3003a2b98501cb17695d11f8d3bfc7737657bd
93SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = d0060b60463f3695a9a9d2e60841266233fd589d 94SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = d0060b60463f3695a9a9d2e60841266233fd589d
94SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 03bc8db5ac6623b63860a76d2d5cc4f26c44617b 95SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 03bc8db5ac6623b63860a76d2d5cc4f26c44617b
95SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = 805a45d52a715206fb4b964c6e7d533895059c30 96SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = eade4a72ac2d826bb7eb8b84bf49219519ead4bd
96SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 8028a9aa009ce34e434a62a231747143bd16966a 97SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 8028a9aa009ce34e434a62a231747143bd16966a
97SHA1 (patch-hotspot_make_solaris_makefiles_jvmg.make) = 4b14c61707d739f612943c41ab7f3ccc34106a18 98SHA1 (patch-hotspot_make_solaris_makefiles_jvmg.make) = 4b14c61707d739f612943c41ab7f3ccc34106a18
98SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 5163ebc52439f6fe1cdfde87b9b930744a485e70 99SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 5163ebc52439f6fe1cdfde87b9b930744a485e70
99SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc) = 690c750d9c0469cd6b71afed2633aa13373c2a7b 100SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc) = 690c750d9c0469cd6b71afed2633aa13373c2a7b
100SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc) = 9fbe6b4e8d4ef9e4ffc8361aa469a9ceacb331ff 101SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc) = 9fbe6b4e8d4ef9e4ffc8361aa469a9ceacb331ff
101SHA1 (patch-hotspot_make_solaris_makefiles_optimized.make) = 78d64fe6cb7c3420889884a450c0803d56e44850 102SHA1 (patch-hotspot_make_solaris_makefiles_optimized.make) = 78d64fe6cb7c3420889884a450c0803d56e44850
102SHA1 (patch-hotspot_make_solaris_makefiles_product.make) = 6105c8e7f8b612e70957bccf7313384488388aa5 103SHA1 (patch-hotspot_make_solaris_makefiles_product.make) = 6105c8e7f8b612e70957bccf7313384488388aa5
103SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 8a034088ca3c9f5a625849b772dd51f65fad0b43 104SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 8a034088ca3c9f5a625849b772dd51f65fad0b43
104SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = dfa30c806ceacd2598483a8e1138c2c757462311 105SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = dfa30c806ceacd2598483a8e1138c2c757462311
105SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6 106SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6
106SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c 107SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c
107SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = 7099b9bc230869edced8d521513173ab5bd0fa3f 108SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = 7099b9bc230869edced8d521513173ab5bd0fa3f
108SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 5679710d8dc743b5e9820057cc1800471c6ac40b 109SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 5679710d8dc743b5e9820057cc1800471c6ac40b
109SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp) = 062a3cf87793867b68d497b75f5fef55ed6e1666 110SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp) = 062a3cf87793867b68d497b75f5fef55ed6e1666
110SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = da6017447c5537048fcf04198c400f96568dc6e2 111SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = da6017447c5537048fcf04198c400f96568dc6e2
111SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9ba3c57e98f65cc8 112SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9ba3c57e98f65cc8
112SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47 113SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47
113SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = cf7c6226ad7c322f43df900be0e69686ca3a7a57 114SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = cf7c6226ad7c322f43df900be0e69686ca3a7a57
114SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = 7d244b859debf4f68e49fe6fb36fe2598951fcdb 115SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = 7d244b859debf4f68e49fe6fb36fe2598951fcdb
115SHA1 (patch-jdk_make_com_sun_Makefile) = 7b3b8163a4343b820f50b00babd4363c141ada67 116SHA1 (patch-jdk_make_com_sun_Makefile) = 7b3b8163a4343b820f50b00babd4363c141ada67
116SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46 117SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46
 118SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 65fa2d6191311766cdb5d9933d760cae7955f664
117SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3 119SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3
118SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = 32c0bbd91ec0c85eb725cd721ed759c6d6499f50 120SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = 32c0bbd91ec0c85eb725cd721ed759c6d6499f50
119SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70 121SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70
120SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6 122SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6
121SHA1 (patch-jdk_make_common_Program.gmk) = 2ccab79ba7b84aa418c63d7f2a6f2a8b9e519b64 123SHA1 (patch-jdk_make_common_Program.gmk) = e2ac51824f54baeb65d3323adc87dec100c7ed0a
122SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2 124SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2
123SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = bb5d55282bf100986c397e41b1be4d25e73232dc 125SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = bb5d55282bf100986c397e41b1be4d25e73232dc
124SHA1 (patch-jdk_make_common_shared_Defs-versions.gmk) = 20a9492180db88cf78bc107f1e2fc4a9101d2eab 126SHA1 (patch-jdk_make_common_shared_Defs-versions.gmk) = 20a9492180db88cf78bc107f1e2fc4a9101d2eab
 127SHA1 (patch-jdk_make_java_Makefile) = c670455f8979b14fe44f0a285d0adfb2666d0005
125SHA1 (patch-jdk_make_java_instrument_Makefile) = c9bd9bf27d9f2971d59762320e5cf9d25c2c4852 128SHA1 (patch-jdk_make_java_instrument_Makefile) = c9bd9bf27d9f2971d59762320e5cf9d25c2c4852
126SHA1 (patch-jdk_make_java_nio_Makefile) = d4b8b830ce73841ae107f8485400ab6116b9ca3c 129SHA1 (patch-jdk_make_java_nio_Makefile) = d4b8b830ce73841ae107f8485400ab6116b9ca3c
127SHA1 (patch-jdk_make_java_npt_Makefile) = bf7505c30fe3e9014399bc5ce618c5dc40aef62b 130SHA1 (patch-jdk_make_java_npt_Makefile) = bf7505c30fe3e9014399bc5ce618c5dc40aef62b
128SHA1 (patch-jdk_make_sun_awt_Makefile) = 981082d4dfda204f09a66b9fc452bea218d3ce6a 131SHA1 (patch-jdk_make_sun_awt_Makefile) = 981082d4dfda204f09a66b9fc452bea218d3ce6a
129SHA1 (patch-jdk_make_sun_awt_mawt.gmk) = aa694522a6b75a5ac30d7fe3a530e3feb6563d30 132SHA1 (patch-jdk_make_sun_awt_mawt.gmk) = aa694522a6b75a5ac30d7fe3a530e3feb6563d30
 133SHA1 (patch-jdk_make_sun_rmi_rmi_Makefile) = ef42db5c61e940b66dfead0e9fcf328d125b3460
130SHA1 (patch-jdk_make_sun_security_ec_Makefile) = 30e35128a763b8d70e02e302f2e3ae5b7a24a99b 134SHA1 (patch-jdk_make_sun_security_ec_Makefile) = 30e35128a763b8d70e02e302f2e3ae5b7a24a99b
131SHA1 (patch-jdk_make_sun_splashscreen_Makefile) = fa6e9a60c1e0908c9c31761608a25bffc8093a60 135SHA1 (patch-jdk_make_sun_splashscreen_Makefile) = fa6e9a60c1e0908c9c31761608a25bffc8093a60
132SHA1 (patch-jdk_make_sun_xawt_Makefile) = 735cf251798c2b6a638fc57dc90fe0750433f26d 136SHA1 (patch-jdk_make_sun_xawt_Makefile) = 735cf251798c2b6a638fc57dc90fe0750433f26d
133SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java) = 9e9c0254740742cd103c0cb33d3aa564ad7de01f 137SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java) = 9e9c0254740742cd103c0cb33d3aa564ad7de01f
134SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java) = 85ddae5aa955ef951b2a9964b5f475f559c3c335 138SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java) = 85ddae5aa955ef951b2a9964b5f475f559c3c335
135SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java) = d8327c56a99ef6af8b3dfaf31e20bdebab5d6d44 139SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java) = d8327c56a99ef6af8b3dfaf31e20bdebab5d6d44
136SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java) = 75f2112f9b0295511b134122b1254cb51f961cda 140SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java) = 75f2112f9b0295511b134122b1254cb51f961cda
137SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java) = c7bbf14f618095e1340849d14ccf130b5d8e0a00 141SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java) = c7bbf14f618095e1340849d14ccf130b5d8e0a00
138SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java) = 6bc7612c49c5878e6d87c565872b1009cdcc9507 142SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java) = 6bc7612c49c5878e6d87c565872b1009cdcc9507
139SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java) = 64659b0845bf19680bc5d3d2d34b8eac5ada3994 143SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java) = 64659b0845bf19680bc5d3d2d34b8eac5ada3994
140SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java) = 9663c73cb02170040256fd880ae51dd1353747e5 144SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java) = 9663c73cb02170040256fd880ae51dd1353747e5
141SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java) = b34d66405825fb4173eb5b517e004ae724686155 145SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java) = b34d66405825fb4173eb5b517e004ae724686155
142SHA1 (patch-jdk_src_share_native_com_sun_java_util_jar_pack_defines.h) = 23ea055894e3a77dc9e3be1c627d4b0dde342221 146SHA1 (patch-jdk_src_share_native_com_sun_java_util_jar_pack_defines.h) = 23ea055894e3a77dc9e3be1c627d4b0dde342221
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-Makefile
$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
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_com_sun_jmx_Makefile
$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)
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_java_Makefile
$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
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_sun_rmi_rmi_Makefile
$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
cvs diff -r1.4 -r1.5 pkgsrc/lang/openjdk7/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-ah 2013/06/15 09:31:05 1.4
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-ah 2013/06/23 17:39:43 1.5
@@ -1,19 +1,30 @@ @@ -1,19 +1,30 @@
1$NetBSD: patch-ah,v 1.4 2013/06/15 09:31:05 jperkin Exp $ 1$NetBSD: patch-ah,v 1.5 2013/06/23 17:39:43 jperkin Exp $
2 2
3DragonFly support. 3DragonFly support.
4 4
5--- jdk/make/common/shared/Platform.gmk.orig 2013-05-29 03:57:57.000000000 +0000 5Disable SunOS multiarch.
 6
 7--- jdk/make/common/shared/Platform.gmk.orig 2013-06-21 13:12:13.786915027 +0000
6+++ jdk/make/common/shared/Platform.gmk 8+++ jdk/make/common/shared/Platform.gmk
 9@@ -119,7 +119,7 @@ ifeq ($(SYSTEM_UNAME), SunOS)
 10 ARCH := $(shell isainfo -n)
 11 # ISA_DIR is used to locate 64-bit specific libraries which are generally
 12 # in the same general place as other libraries under the ./$(ARCH) directory
 13- ISA_DIR = /$(ARCH)
 14+ NOMULTIARCHISA_DIR = /$(ARCH)
 15 endif
 16 # Need to maintain the jre/lib/i386 location for 32-bit Intel
 17 ifeq ($(ARCH), i586)
7@@ -224,6 +224,13 @@ ifeq ($(SYSTEM_UNAME), Linux) 18@@ -224,6 +224,13 @@ ifeq ($(SYSTEM_UNAME), Linux)
8 MB_OF_MEMORY := $(shell free -m | fgrep Mem: | awk '{print $$2;}' ) 19 MB_OF_MEMORY := $(shell free -m | fgrep Mem: | awk '{print $$2;}' )
9 endif 20 endif
10  21
11+ifeq ($(SYSTEM_UNAME), DragonFly) 22+ifeq ($(SYSTEM_UNAME), DragonFly)
12+ PLATFORM = bsd 23+ PLATFORM = bsd
13+ OS_NAME = dragonfly 24+ OS_NAME = dragonfly
14+ OS_VENDOR = DragonFlyBSD 25+ OS_VENDOR = DragonFlyBSD
15+ REQUIRED_OS_VERSION = 2.4 26+ REQUIRED_OS_VERSION = 2.4
16+endif 27+endif
17+ 28+
18 ifeq ($(SYSTEM_UNAME), Darwin) 29 ifeq ($(SYSTEM_UNAME), Darwin)
19 PLATFORM = macosx 30 PLATFORM = macosx
cvs diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/Attic/patch-ao (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-ao 2013/06/15 09:31:05 1.3
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-ao 2013/06/23 17:39:43 1.4
@@ -1,19 +1,39 @@ @@ -1,19 +1,39 @@
1$NetBSD: patch-ao,v 1.3 2013/06/15 09:31:05 jperkin Exp $ 1$NetBSD: patch-ao,v 1.4 2013/06/23 17:39:43 jperkin Exp $
2 2
3Support rhino. 3Support rhino.
4 4
5--- jdk/make/common/Release.gmk.orig 2013-05-29 03:57:57.000000000 +0000 5Disable SunOS multiarch.
 6
 7--- jdk/make/common/Release.gmk.orig 2013-06-21 13:12:13.781215177 +0000
6+++ jdk/make/common/Release.gmk 8+++ jdk/make/common/Release.gmk
 9@@ -67,7 +67,7 @@ EXPORTED_PRIVATE_PKGS = com.sun.servicet
 10 # 64-bit solaris has a few special cases. We define the variable
 11 # SOLARIS64 for use in this Makefile to easily test those cases
 12 ifeq ($(PLATFORM), solaris)
 13- ifeq ($(ARCH_DATA_MODEL), 64)
 14+ ifeq ($(ARCH_DATA_MODEL), NOMULTIARCH64)
 15 SOLARIS64 = true
 16 IMAGE_BINDIR = bin/$(ARCH)
 17 endif
 18@@ -227,7 +227,7 @@ endif
 19 INITIAL_IMAGE_JRE=initial-image-jre
 20 INITIAL_IMAGE_JDK=initial-image-jdk
 21 ifeq ($(PLATFORM), solaris)
 22- ifeq ($(ARCH_DATA_MODEL), 64)
 23+ ifeq ($(ARCH_DATA_MODEL), NOMULTIARCH64)
 24 INITIAL_IMAGE_JRE=initial-image-jre-sol64
 25 INITIAL_IMAGE_JDK=initial-image-jdk-sol64
 26 endif
7@@ -842,6 +842,7 @@ initial-image-jre:: initial-image-jre-se 27@@ -842,6 +842,7 @@ initial-image-jre:: initial-image-jre-se
8 $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar 28 $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
9 $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar 29 $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
10 $(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar 30 $(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
11+ $(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar 31+ $(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
12 ifneq ($(JFR_JAR),) 32 ifneq ($(JFR_JAR),)
13 $(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar 33 $(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar
14 endif 34 endif
15@@ -1170,7 +1171,8 @@ initial-image-jdk:: initial-image-jdk-se 35@@ -1170,7 +1171,8 @@ initial-image-jdk:: initial-image-jdk-se
16 @# 36 @#
17 @# Swing BeanInfo generation 37 @# Swing BeanInfo generation
18 @# 38 @#
19- $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans 39- $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans
cvs diff -r1.1 -r1.2 pkgsrc/lang/openjdk7/patches/Attic/patch-corba_make_common_shared_Platform.gmk (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-corba_make_common_shared_Platform.gmk 2013/06/15 09:31:05 1.1
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-corba_make_common_shared_Platform.gmk 2013/06/23 17:39:43 1.2
@@ -1,15 +1,26 @@ @@ -1,15 +1,26 @@
1$NetBSD: patch-corba_make_common_shared_Platform.gmk,v 1.1 2013/06/15 09:31:05 jperkin Exp $ 1$NetBSD: patch-corba_make_common_shared_Platform.gmk,v 1.2 2013/06/23 17:39:43 jperkin Exp $
2 2
3Avoid warnings when building in a zone. 3Avoid warnings when building in a zone.
4 4
5--- corba/make/common/shared/Platform.gmk.orig 2013-02-20 04:35:29.000000000 +0000 5Disable multiarch support.
 6
 7--- corba/make/common/shared/Platform.gmk.orig 2013-06-21 13:12:15.317583446 +0000
6+++ corba/make/common/shared/Platform.gmk 8+++ corba/make/common/shared/Platform.gmk
 9@@ -115,7 +115,7 @@ ifeq ($(SYSTEM_UNAME), SunOS)
 10 ARCH := $(shell isainfo -n)
 11 # ISA_DIR is used to locate 64-bit specific libraries which are generally
 12 # in the same general place as other libraries under the ./$(ARCH) directory
 13- ISA_DIR = /$(ARCH)
 14+ NOMULTIARCHISA_DIR = /$(ARCH)
 15 endif
 16 # Need to maintain the jre/lib/i386 location for 32-bit Intel
 17 ifeq ($(ARCH), i586)
7@@ -143,7 +143,7 @@ ifeq ($(SYSTEM_UNAME), SunOS) 18@@ -143,7 +143,7 @@ ifeq ($(SYSTEM_UNAME), SunOS)
8 REQUIRED_FREE_SPACE=1040000 19 REQUIRED_FREE_SPACE=1040000
9 endif 20 endif
10 # How much RAM does this machine have: 21 # How much RAM does this machine have:
11- MB_OF_MEMORY=$(shell /etc/prtconf | fgrep 'Memory size:' | expand | cut -d' ' -f3) 22- MB_OF_MEMORY=$(shell /etc/prtconf | fgrep 'Memory size:' | expand | cut -d' ' -f3)
12+ MB_OF_MEMORY=$(shell /usr/sbin/prtconf 2>&1 | fgrep 'Memory size:' | expand | cut -d' ' -f3) 23+ MB_OF_MEMORY=$(shell /usr/sbin/prtconf 2>&1 | fgrep 'Memory size:' | expand | cut -d' ' -f3)
13 endif 24 endif
14  25
15 # Platform settings specific to Linux 26 # Platform settings specific to Linux
cvs diff -r1.1 -r1.2 pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_gcc.make (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_gcc.make 2013/06/15 09:31:05 1.1
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_gcc.make 2013/06/23 17:39:43 1.2
@@ -1,87 +1,99 @@ @@ -1,87 +1,99 @@
1$NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $ 1$NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.2 2013/06/23 17:39:43 jperkin Exp $
2 2
3GCC support. 3GCC support.
4 4
 5Disable SunOS multiarch.
 6
5--- hotspot/make/solaris/makefiles/gcc.make.orig 2012-08-10 16:23:14.000000000 +0000 7--- hotspot/make/solaris/makefiles/gcc.make.orig 2012-08-10 16:23:14.000000000 +0000
6+++ hotspot/make/solaris/makefiles/gcc.make 8+++ hotspot/make/solaris/makefiles/gcc.make
7@@ -66,11 +66,23 @@ VM_PICFLAG/LIBJVM = $(PICFLAG) 9@@ -66,11 +66,23 @@ VM_PICFLAG/LIBJVM = $(PICFLAG)
8 VM_PICFLAG/AOUT = 10 VM_PICFLAG/AOUT =
9 VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO)) 11 VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
10  12
11+ifeq ($(JVM_VARIANT_ZERO), true) 13+ifeq ($(JVM_VARIANT_ZERO), true)
12+ CFLAGS += $(LIBFFI_CFLAGS) 14+ CFLAGS += $(LIBFFI_CFLAGS)
13+endif 15+endif
14+ifeq ($(JVM_VARIANT_ZEROSHARK), true) 16+ifeq ($(JVM_VARIANT_ZEROSHARK), true)
15+ CFLAGS += $(LIBFFI_CFLAGS) 17+ CFLAGS += $(LIBFFI_CFLAGS)
16+ CFLAGS += $(LLVM_CFLAGS) 18+ CFLAGS += $(LLVM_CFLAGS)
17+endif 19+endif
18 CFLAGS += $(VM_PICFLAG) 20 CFLAGS += $(VM_PICFLAG)
19 CFLAGS += -fno-rtti 21 CFLAGS += -fno-rtti
20 CFLAGS += -fno-exceptions 22 CFLAGS += -fno-exceptions
21 CFLAGS += -D_REENTRANT 23 CFLAGS += -D_REENTRANT
22 CFLAGS += -fcheck-new 24 CFLAGS += -fcheck-new
23+# version 4 and above support fvisibility=hidden (matches jni_x86.h file) 25+# version 4 and above support fvisibility=hidden (matches jni_x86.h file)
24+# except 4.1.2 gives pointless warnings that can't be disabled (afaik) 26+# except 4.1.2 gives pointless warnings that can't be disabled (afaik)
25+ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" 27+ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
26+ CFLAGS += -fvisibility=hidden 28+ CFLAGS += -fvisibility=hidden
27+endif 29+endif
28  30
29 ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) 31 ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
30  32
31@@ -103,6 +115,11 @@ ifdef CC_INTERP 33@@ -82,7 +94,8 @@ ARCHFLAG/amd64 = -m64 -march=k8
 34
 35 # Optional sub-directory in /usr/lib where BUILDARCH libraries are kept.
 36 ISA_DIR=$(ISA_DIR/$(BUILDARCH))
 37-ISA_DIR/amd64=/amd64
 38+ISA_DIR/amd64=
 39+NOMULTIARCHISA_DIR/amd64=/amd64
 40 ISA_DIR/i486=
 41 ISA_DIR/sparcv9=/64
 42
 43@@ -103,6 +116,11 @@ ifdef CC_INTERP
32 CFLAGS += -DCC_INTERP 44 CFLAGS += -DCC_INTERP
33 endif 45 endif
34  46
35+# Build for embedded targets 47+# Build for embedded targets
36+ifdef JAVASE_EMBEDDED 48+ifdef JAVASE_EMBEDDED
37+ CFLAGS += -DJAVASE_EMBEDDED 49+ CFLAGS += -DJAVASE_EMBEDDED
38+endif 50+endif
39+ 51+
40 # Keep temporary files (.ii, .s) 52 # Keep temporary files (.ii, .s)
41 ifdef NEED_ASM 53 ifdef NEED_ASM
42 CFLAGS += -save-temps 54 CFLAGS += -save-temps
43@@ -113,9 +130,18 @@ endif 55@@ -113,9 +131,18 @@ endif
44  56
45 # Compiler warnings are treated as errors  57 # Compiler warnings are treated as errors
46 WARNINGS_ARE_ERRORS = -Werror  58 WARNINGS_ARE_ERRORS = -Werror
47-# Enable these warnings. See 'info gcc' about details on these options 59-# Enable these warnings. See 'info gcc' about details on these options
48-ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare  60-ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
49-CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS)  61-CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS)
50+ 62+
51+# Except for a few acceptable ones 63+# Except for a few acceptable ones
52+# Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit 64+# Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
53+# conversions which might affect the values. To avoid that, we need to turn 65+# conversions which might affect the values. To avoid that, we need to turn
54+# it off explicitly.  66+# it off explicitly.
55+ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" 67+ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
56+ ACCEPTABLE_WARNINGS = -Wpointer-arith -Wsign-compare 68+ ACCEPTABLE_WARNINGS = -Wpointer-arith -Wsign-compare
57+else 69+else
58+ ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare 70+ ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
59+endif 71+endif
60+ 72+
61+CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) 73+CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
62 # Special cases  74 # Special cases
63 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))  75 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
64  76
65@@ -173,7 +199,7 @@ MAPFLAG = -Xlinker -M -Xlinker FILENAME 77@@ -173,7 +200,7 @@ MAPFLAG = -Xlinker -M -Xlinker FILENAME
66 endif  78 endif
67  79
68 # Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj 80 # Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj
69-SONAMEFLAG = -Xlinker -soname=SONAME 81-SONAMEFLAG = -Xlinker -soname=SONAME
70+SONAMEFLAG = -Wl,-soname=SONAME 82+SONAMEFLAG = -Wl,-soname=SONAME
71  83
72 # Build shared library 84 # Build shared library
73 SHARED_FLAG = -shared 85 SHARED_FLAG = -shared
74@@ -181,17 +207,34 @@ SHARED_FLAG = -shared 86@@ -181,17 +208,34 @@ SHARED_FLAG = -shared
75 #------------------------------------------------------------------------ 87 #------------------------------------------------------------------------
76 # Debug flags 88 # Debug flags
77  89
78-# Use the stabs format for debugging information (this is the default  90-# Use the stabs format for debugging information (this is the default
79-# on gcc-2.91). It's good enough, has all the information about line  91-# on gcc-2.91). It's good enough, has all the information about line
80-# numbers and local variables, and libjvm_g.so is only about 16M.  92-# numbers and local variables, and libjvm_g.so is only about 16M.
81-# Change this back to "-g" if you want the most expressive format.  93-# Change this back to "-g" if you want the most expressive format.
82-# (warning: that could easily inflate libjvm_g.so to 150M!)  94-# (warning: that could easily inflate libjvm_g.so to 150M!)
83-# Note: The Itanium gcc compiler crashes when using -gstabs.  95-# Note: The Itanium gcc compiler crashes when using -gstabs.
84-DEBUG_CFLAGS/ia64 = -g  96-DEBUG_CFLAGS/ia64 = -g
85-DEBUG_CFLAGS/amd64 = -g  97-DEBUG_CFLAGS/amd64 = -g
86-DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH))  98-DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH))
87-ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)  99-ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)
cvs diff -r1.1 -r1.2 pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_common_Program.gmk (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_common_Program.gmk 2013/06/15 09:31:06 1.1
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_common_Program.gmk 2013/06/23 17:39:43 1.2
@@ -1,36 +1,46 @@ @@ -1,36 +1,46 @@
1$NetBSD: patch-jdk_make_common_Program.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $ 1$NetBSD: patch-jdk_make_common_Program.gmk,v 1.2 2013/06/23 17:39:43 jperkin Exp $
2 2
3GCC support. 3GCC support.
4 4
5--- jdk/make/common/Program.gmk.orig 2013-06-11 09:37:03.843509400 +0000 5--- jdk/make/common/Program.gmk.orig 2013-06-18 09:09:41.950128156 +0000
6+++ jdk/make/common/Program.gmk 6+++ jdk/make/common/Program.gmk
7@@ -65,7 +65,10 @@ program: $(ACTUAL_PROGRAM) 7@@ -65,7 +65,10 @@ program: $(ACTUAL_PROGRAM)
8 ifndef CROSS_COMPILE_ARCH 8 ifndef CROSS_COMPILE_ARCH
9 # reuse the mapfiles in the launcher's directory, the same should 9 # reuse the mapfiles in the launcher's directory, the same should
10 # be applicable to the tool launchers as well. 10 # be applicable to the tool launchers as well.
11- FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH) 11- FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH)
12+ # Except when the makefile requests a specific mapfile. 12+ # Except when the makefile requests a specific mapfile.
13+ ifndef FILES_m 13+ ifndef FILES_m
14+ FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH) 14+ FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH)
15+ endif # ! FILES_m 15+ endif # ! FILES_m
16 include $(BUILDDIR)/common/Mapfile-vers.gmk 16 include $(BUILDDIR)/common/Mapfile-vers.gmk
17 endif 17 endif
18  18
19@@ -110,6 +113,7 @@ ifneq (,$(findstring $(PLATFORM), linux 19@@ -110,12 +113,13 @@ ifneq (,$(findstring $(PLATFORM), linux
20 LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli 20 LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
21 OTHER_LDLIBS += -ljli 21 OTHER_LDLIBS += -ljli
22 ifeq ($(PLATFORM), solaris) 22 ifeq ($(PLATFORM), solaris)
23+ LDFLAGS += -R ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}/jli 23+ LDFLAGS += -R ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}/jli
24 ifeq ($(ARCH_DATA_MODEL), 32) 24 ifeq ($(ARCH_DATA_MODEL), 32)
25 LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli 25- LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli
26 LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli 26- LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli
 27+# LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli
 28+# LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli
 29 else # ! ARCH_DATA_MODEL 64-bit
 30- LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli
 31- LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli
 32+# LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli
 33+# LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli
 34 endif # ARCH_DATA_MODEL
 35 endif # PLATFORM SOLARIS
 36 ifeq ($(PLATFORM), linux)
27@@ -124,6 +128,9 @@ ifneq (,$(findstring $(PLATFORM), linux 37@@ -124,6 +128,9 @@ ifneq (,$(findstring $(PLATFORM), linux
28 LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli 38 LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
29 LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli 39 LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
30 endif # PLATFORM LINUX 40 endif # PLATFORM LINUX
31+ ifeq ($(SYSTEM_ZLIB),true) 41+ ifeq ($(SYSTEM_ZLIB),true)
32+ OTHER_LDLIBS += $(ZLIB_LIBS) 42+ OTHER_LDLIBS += $(ZLIB_LIBS)
33+ endif # SYSTEM_ZLIB 43+ endif # SYSTEM_ZLIB
34 endif # PLATFORM linux solaris 44 endif # PLATFORM linux solaris
35  45
36 ifeq ($(PLATFORM), windows) 46 ifeq ($(PLATFORM), windows)