summaryrefslogtreecommitdiff
path: root/pcr/openjdk6/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'pcr/openjdk6/PKGBUILD')
-rw-r--r--pcr/openjdk6/PKGBUILD33
1 files changed, 21 insertions, 12 deletions
diff --git a/pcr/openjdk6/PKGBUILD b/pcr/openjdk6/PKGBUILD
index b552f272c..8c70bb72a 100644
--- a/pcr/openjdk6/PKGBUILD
+++ b/pcr/openjdk6/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
-pkgname=('openjdk6' 'openjdk6-src')
+pkgname=('openjdk6-old' 'openjdk6-old-src')
pkgbase="openjdk6"
_javaver=6
_icedteaver=1.12.3
@@ -15,7 +15,7 @@ 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' 'libxt' 'nss' 'libxslt'
- 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6' 'inetutils' 'wget')
+ 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'java-environment' 'inetutils' 'wget')
options=('!emptydirs')
source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz{,.sig}
http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
@@ -28,7 +28,9 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar
nonreparenting-wm.diff
disable_Werror.diff
openjdk6.profile
- openjdk6.profile.csh)
+ openjdk6.profile.csh
+ disable-openjdk-Werror.diff
+ ecj-icedtea.patch)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
jaxp144_04.zip
jdk6-jaxws2_1_6-2011_06_13.zip
@@ -45,11 +47,12 @@ sha256sums=('db9dc14fa537fb22616fcd9e5b80758aa7baa66e0b6f8adfe3d5e80414574b4c'
'9c3c55c30729ec44fab14c3f3f841c273730c7467d8908a72f018bc9e9f65bd9'
'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97'
'26e2cd5a6034f08a685129c9412f487b9931fb0d556f1ccceab17bdb75a372cd'
- '0c2d9116d6e550021994d6713a93621a9df685d2182996be3249ad812712b007')
+ '0c2d9116d6e550021994d6713a93621a9df685d2182996be3249ad812712b007'
+ '3e20fdcd17d4adee1cb2ddc3b15a39fe56b9a7837067487eedd40733adfea9c6'
+ '77bafb45d67cbdac59ae27b0cc85e38d849dcf5c4c4005f5b28b33f4f5b734ab')
build() {
- unset JAVA_HOME
unset CLASSPATH
[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
@@ -62,10 +65,11 @@ build() {
ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
+ cp ${srcdir}/ecj-icedtea.patch ${srcdir}/icedtea6-${_icedteaver}/patches/ecj/icedtea.patch
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/disable_Werror.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/disable_Werror.diff patches/disable-openjdk-Werror.diff"
export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
@@ -73,16 +77,21 @@ build() {
./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
--with-ant-home=/usr/share/java/apache-ant \
- --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \
+ --with-pkgversion=Parabola-${pkgver}-${pkgrel}-$CARCH \
--with-jaxp-drop-zip=${srcdir}/jaxp144_04.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 \
- --with-abs-install-dir=${_jvmdir}
+ --enable-bootstrap \
+ --with-abs-install-dir=${_jvmdir} \
+ --with-jdk-home="$JAVA_HOME"
+
+ # Java 7 compilers give more warnings.
+ find . -name '*.gmk' -or -name 'Makefile' | xargs sed -i 's/-Werror//'
+
LD_PRELOAD="" make
}
-package_openjdk6() {
+package_openjdk6-old() {
pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
backup=(etc/profile.d/openjdk6.sh)
depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7')
@@ -162,9 +171,9 @@ package_openjdk6() {
install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
-package_openjdk6-src() {
+package_openjdk6-old-src() {
pkgdesc='Free Java environment based on OpenJDK 6.0 Source Bundle'
- depends=('openjdk6')
+ depends=('openjdk6-old')
if [ "${CARCH}" = "x86_64" ]; then
_arch=amd64