Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e12e76ed260f69c534dac88658a0f29837c63e66
commit e12e76ed260f69c534dac88658a0f29837c63e66 Author: DeX77 <[email protected]> Date: Wed Feb 26 12:26:55 2014 +0100 openjdk-7-10-x86_64 * relbump * use icedteaver 2.4.5 * fix profile files: there is no other java anymore * fix install script diff --git a/source/devel-extra/openjdk/FrugalBuild b/source/devel-extra/openjdk/FrugalBuild index b89363b..5320c9e 100644 --- a/source/devel-extra/openjdk/FrugalBuild +++ b/source/devel-extra/openjdk/FrugalBuild @@ -6,16 +6,16 @@ pkgname=openjdk _java_ver=7 _updatever=u45 pkgver=7 -icedteaver=2.4.3 +icedteaver=2.4.5 javaver="$pkgver-openjdk" -pkgrel=9 +pkgrel=10 pkgdesc="Open-source Java Development Kit implementation." url="http://openjdk.java.net/"; depends=('libx11' 'krb5') provides=('jdk') -rodepends=("openjre=$pkgver") +rodepends=("openjre=$pkgver-$pkgrel") 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') + 'openjdk' 'libgif' 'libxp' 'procps' 'sed>=4.2.1-2' 'cpio>=2.11-2' 'fastjar') groups=('devel-extra') archs=('i686' 'x86_64') _F_archive_name="icedtea" @@ -24,13 +24,13 @@ _F_archive_name="icedtea" up2date="Flasttar http://icedtea.classpath.org/download/source/|sed 's/$icedteaver/$pkgver/'" # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am -_CORBA_CHANGESET=8ed5df839fbc -_JAXP_CHANGESET=8f220f7b51c7 -_JAXWS_CHANGESET=652eb396f959 -_JDK_CHANGESET=7958751eb9ef -_LANGTOOLS_CHANGESET=3c8eb52a32ea -_OPENJDK_CHANGESET=e2f5917da3c1 -_HOTSPOT_CHANGESET=b59e02d9e72b # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map +_CORBA_CHANGESET=3594dbde270d +_JAXP_CHANGESET=8fe156ad49e2 +_JAXWS_CHANGESET=32ea8b1ed91a +_JDK_CHANGESET=9db88c18e114 +_LANGTOOLS_CHANGESET=dabd37b7e295 +_OPENJDK_CHANGESET=410eb7fef869 +_HOTSPOT_CHANGESET=2cb58882dac3 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map _url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4 @@ -43,14 +43,14 @@ source=(http://icedtea.classpath.org/download/source/$_F_archive_name-$icedteave ${_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=('7be802a22e705d626bf43b37d3cd08297098e0ae' \ - '0b42e1051a7d8d4488029ed0ce8cbf0d2546cf8d' \ - '16a0a5f3548d9587b2a0eea4faa6f62d59ed098c' \ - '389ee0e0265463f20024f1782f1c64fb1ab32653' \ - '674b56046781f04722f2901677fecd6e27426a36' \ - 'def159ed4a2fbf74ffef3cc726529fb849d12874' \ - '3917cf9702aa535902fab101243ac1d03ab40470' \ - '4f103197d97d4bcee34cadfffd34effc9b1395c6' \ +sha1sums=('ddfb8a485a01ae7486d8951df753dc4d077cffdb' \ + 'acf5fb7f1b76e69f472a990b1f772f6adc1dc9cf' \ + 'fec0018f0e10cf1a03b18409c982f42e40746ef5' \ + 'c5d89f1105e5746bdf97c6eeb66e75df2dd9e0fc' \ + '690c73e3783bba5c852636e6663292b83045ae91' \ + '05ed72bcce4136e9069cba25c62ae73e3be4540d' \ + 'f863613e9c21f8303cdc6d2b0c216a60662caf4b' \ + 'fe54509264470f3dbf9281cbf4125bc9c4d84abc' \ 'e158fc5aa29d1830a99b7592de137b2a82fed3c7' \ '1912c18a74191a3dae6d78a09a9b3d541ee8e86d') _F_cd_path=$_F_archive_name-$icedteaver @@ -58,17 +58,19 @@ 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 libpulse lcms2' '') -subrodepends=('' "openjdk=$pkgver") +subdepends=('libjpeg>=8b libgif libuuid gtk+2-libs libxtst libffi libpulse lcms2 nss' '') +subrodepends=('ca-certificates' "openjdk=$pkgver") subprovides=('jre' '') subgroups=('xapps' 'devel-extra') subarchs=('i686 x86_64' 'i686 x86_64') +subinstall=('openjre.install' '') build() { unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS export HOTSPOT_BUILD_JOBS="${MAKEFLAGS/-j}" export PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" + export java="openjdk" Fextract $_F_archive_name-$icedteaver.tar.gz @@ -78,25 +80,25 @@ build() 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 + --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 || Fdie Fmkdir /usr/lib/jvm/ - cd openjdk.build || return 1 + cd openjdk.build || Fdie Fcprel j2sdk-image /usr/lib/jvm/java-$javaver Fdirschmod /usr/lib/jvm/java-$javaver 755 Fexe /etc/profile.d/openjdk.sh diff --git a/source/devel-extra/openjdk/openjdk.sh b/source/devel-extra/openjdk/openjdk.sh index 1c1cb8d..48cb61f 100644 --- a/source/devel-extra/openjdk/openjdk.sh +++ b/source/devel-extra/openjdk/openjdk.sh @@ -1,13 +1,6 @@ export OPENJDKDIR=/usr/lib/jvm/java-7-openjdk export MANPATH=$MANPATH:$OPENJDKDIR/man export CLASSPATH=$CLASSPATH:$OPENJDKDIR/lib +export JAVA_HOME=$OPENJDKDIR +export PATH=$OPENJDKDIR/bin:$PATH -# if you put "java=foo" (where foo != openjdk) to /etc/sysconfig/java, -# then this script won't touch the JAVA_HOME variable -[ -e /etc/sysconfig/java ] && source /etc/sysconfig/java -if [ -z "$java" -o "$java" == "openjdk" ]; then - export JAVA_HOME=$OPENJDKDIR - export PATH=$OPENJDKDIR/bin:$PATH -else - export PATH=$PATH:$OPENJDKDIR/bin -fi diff --git a/source/devel-extra/openjdk/openjre.install b/source/devel-extra/openjdk/openjre.install index e0fbb4b..7c176c7 100755 --- a/source/devel-extra/openjdk/openjre.install +++ b/source/devel-extra/openjdk/openjre.install @@ -1,3 +1,4 @@ + post_upgrade() { @@ -11,3 +12,12 @@ post_upgrade() done } + +post_install() +{ + post_upgrade +} + +op=$1 +shift +$op $* diff --git a/source/devel-extra/openjdk/openjre.sh b/source/devel-extra/openjdk/openjre.sh index aba9b3e..c91329d 100755 --- a/source/devel-extra/openjdk/openjre.sh +++ b/source/devel-extra/openjdk/openjre.sh @@ -2,14 +2,8 @@ export OPENJREDIR=/usr/lib/jvm/java-7-openjdk/jre export MANPATH=$MANPATH:$OPENJREDIR/man export CLASSPATH=$CLASSPATH:$OPENJREDIR/lib -# if you put "java=foo" (where foo != openjdk) to /etc/sysconfig/java, -# then this script won't touch the JAVA_HOME variable -[ -e /etc/sysconfig/java ] && source /etc/sysconfig/java -if [ -z "$java" -o "$java" == "openjdk" ]; then - if [ ! -f /etc/profile.d/openjdk.sh ]; then - export JAVA_HOME=$OPENJREDIR - fi - export PATH=$OPENJREDIR/bin:$PATH -else - export PATH=$PATH:$OPENJREDIR/bin +if [ ! -f /etc/profile.d/openjdk.sh ]; then + export JAVA_HOME=$OPENJREDIR fi + +export PATH=$OPENJREDIR/bin:$PATH _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
