Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=598bd15d38444014ac04087e984a7dea5ac7decb
commit 598bd15d38444014ac04087e984a7dea5ac7decb Author: Marius Cirsta <[email protected]> Date: Mon Jun 11 02:31:38 2012 +0000 openjdk-7-1-x86_64 * bump to openjdk7 * use openjdk to build itself * changed m8r diff --git a/source/devel-extra/openjdk/FrugalBuild b/source/devel-extra/openjdk/FrugalBuild index 7c022c9..5979280 100644 --- a/source/devel-extra/openjdk/FrugalBuild +++ b/source/devel-extra/openjdk/FrugalBuild @@ -1,49 +1,59 @@ # Compiling Time: 46.40 SBU -# Maintainer: Miklos Vajna <[email protected]> +# Maintainer: Marius Cirsta <[email protected]> +# Contributor: Miklos Vajna <[email protected]> pkgname=openjdk pkgver=7 -build=22 -pkgrel=1 icedteaver=2.2 javaver="$pkgver-openjdk" +pkgrel=1 pkgdesc="Open-source Java Development Kit implementation." url="http://openjdk.java.net/"; depends=('libx11') provides=('jdk') rodepends=("openjre=$pkgver") -makedepends=('apache-ant' 'zip' 'cpio' 'java-gcj-compat>=1.0.80-8' 'ecj' \ - 'gcc-gcj' 'xalan-j' 'rhino' 'gtk+2' 'xulrunner>=1.9.2-2' 'cups' \ - 'libgif' 'libxp' 'procps' 'sed>=4.2.1-2' 'cpio>=2.11-2' 'lcms2') +makedepends=('apache-ant' 'zip' 'cpio' 'rhino' 'gtk+2' 'xulrunner>=1.9.2-2' 'cups' \ + 'openjdk' 'libgif' 'libxp' 'procps' 'sed>=4.2.1-2' 'cpio>=2.11-2' 'fastjar') groups=('devel-extra') archs=('i686' 'x86_64') -_F_archive_name="icedtea6" +_F_archive_name="icedtea" # we do not want to see icedtea version in pkgver but we update when # there is a new icedtea release -up2date="Flasttar http://icedtea.classpath.org/download/source/ | sed 's/$icedteaver/$pkgver/'" -source=(http://icedtea.classpath.org/download/source/icedtea-$icedteaver.tar.gz \ - http://icedtea.classpath.org/download/drops/jdk7-jaxp-m7.zip \ - http://icedtea.classpath.org/download/drops/jdk7-jaxws2_2_4-b04-2011_06_01.zip \ - http://icedtea.classpath.org/download/drops/hotspot/f46354849fb3.tar.gz \ - http://icedtea.classpath.org/download/drops/icedtea/corba.tar.gz \ - http://icedtea.classpath.org/download/drops/icedtea/langtools.tar.gz \ - http://www.java.net/download/openjdk/jdk${pkgver}u4/promoted/b${build}/openjdk-${pkgver}u4-fcs-src-b${build}-02_may_2012.zip \ +up2date="Flasttar http://icedtea.classpath.org/download/source/|sed 's/$icedteaver/$pkgver/'" + +_CORBA_CHANGESET=3231f3e9c517 +_HOTSPOT_CHANGESET=bfe5efd70bce +_JAXP_CHANGESET=0036fe6fe7dc +_JAXWS_CHANGESET=abfb890c262a +_JDK_CHANGESET=839d0155f7cc +_LANGTOOLS_CHANGESET=f855bdb37537 +_OPENJDK_CHANGESET=49a6fc8f712f +_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2 +source=(http://icedtea.classpath.org/download/source/$_F_archive_name-$icedteaver.tar.gz \ + ${_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 + ${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz + ${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz + ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz + ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz \ openj{dk,re}.sh) sha1sums=('996ee8f80675eabdb67533b220eddc0b523a7d78' \ - '688531dfcd81ef704732ffef7d467045fd850544' \ - '85d483145dd3483ce813fdd2398cff324d19eaff' \ - 'fc975c8bd4e0eee660f9a1d24f556a41236ad785' \ - '00ffd5a0ceea3159e3071eeab691022d460ed49e' \ - '59e1bc526b968cd04388b73d3a462148fca7652a' \ - '354433cde765a35a5a454b3d135bf35d9d11e49f' \ - '3fae9758526558631c374e78b8970b7e906494ac' \ - '8930417f9aece56528c6464850da32d755b401b6') + 'ad51a998b2c0dba82c147081911a9e637fc5d73b' \ + '32460bc09f7eaad3705fad5550eec0e855a9d07f' \ + 'bebb3c056e314e650838f1a221782eb8ace8f850' \ + '8029e6672f60650d869c0c9c01d1e1a06aa5ca3f' \ + '65f59bbdbc2be4c1683291e0ebd8f494713172a0' \ + 'f9b758cbb6a45b2cec47379391f765a01af7ae8f' \ + 'aacf9af40d5eb4fbbb599988a9caf912ae66f648' \ + 'e158fc5aa29d1830a99b7592de137b2a82fed3c7' \ + '1912c18a74191a3dae6d78a09a9b3d541ee8e86d') NOEXTRACT=1 subpkgs=('openjre' 'openjdk-source') subdescs=('Open-source Java Runtime Environment.' 'Java Development Kit source-code.') -subdepends=('libjpeg>=8b libgif libuuid gtk+2-libs libxtst libffi' '') +subdepends=('libjpeg>=8b libgif libuuid gtk+2-libs libxtst libffi libpulse lcms2' '') subrodepends=('' "openjdk=$pkgver") subprovides=('jre' '') subgroups=('xapps' 'devel-extra') @@ -51,24 +61,37 @@ subarchs=('i686 x86_64' 'i686 x86_64') build() { - Fextract icedtea-$icedteaver.tar.gz - Fcd icedtea-$icedteaver - # see http://hiroshiyamauchi.blogspot.com/2009/12/building-openjdk-faster.html + unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS export HOTSPOT_BUILD_JOBS="${MAKEFLAGS/-j}" + export PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" unset MAKEFLAGS - Fconf --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0 \ - --with-openjdk-src-zip=$Fsrcdir/openjdk-${pkgver}u4-fcs-src-b${build}-02_may_2012.zip\ - --with-hotspot-src-zip=$Fsrcdir/f46354849fb3.tar.gz \ - --with-corba-src-zip=$Fsrcdir/corba.tar.gz \ - --with-jaxp-src-zip=$Fsrcdir/jdk7-jaxp-m7.zip \ - --with-jaxws-src-zip=$Fsrcdir/jdk7-jaxws2_2_4-b04-2011_06_01.zip \ - --with-langtools-src-zip=$Fsrcdir/langtools.tar.gz \ - --with-parallel-jobs="${MAKEFLAGS/-j}" \ - --enable-nss \ - --with-rhino \ - --disable-tests \ - --with-pkgversion="Frugalware build ${pkgver}-${pkgrel}-${CARCH}" - + + #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" + + Fextract $_F_archive_name-$icedteaver.tar.gz + Fcd $_F_archive_name-$icedteaver + + [ -f /etc/profile.d/openjdk.sh ] && . /etc/profile.d/openjdk.sh + + Fconf \ + --disable-bootstrap \ + --with-parallel-jobs="${MAKEFLAGS/-j}" \ + --disable-tests \ + --with-pkgversion="Frugalware build ${pkgver}-${pkgrel}-${CARCH}" \ + --with-jdk-home=${JAVA_HOME} \ + --with-openjdk-src-zip=${Fsrcdir}/${_OPENJDK_CHANGESET}.tar.gz \ + --with-hotspot-src-zip=${Fsrcdir}/${_HOTSPOT_CHANGESET}.tar.gz \ + --with-corba-src-zip=${Fsrcdir}/${_CORBA_CHANGESET}.tar.gz \ + --with-jaxp-src-zip=${Fsrcdir}/${_JAXP_CHANGESET}.tar.gz \ + --with-jaxws-src-zip=${Fsrcdir}/${_JAXWS_CHANGESET}.tar.gz \ + --with-jdk-src-zip=${Fsrcdir}/${_JDK_CHANGESET}.tar.gz \ + --with-langtools-src-zip=${Fsrcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \ + --enable-pulse-java \ + --enable-nss \ + --with-rhino \ + --with-abs-install-dir=${_jvmdir} + make || return 1 Fmkdir /usr/lib/jvm/ cd openjdk.build || return 1 diff --git a/source/devel-extra/openjdk/openjdk.sh b/source/devel-extra/openjdk/openjdk.sh index ac4e105..1c1cb8d 100644 --- a/source/devel-extra/openjdk/openjdk.sh +++ b/source/devel-extra/openjdk/openjdk.sh @@ -1,4 +1,4 @@ -export OPENJDKDIR=/usr/lib/jvm/java-6-openjdk +export OPENJDKDIR=/usr/lib/jvm/java-7-openjdk export MANPATH=$MANPATH:$OPENJDKDIR/man export CLASSPATH=$CLASSPATH:$OPENJDKDIR/lib diff --git a/source/devel-extra/openjdk/openjre.sh b/source/devel-extra/openjdk/openjre.sh index cb1277f..aba9b3e 100644 --- a/source/devel-extra/openjdk/openjre.sh +++ b/source/devel-extra/openjdk/openjre.sh @@ -1,4 +1,4 @@ -export OPENJREDIR=/usr/lib/jvm/java-6-openjdk/jre +export OPENJREDIR=/usr/lib/jvm/java-7-openjdk/jre export MANPATH=$MANPATH:$OPENJREDIR/man export CLASSPATH=$CLASSPATH:$OPENJREDIR/lib _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
