[arch-commits] Commit in java7-openjdk/trunk (3 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Wed Feb 15 10:58:40 EST 2012


    Date: Wednesday, February 15, 2012 @ 10:58:39
  Author: andyrtr
Revision: 150233

upgpkg: java7-openjdk 7.b147_2.1-1

upstream update Icedtea 2.1 based on Oracle Java 7u3

Modified:
  java7-openjdk/trunk/PKGBUILD
  java7-openjdk/trunk/openjdk7_fix_jdk_cmds_path.diff
Deleted:
  java7-openjdk/trunk/glibc2_15.diff

---------------------------------+
 PKGBUILD                        |   63 +++++-----
 glibc2_15.diff                  |  232 --------------------------------------
 openjdk7_fix_jdk_cmds_path.diff |   22 +++
 3 files changed, 53 insertions(+), 264 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-15 10:39:26 UTC (rev 150232)
+++ PKGBUILD	2012-02-15 15:58:39 UTC (rev 150233)
@@ -9,33 +9,33 @@
 _java_ver=7
 _openjdk_build=b147
 _openjdk_date=27_jun_2011
-_icedtea_ver=2.0
+_icedtea_ver=2.1
 _date=20110922
 
 # check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=4d9e4fb8af09
-_HOTSPOT_CHANGESET=b28ae681bae0
-_JAXP_CHANGESET=948e734135ea
-_JAXWS_CHANGESET=a2ebfdc9db7e
-_JDK_CHANGESET=2054526dd141
-_LANGTOOLS_CHANGESET=9b85f1265346
-_OPENJDK_CHANGESET=0a76e5390e68
+_CORBA_CHANGESET=5617f6c5cc94
+_HOTSPOT_CHANGESET=0e651e004747
+_JAXP_CHANGESET=1cf75c0e2c96
+_JAXWS_CHANGESET=7edfbfe974f2
+_JDK_CHANGESET=50f6f276a06c
+_LANGTOOLS_CHANGESET=b534c4c6cd9b
+_OPENJDK_CHANGESET=22cc03983e20
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
 pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=6
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
 options=('!emptydirs')
 makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
              'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
-             'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # fastjar`?
+             'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # 'inetutils' 'grep') # fastjar`?
 [ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
 
-_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0
-source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
+_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1
+source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz{,.sig}
         ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz						# openjdk.tar.gz
         ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz					# corba.tar.gz
         ${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz						# jaxp.tar.gz
@@ -50,25 +50,24 @@
         jdk7-openjdk.profile
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
-        jre7-openjdk.profile.csh
-        glibc2_15.diff)
-md5sums=('752721a037a625001fad7a5fc2013f60'
-         '4c34ddf70124ea90c79201c1afede3e3'
-         '8f8d222d0a6d363d06b40576da5f1ea2'
-         '4abf34372e34cccd74ad337e487ed790'
-         'f2f40590a83889b8aa1d4631b705092d'
-         'd3beed0118bbd93d4651af762eb748c7'
-         'c8617700b4bd6cd5de1257bc36509bed'
-         'f10b711b0c784df8707808d9d0f52abd'
-         'ee1afda124d5927345014ab382ef581e'
-         'f7e7a212e50abb56a6ef1a2b1bd27405'
-         'c195c4865b84d9e2e0fd71ac6d88eadb'
-         '203640d6e79e41b0065e016818c17ccd'
-         'b7b8996448c7b4fa7dd2d744488ed3bd'
-         'cdabafad0ec413d9a983888bf445a443'
-         '612b0fec7e0943c37a6de77c43622007'
-         '62443459da0cb28181feb260dc0e5ce7'
-         'a4293acadff03bdccbc9b412ad288549')
+        jre7-openjdk.profile.csh)
+sha256sums=('8492920dccae8b76bcb41f91f8d98b2dc619380531a679f1f9ea4e166ad02ec6'
+            '8d127e8397a0af3ffd8d1d96102a053d065d5507946f5c7118c0427668ac4227'
+            'ada790b4754f521ebfad0dd909ea29b92b2b3c1b84b2e99d32673343727d95d7'
+            '963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3'
+            '8ce48c704f38285207ee6dc56c45b2d214083b4d4d36be02901401b594ce701e'
+            '823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa'
+            '5f8b5edbebb358730425e64a31eaa11c346467ba10ffe1848f2d2ad2ea53bc3d'
+            'c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c'
+            'd68455e5cdb14280cd61155a4e9d531e90b073607f4367e93ead0fcf34476ae1'
+            '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
+            '6384026ee4854a4ebcd5203845f0a56126aaf34517e99cfbc16c3ea353c55fe5'
+            '9b3aa677773356d8b67300f99ad21118426e83f092392096726fcf123173008c'
+            '14cf334b7e79e0086b446ba1b172b7cc4ad09668f52c9b12077020a3ded3c3e7'
+            '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410'
+            '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
+            'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a'
+            '84d3b91cc57c67b2cf2ddb7fe5abcf1e88b5a151565aaecf4b595c7ce8f3fee9')
 
 #http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
 
@@ -100,7 +99,7 @@
   . /etc/profile.d/apache-ant.sh
 
   cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
-  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff patches/glibc2_15.diff"
+  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff"
 
   if [ "$_bootstrap" = "1" ]; then
      BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"

Deleted: glibc2_15.diff
===================================================================
--- glibc2_15.diff	2012-02-15 10:39:26 UTC (rev 150232)
+++ glibc2_15.diff	2012-02-15 15:58:39 UTC (rev 150233)
@@ -1,232 +0,0 @@
-
-# HG changeset patch
-# User never
-# Date 1319555835 25200
-# Node ID a6eef545f1a2ceca6aeadf688a965df600ffef28
-# Parent 2ec638646e86e455978c31a9d47fc0ec271ed926
-7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
-Reviewed-by: never
-Contributed-by: Omair Majid <omajid at redhat.com>
-
---- openjdk/hotspot/src/share/vm/opto/addnode.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/opto/addnode.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -33,8 +33,6 @@
- #include "opto/subnode.hpp"
- 
- // Portions of code courtesy of Clifford Click
--
--#define MAXFLOAT        ((float)3.40282346638528860e+38)
- 
- // Classic Add functionality.  This covers all the usual 'add' behaviors for
- // an algebraic ring.  Add-integer, add-float, add-double, and binary-or are
---- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -107,7 +107,7 @@ extern "C" {                            
-     if (env != xenv) {                                                   \
-       NativeReportJNIFatalError(thr, warn_wrong_jnienv);                 \
-     }                                                                    \
--    __ENTRY(result_type, header, thr)
-+    VM_ENTRY_BASE(result_type, header, thr)
- 
- 
- #define UNCHECKED() (unchecked_jni_NativeInterface)
---- openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl	Tue Oct 25 08:17:15 2011 -0700
-@@ -426,7 +426,7 @@ struct jvmtiInterface_1_ jvmti</xsl:text
-     <xsl:value-of select="$space"/>
-     <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text>
-     <xsl:value-of select="$space"/>
--    <xsl:text>__ENTRY(jvmtiError, </xsl:text>
-+    <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text>
-     <xsl:apply-templates select="." mode="functionid"/>
-     <xsl:text> , current_thread)</xsl:text>
-     <xsl:value-of select="$space"/>
---- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -173,7 +173,7 @@ JvmtiEnv::GetThreadLocalStorage(jthread 
-     // from native so as to resolve the jthread.
- 
-     ThreadInVMfromNative __tiv(current_thread);
--    __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
-+    VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
-     debug_only(VMNativeEntryWrapper __vew;)
- 
-     oop thread_oop = JNIHandles::resolve_external_guard(thread);
---- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -373,7 +373,7 @@ JvmtiExport::get_jvmti_interface(JavaVM 
-     JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread();
-     // transition code: native to VM
-     ThreadInVMfromNative __tiv(current_thread);
--    __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
-+    VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
-     debug_only(VMNativeEntryWrapper __vew;)
- 
-     JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
---- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -72,9 +72,9 @@ class HandleMarkCleaner: public StackObj
-   }
- };
- 
--// InterfaceSupport provides functionality used by the __LEAF and __ENTRY
--// macros. These macros are used to guard entry points into the VM and
--// perform checks upon leave of the VM.
-+// InterfaceSupport provides functionality used by the VM_LEAF_BASE and
-+// VM_ENTRY_BASE macros. These macros are used to guard entry points into
-+// the VM and perform checks upon leave of the VM.
- 
- 
- class InterfaceSupport: AllStatic {
-@@ -433,7 +433,7 @@ class RuntimeHistogramElement : public H
- 
- // LEAF routines do not lock, GC or throw exceptions
- 
--#define __LEAF(result_type, header)                                  \
-+#define VM_LEAF_BASE(result_type, header)                            \
-   TRACE_CALL(result_type, header)                                    \
-   debug_only(NoHandleMark __hm;)                                     \
-   /* begin of body */
-@@ -441,7 +441,7 @@ class RuntimeHistogramElement : public H
- 
- // ENTRY routines may lock, GC and throw exceptions
- 
--#define __ENTRY(result_type, header, thread)                         \
-+#define VM_ENTRY_BASE(result_type, header, thread)                   \
-   TRACE_CALL(result_type, header)                                    \
-   HandleMarkCleaner __hm(thread);                                    \
-   Thread* THREAD = thread;                                           \
-@@ -450,7 +450,7 @@ class RuntimeHistogramElement : public H
- 
- // QUICK_ENTRY routines behave like ENTRY but without a handle mark
- 
--#define __QUICK_ENTRY(result_type, header, thread)                   \
-+#define VM_QUICK_ENTRY_BASE(result_type, header, thread)             \
-   TRACE_CALL(result_type, header)                                    \
-   debug_only(NoHandleMark __hm;)                                     \
-   Thread* THREAD = thread;                                           \
-@@ -463,20 +463,20 @@ class RuntimeHistogramElement : public H
- #define IRT_ENTRY(result_type, header)                               \
-   result_type header {                                               \
-     ThreadInVMfromJava __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- 
- #define IRT_LEAF(result_type, header)                                \
-   result_type header {                                               \
--    __LEAF(result_type, header)                                      \
-+    VM_LEAF_BASE(result_type, header)                                \
-     debug_only(No_Safepoint_Verifier __nspv(true);)
- 
- 
- #define IRT_ENTRY_NO_ASYNC(result_type, header)                      \
-   result_type header {                                               \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- // Another special case for nmethod_entry_point so the nmethod that the
-@@ -487,7 +487,7 @@ class RuntimeHistogramElement : public H
-   result_type header {                                               \
-     nmethodLocker _nmlock(nm);                                       \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- #define IRT_END }
- 
-@@ -497,20 +497,20 @@ class RuntimeHistogramElement : public H
- #define JRT_ENTRY(result_type, header)                               \
-   result_type header {                                               \
-     ThreadInVMfromJava __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- 
- #define JRT_LEAF(result_type, header)                                \
-   result_type header {                                               \
--  __LEAF(result_type, header)                                        \
-+  VM_LEAF_BASE(result_type, header)                                  \
-   debug_only(JRT_Leaf_Verifier __jlv;)
- 
- 
- #define JRT_ENTRY_NO_ASYNC(result_type, header)                      \
-   result_type header {                                               \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- // Same as JRT Entry but allows for return value after the safepoint
-@@ -543,11 +543,11 @@ extern "C" {                            
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- // Ensure that the VMNativeEntryWrapper constructor, which can cause
--// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY).
-+// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE).
- #define JNI_QUICK_ENTRY(result_type, header)                         \
- extern "C" {                                                         \
-   result_type JNICALL header {                                \
-@@ -555,7 +555,7 @@ extern "C" {                            
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __QUICK_ENTRY(result_type, header, thread)
-+    VM_QUICK_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JNI_LEAF(result_type, header)                                \
-@@ -563,7 +563,7 @@ extern "C" {                            
-   result_type JNICALL header {                                \
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
--    __LEAF(result_type, header)
-+    VM_LEAF_BASE(result_type, header)
- 
- 
- // Close the routine and the extern "C"
-@@ -579,7 +579,7 @@ extern "C" {                            
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_ENTRY_NO_ENV(result_type, header)                        \
-@@ -588,7 +588,7 @@ extern "C" {                            
-     JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread();  \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_QUICK_ENTRY(result_type, header)                         \
-@@ -597,14 +597,14 @@ extern "C" {                            
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __QUICK_ENTRY(result_type, header, thread)
-+    VM_QUICK_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_LEAF(result_type, header)                                \
- extern "C" {                                                         \
-   result_type JNICALL header {                                       \
-     VM_Exit::block_if_vm_exited();                                   \
--    __LEAF(result_type, header)
-+    VM_LEAF_BASE(result_type, header)
- 
- 
- #define JVM_END } }
-

Modified: openjdk7_fix_jdk_cmds_path.diff
===================================================================
--- openjdk7_fix_jdk_cmds_path.diff	2012-02-15 10:39:26 UTC (rev 150232)
+++ openjdk7_fix_jdk_cmds_path.diff	2012-02-15 15:58:39 UTC (rev 150233)
@@ -22,3 +22,25 @@
  TRUE           = $(UTILS_COMMAND_PATH)true
  UNAME          = $(UTILS_COMMAND_PATH)uname
  UNIQ           = $(UTILS_USR_BIN_PATH)uniq
+--- openjdk/jdk/make/common/shared/Defs-utils.gmk	2012-02-15 14:16:25.000000000 +0100
++++ openjdk/jdk/make/common/shared//Defs-utils.gmk.new	2012-02-15 15:06:26.400107173 +0100
+@@ -107,7 +107,7 @@
+ FIND           = $(UTILS_USR_BIN_PATH)find
+ FMT            = $(UTILS_COMMAND_PATH)fmt
+ GDB            = $(UTILS_USR_BIN_PATH)gdb
+-GREP           = $(UTILS_COMMAND_PATH)grep
++GREP           = $(UTILS_USR_BIN_PATH)grep
+ GUNZIP         = $(UTILS_COMMAND_PATH)gunzip
+ # GZIP is used for solaris. Linux and windows use tar czf
+ GZIP           = $(UTILS_COMMAND_PATH)gzip
+--- openjdk/jdk/make/common/shared/Defs-utils.gmk	2012-02-15 15:11:27.000000000 +0100
++++ openjdk/jdk/make/common/shared/Defs-utils.gmk.new	2012-02-15 15:14:09.504446263 +0100
+@@ -101,7 +101,7 @@
+ DIRNAME        = $(UTILS_USR_BIN_PATH)dirname
+ DUMP           = $(UTILS_CCS_BIN_PATH)dump
+ ECHO           = $(UTILS_COMMAND_PATH)echo
+-EGREP          = $(UTILS_COMMAND_PATH)egrep
++EGREP          = $(UTILS_USR_BIN_PATH)egrep
+ EXPR           = $(UTILS_USR_BIN_PATH)expr
+ FILE           = $(UTILS_USR_BIN_PATH)file
+ FIND           = $(UTILS_USR_BIN_PATH)find



More information about the arch-commits mailing list