[arch-commits] Commit in openjdk6/trunk (PKGBUILD glibc2_15.diff)
Date: Tuesday, January 31, 2012 @ 13:27:18
Author: andyrtr
Revision: 148418
upgpkg: openjdk6 6.b24_1.11-1
upstream update 1.11
Modified:
openjdk6/trunk/PKGBUILD
Deleted:
openjdk6/trunk/glibc2_15.diff
+
PKGBUILD | 39 -
glibc2_15.diff | 236 ---
2 files changed, 18 insertions(+), 257 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-31 18:24:08 UTC (rev 148417)
+++ PKGBUILD2012-01-31 18:27:18 UTC (rev 148418)
@@ -5,46 +5,44 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase="openjdk6"
_javaver=6
-_icedteaver=1.10.5
-_openjdk_version=b22
-_openjdk_date=28_feb_2011
+_icedteaver=1.11
+_openjdk_version=b24
+_openjdk_date=14_nov_2011
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=2
+pkgrel=1
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
license=('custom')
makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme'
'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
-'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch'
'xalan-java' 'libxt' 'nss'
+'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch'
'libxt' 'nss' 'libxslt' #'xalan-java'
'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio'
'openjdk6')
options=('!emptydirs') # 'force') # force needed for hg shots
source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
- http://icedtea.classpath.org/download/drops/jaxp144_01.zip
- http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip
+ http://icedtea.classpath.org/download/drops/jaxp144_03.zip
+
http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip
http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip
fix_jdk_cmds_path.diff
fix_corba_cmds_path.diff
fontconfig-paths.diff
nonreparenting-wm.diff
openjdk6.profile
- openjdk6.profile.csh
-glibc2_15.diff)
+ openjdk6.profile.csh)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
- jaxp144_01.zip
- jdk6-jaxws-b20.zip
+ jaxp144_03.zip
+ jdk6-jaxws2_1_6-2011_06_13.zip
jdk6-jaf-b20.zip)
-md5sums=('e2316f463b5d9f53f8c5c9020f2a7e5a'
- '2d20f9b81f1fec41ec730da8a933'
- 'ef7a8b3624ea904bf584bc46d79b5e75'
- '91adfd41e6f001add4f92ae31216b1e3'
+md5sums=('10c1cea1d24c064572abfe9687567948'
+ '0eabdd360169144336e50081b8d01001'
+ '9eea471ad474040265c688858fcf09aa'
+ '8fd91b09b643a19a912b8a75e7a7a9d5'
'bc95c133620bd68c161cac9891592901'
'5da3e39fa60985576c4f37d1491efbe2'
'f7e7a212e50abb56a6ef1a2b1bd27405'
'ee1afda124d5927345014ab382ef581e'
'9b4d368f5ee08de248eaf029303a446c'
'74c4a7adc782edd087802bf92ae3d6d0'
- 'fdf295e2f186dfa4d308691a3d7ac8c5'
- '0c8f0a398c88f85e0db44b4417562cf3')
+ 'fdf295e2f186dfa4d308691a3d7ac8c5')
build() {
@@ -64,18 +62,17 @@
autoreconf -i
- export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff
patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff
patches/nonreparenting-wm.diff patches/glibc2_15.diff"
+ export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff
patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff
patches/nonreparenting-wm.diff"
export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
unset MAKEFLAGS
./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
- --with-xalan2-jar=/usr/share/java/xalan.jar \
--with-ant-home=/usr/share/java/apache-ant \
--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \
- --with-jaxp-drop-zip=${srcdir}/jaxp144_01.zip \
- --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \
+ --with-jaxp-drop-zip=${srcdir}/jaxp144_03.zip \
+ --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \
--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
--disable-bootstrap
LD_PRELOAD="" make
Deleted: glibc2_15.diff
===
--- glibc2_15.diff 2012-01-31 18:24:08 UTC (rev 148417)
+++ glibc2_15.diff 2012-01-31 18:27:18 UTC (rev 148418)
@@ -1,236 +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
-
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/opto/addnode
[arch-commits] Commit in openjdk6/trunk (PKGBUILD glibc2_15.diff)
Date: Thursday, January 12, 2012 @ 16:44:34
Author: andyrtr
Revision: 146546
upgpkg: openjdk6 6.b22_1.10.5-1
upstream update 1.10.5
Added:
openjdk6/trunk/glibc2_15.diff
Modified:
openjdk6/trunk/PKGBUILD
+
PKGBUILD | 35 ++--
glibc2_15.diff | 236 +++
2 files changed, 247 insertions(+), 24 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-12 21:34:33 UTC (rev 146545)
+++ PKGBUILD2012-01-12 21:44:34 UTC (rev 146546)
@@ -4,12 +4,10 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase="openjdk6"
-#_date=20100715
_javaver=6
-_icedteaver=1.10.4
+_icedteaver=1.10.5
_openjdk_version=b22
_openjdk_date=28_feb_2011
-#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
pkgrel=1
url='http://icedtea.classpath.org'
@@ -17,25 +15,25 @@
license=('custom')
makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme'
'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch'
'xalan-java' 'libxt' 'nss'
-'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio')
+'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio'
'openjdk6')
options=('!emptydirs') # 'force') # force needed for hg shots
source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
- #ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.xz
http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
http://icedtea.classpath.org/download/drops/jaxp144_01.zip
-
https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaxws-b20.zip
- https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip
+ http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip
+ http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip
fix_jdk_cmds_path.diff
fix_corba_cmds_path.diff
fontconfig-paths.diff
nonreparenting-wm.diff
openjdk6.profile
- openjdk6.profile.csh)
+ openjdk6.profile.csh
+glibc2_15.diff)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
jaxp144_01.zip
jdk6-jaxws-b20.zip
jdk6-jaf-b20.zip)
-md5sums=('c381d987f8d2facece8c54e98fd547f8'
+md5sums=('e2316f463b5d9f53f8c5c9020f2a7e5a'
'2d20f9b81f1fec41ec730da8a933'
'ef7a8b3624ea904bf584bc46d79b5e75'
'91adfd41e6f001add4f92ae31216b1e3'
@@ -45,20 +43,9 @@
'ee1afda124d5927345014ab382ef581e'
'9b4d368f5ee08de248eaf029303a446c'
'74c4a7adc782edd087802bf92ae3d6d0'
- 'fdf295e2f186dfa4d308691a3d7ac8c5')
+ 'fdf295e2f186dfa4d308691a3d7ac8c5'
+ '0c8f0a398c88f85e0db44b4417562cf3')
-# source PKGBUILD && mksource
-mksource() {
- mkdir /tmp/icedtea6-${_date}
- pushd /tmp/icedtea6-${_date}
- #hg -v clone http://icedtea.classpath.org/hg/icedtea6
- # use specific release branch
- hg -v clone http://icedtea.classpath.org/hg/release/icedtea6-1.8/
- rm -rf icedtea6/.hg*
- tar -cvJf /tmp/icedtea6-${_date}/icedtea6-${_date}.tar.xz *
- popd
-}
-
build() {
unset JAVA_HOME
@@ -77,7 +64,7 @@
autoreconf -i
- export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff
patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff
patches/nonreparenting-wm.diff"
+ export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff
patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff
patches/nonreparenting-wm.diff patches/glibc2_15.diff"
export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
@@ -88,7 +75,7 @@
--with-ant-home=/usr/share/java/apache-ant \
--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \
--with-jaxp-drop-zip=${srcdir}/jaxp144_01.zip \
- --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \
+ --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \
--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
--disable-bootstrap
LD_PRELOAD="" make
Added: glibc2_15.diff
===
--- glibc2_15.diff (rev 0)
+++ glibc2_15.diff 2012-01-12 21:44:34 UTC (rev 146546)
@@ -0,0 +1,236 @@
+# 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
+
+diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/opto/addnode.cpp
+--- openjd
