[arch-commits] Commit in openjdk6/trunk (PKGBUILD fix_jdk_cmds_path.diff)

andyrtr at archlinux.org andyrtr at archlinux.org
Sun May 24 06:06:15 EDT 2009


    Date: Sunday, May 24, 2009 @ 06:06:15
  Author: andyrtr
Revision: 39992

prepare 1.5rc3 build

Modified:
  openjdk6/trunk/PKGBUILD
  openjdk6/trunk/fix_jdk_cmds_path.diff

------------------------+
 PKGBUILD               |   47 ++++++++++++++++++++++-------------------------
 fix_jdk_cmds_path.diff |   22 ----------------------
 2 files changed, 22 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-24 09:55:26 UTC (rev 39991)
+++ PKGBUILD	2009-05-24 10:06:15 UTC (rev 39992)
@@ -3,8 +3,10 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=openjdk6
-_date=20090522
-pkgver=1.5_hg${_date}
+_date=20090524
+#pkgver=1.5_hg${_date}
+pkgver=1.5rc3
+_hgver=926c38e2b283 # =hg rc3 tagged, see http://icedtea.classpath.org/hg/icedtea6/summary
 _icedteaver=1.5
 pkgrel=1
 pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
@@ -20,10 +22,10 @@
 provides=('java-environment=6' 'java-runtime=6')
 options=('!emptydirs')
 install=openjdk6.install
-source=(http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	#http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
-	ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2
-	#http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/${_hotspotver}.tar.gz
+source=(#http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
+	#ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2
+	http://icedtea.classpath.org/hg/icedtea6/archive/${_hgver}.tar.gz
+	http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
 	http://hg.openjdk.java.net/hsx/hsx14/master/archive/${_hotspotver}.tar.gz
 	fix_jdk_cmds_path.diff
 	fix_corba_cmds_path.diff
@@ -31,19 +33,11 @@
 	fontconfig-paths.diff
 	openjdk6.profile)
 noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz ${_hotspotver}.tar.gz)
-md5sums=('850a29b70206bc7fa083cd26acc781f3'
-         '0458c10ea6a87523fde4f830d2253d68'
-         'dbd7aca5544d1aeebf0eadd45d29d08e'
-         '5da3e39fa60985576c4f37d1491efbe2'
-         'f7e7a212e50abb56a6ef1a2b1bd27405'
-         'ef60d567c0d9bad111212851220deafd'
-         '104380f0b900c840141e572a7fb70c27'
-         'd0703088e10aa957c037644ab88d716d')
 
 build() {
   # for hg checkout install mercurial and
-  mkdir ${srcdir}/icedtea6-${_date}
-  cd ${srcdir}/icedtea6-${_date}
+#  mkdir ${srcdir}/icedtea6-${_date}
+#  cd ${srcdir}/icedtea6-${_date}
   ##  hg -v clone http://icedtea.classpath.org/hg/icedtea6 || return 1
   # use 1.5 release branch
 #  hg -v clone http://icedtea.classpath.org/hg/release/icedtea6-1.5/ || return 1
@@ -61,16 +55,19 @@
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
 #  cd ${srcdir}/icedtea6
-  cd ${srcdir}/icedtea6-${_icedteaver}
+#  cd ${srcdir}/icedtea6-${_icedteaver}
+  cd ${srcdir}/icedtea6-${_hgver}
   ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
   ln -s ${srcdir}/${_hotspotver}.tar.gz .
 
 #  cp ${srcdir}/*.diff ${srcdir}/icedtea6/patches/
-  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
-#  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fix_corba_cmds_path.diff patches/aatext_by_default.diff #patches/fontconfig-paths.diff"
+#  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
+  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_hgver}/patches/
+#  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fix_corba_cmds_path.diff patches/aatext_by_default.diff patches/fontconfig-paths.diff"
+  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff"
 
   ./autogen.sh
-#  autoreconf # needed due to mercurial build
+  autoreconf # needed due to mercurial build
 
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
@@ -80,26 +77,26 @@
     JCONF="--with-openjdk --with-openjdk-home=${_jvmdir}"
   elif [ -x /opt/java/bin/javac ]; then
     JCONF="--with-openjdk --with-openjdk-home=/opt/java"
-  elif [ -x /usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/bin/javac ]; then
-    JCONF="--with-gcj-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0 --with-javac"
   else
-    echo "No supported java installation found, install either openjdk6, jdk or java-gcj-compat"
+    echo "No supported java installation found, install either openjdk6 or jdk"
     return 1
   fi
 
   ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
 	--with-xalan2-jar=/usr/share/java/xalan.jar \
 	--with-hotspot-src-zip=${_hotspotver}.tar.gz \
-	--enable-npplugin \
 	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH  $JCONF
+
 # 	--enable-visualvm \ --with-additional-vms=cacao,zero,shark \
+#	--enable-npplugin \
 
   LD_PRELOAD="" make || return 1
  
   install -m755 -d ${pkgdir}/${_jvmdir}/jre
 
 #  pushd ${srcdir}/icedtea6/openjdk/build/linux-${_arch}/j2sdk-image
-  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
+#  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
+  pushd ${srcdir}/icedtea6-${_hgver}/openjdk/build/linux-${_arch}/j2sdk-image
    # Install main files.
   cp -a bin include lib src.zip ${pkgdir}/${_jvmdir}/ || return 1
   cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ || return 1

Modified: fix_jdk_cmds_path.diff
===================================================================
--- fix_jdk_cmds_path.diff	2009-05-24 09:55:26 UTC (rev 39991)
+++ fix_jdk_cmds_path.diff	2009-05-24 10:06:15 UTC (rev 39992)
@@ -1,27 +1,5 @@
 --- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:33:23.000000000 +0300
 +++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2008-04-14 15:37:34.000000000 +0300
-@@ -76,10 +76,10 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
--CUT            = $(UTILS_USR_BIN_PATH)cut
-+CUT            = $(UTILS_COMMAND_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
- DIFF           = $(UTILS_USR_BIN_PATH)diff
-@@ -126,7 +126,7 @@
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
- TOUCH          = $(UTILS_COMMAND_PATH)touch
--TR             = $(UTILS_USR_BIN_PATH)tr
-+TR             = $(UTILS_COMMAND_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
- UNIQ           = $(UTILS_USR_BIN_PATH)uniq
 @@ -173,7 +173,7 @@
    BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
                         $(wildcard $(UTILS_USR_BIN_PATH)basename))



More information about the arch-commits mailing list