diff options
Diffstat (limited to 'libre/java8-openjdk')
| -rw-r--r-- | libre/java8-openjdk/001_adjust-mflags-for-gmake-4.patch | 46 | ||||
| -rw-r--r-- | libre/java8-openjdk/002_gcc.make-4.9.patch | 12 | ||||
| -rw-r--r-- | libre/java8-openjdk/PKGBUILD | 278 | ||||
| -rw-r--r-- | libre/java8-openjdk/install_jdk8-openjdk.sh | 38 | ||||
| -rw-r--r-- | libre/java8-openjdk/install_jre8-openjdk-headless.sh | 39 | ||||
| -rw-r--r-- | libre/java8-openjdk/install_jre8-openjdk.sh | 45 |
6 files changed, 458 insertions, 0 deletions
diff --git a/libre/java8-openjdk/001_adjust-mflags-for-gmake-4.patch b/libre/java8-openjdk/001_adjust-mflags-for-gmake-4.patch new file mode 100644 index 000000000..d998d8aee --- /dev/null +++ b/libre/java8-openjdk/001_adjust-mflags-for-gmake-4.patch @@ -0,0 +1,46 @@ + +# HG changeset patch +# User henryjen +# Date 1390363634 28800 +# Node ID e8d4d0db1f06c26defcbf68e6713afab632f3f30 +# Parent c4b78cbea876aa86112cfda16c0026796848d582 +8028407: adjust-mflags.sh failed build with GNU Make 4.0 with -I<path contains j> +Reviewed-by: erikj + +diff -r c4b78cbea876 -r e8d4d0db1f06 make/bsd/makefiles/adjust-mflags.sh +--- a/make/bsd/makefiles/adjust-mflags.sh Thu Dec 05 00:36:42 2013 -0800 ++++ b/make/bsd/makefiles/adjust-mflags.sh Tue Jan 21 20:07:14 2014 -0800 +@@ -64,7 +64,7 @@ + echo "$MFLAGS" \ + | sed ' + s/^-/ -/ +- s/ -\([^ ][^ ]*\)j/ -\1 -j/ ++ s/ -\([^ I][^ I]*\)j/ -\1 -j/ + s/ -j[0-9][0-9]*/ -j/ + s/ -j\([^ ]\)/ -j -\1/ + s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/ +diff -r c4b78cbea876 -r e8d4d0db1f06 make/linux/makefiles/adjust-mflags.sh +--- a/make/linux/makefiles/adjust-mflags.sh Thu Dec 05 00:36:42 2013 -0800 ++++ b/make/linux/makefiles/adjust-mflags.sh Tue Jan 21 20:07:14 2014 -0800 +@@ -64,7 +64,7 @@ + echo "$MFLAGS" \ + | sed ' + s/^-/ -/ +- s/ -\([^ ][^ ]*\)j/ -\1 -j/ ++ s/ -\([^ I][^ I]*\)j/ -\1 -j/ + s/ -j[0-9][0-9]*/ -j/ + s/ -j\([^ ]\)/ -j -\1/ + s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/ +diff -r c4b78cbea876 -r e8d4d0db1f06 make/solaris/makefiles/adjust-mflags.sh +--- a/make/solaris/makefiles/adjust-mflags.sh Thu Dec 05 00:36:42 2013 -0800 ++++ b/make/solaris/makefiles/adjust-mflags.sh Tue Jan 21 20:07:14 2014 -0800 +@@ -64,7 +64,7 @@ + echo "$MFLAGS" \ + | sed ' + s/^-/ -/ +- s/ -\([^ ][^ ]*\)j/ -\1 -j/ ++ s/ -\([^ I][^ I]*\)j/ -\1 -j/ + s/ -j[0-9][0-9]*/ -j/ + s/ -j\([^ ]\)/ -j -\1/ + s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/ + diff --git a/libre/java8-openjdk/002_gcc.make-4.9.patch b/libre/java8-openjdk/002_gcc.make-4.9.patch new file mode 100644 index 000000000..13715a5d6 --- /dev/null +++ b/libre/java8-openjdk/002_gcc.make-4.9.patch @@ -0,0 +1,12 @@ +--- old/make/linux/makefiles/gcc.make 2014-04-23 22:07:59.838205838 +0100 ++++ new/make/linux/makefiles/gcc.make 2014-04-23 22:07:59.754204533 +0100 +@@ -266,6 +266,9 @@ + ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 3), 1) + OPT_CFLAGS/mulnode.o += $(OPT_CFLAGS/NOOPT) + endif ++ ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 9), 1) ++ OPT_CFLAGS/macroAssembler_x86.o += -fno-devirtualize ++ endif + endif + + # Flags for generating make dependency flags. diff --git a/libre/java8-openjdk/PKGBUILD b/libre/java8-openjdk/PKGBUILD new file mode 100644 index 000000000..8f9c3cffb --- /dev/null +++ b/libre/java8-openjdk/PKGBUILD @@ -0,0 +1,278 @@ +# Maintainer (Arch): Guillaume ALAUX <guillaume@archlinux.org> +# Contributor (Arch): Boyan Ding <stu_dby@126.com> +# Maintainer: André Silva <emulatorman@parabola.nu> + +# TODO +# once icedtea: +# pulse +# icedtea-web-java8 +# add policytool desktop files + +pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk') +pkgbase=java8-openjdk +_java_ver=8 +_jdk_update=20 +_jdk_build=23 +pkgver=${_java_ver}.u${_jdk_update} +_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build} +pkgrel=1.parabola1 +arch=('i686' 'x86_64') +url='http://openjdk.java.net/' +license=('custom') +makedepends=('jdk7-openjdk' 'ccache' 'cpio' 'unzip' 'zip' + 'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib') +_url_src=http://hg.openjdk.java.net/jdk8u/jdk8u +source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz + corba-${_repo_ver}.tar.gz::${_url_src}/corba/archive/${_repo_ver}.tar.gz + hotspot-${_repo_ver}.tar.gz::${_url_src}/hotspot/archive/${_repo_ver}.tar.gz + jdk-${_repo_ver}.tar.gz::${_url_src}/jdk/archive/${_repo_ver}.tar.gz + jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz + jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz + langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz + nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz + 001_adjust-mflags-for-gmake-4.patch + 002_gcc.make-4.9.patch) + +sha256sums=('ec0b86c0a5883f769cb951a96a0b61734aa7e3c2b62e3b448f7bf6866a36c237' + 'e979396e3d64af94664932a28eb63d3048bdf3595f180bd4bd3fad91bc8b685c' + 'ba0c359bb99b82fb2eca37ba5d2a7e775bd9f67749e41cbbf6a059677f20750a' + '7f66b915b4ad378710cf1b8e52a3615105457d6a93aaf6183b76d7d6dfa14c14' + '3d19d5b7fd7a13ed2bf860491731ca6c928ed0d44e10910f2d43340f627714f7' + '046de26b27cf7f24b77c33af249aac7fa8d14269306ed2e1f9517cce279243c3' + '05177c5ba5ec95d041d46e871358692ff1e62f8568c8c9580688b39e5165d580' + '2499b19562e320eb304be8797c2a895f1fe2ab2d16fd7da68aeaed180b3f1899' + '682104f7723c5c543c47b53f51cc5577e273a12343bd04bebd1bcd70dd72ded9' + '5b1ed72ffd14a18e36aba2129e0781696b8c9cccd060bf4dbe1c4b9a44100b69') + +case "${CARCH}" in + 'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;; + 'i686' ) _JARCH=i386 ; _DOC_ARCH=x86 ;; +esac + +_jdkname=openjdk8 +_jvmdir=/usr/lib/jvm/java-8-openjdk +_prefix="jdk8u-${_repo_ver}/image" +_imgdir="${_prefix}/jvm/openjdk-1.8.0_$(printf '%.2d' ${_jdk_update})" +_nonheadless=(bin/policytool + lib/${_JARCH}/libjsound.so + lib/${_JARCH}/libjsoundalsa.so + lib/${_JARCH}/libsplashscreen.so) + +prepare() { + cd "${srcdir}/jdk8u-${_repo_ver}" + + for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn + do + ln -s ../${subrepo}-${_repo_ver} ${subrepo} + done + + cd hotspot + # https://bugs.openjdk.java.net/browse/JDK-8028407 + patch -p1 < "${srcdir}/001_adjust-mflags-for-gmake-4.patch" + # https://bugs.openjdk.java.net/browse/JDK-8041658 + patch -p1 < "${srcdir}/002_gcc.make-4.9.patch" +} + +build() { + cd "${srcdir}/jdk8u-${_repo_ver}" + + unset JAVA_HOME + # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346 + export MAKEFLAGS=${MAKEFLAGS/-j*} + + install -d -m 755 "${srcdir}/${_prefix}/" + sh configure \ + --prefix="${srcdir}/${_prefix}" \ + --with-update-version="${_jdk_update}" \ + --with-build-number="b${_jdk_build}" \ + --with-milestone="fcs" \ + --enable-unlimited-crypto \ + --with-zlib=system + + # TODO OpenJDK does not want last version of giflib (add 'giflib' as dependency once fixed) + #--with-giflib=system \ + + # Without 'DEBUG_BINARIES', i686 won't build + # http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-July/019203.html + make \ + DEBUG_BINARIES=true + # These help to debug builds: + #LOG=trace HOTSPOT_BUILD_JOBS=1 + + make docs + + # FIXME sadly 'DESTDIR' is not used here! + make install + + cd "${srcdir}/${_imgdir}" + + # A lot of build stuff were directly taken from + # http://pkgs.fedoraproject.org/cgit/java-1.8.0-openjdk.git/tree/java-1.8.0-openjdk.spec + + # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437 + find . -iname '*.jar' -exec chmod ugo+r {} \; + chmod ugo+r lib/ct.sym + + # remove redundant *diz and *debuginfo files + find . -iname '*.diz' -exec rm {} \; + find . -iname '*.debuginfo' -exec rm {} \; +} + +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# make -k check +#} + +package_jre8-openjdk-headless() { + pkgdesc='OpenJDK Java 8 headless runtime environment (Parabola rebranded)' + depends=('java-common' 'ca-certificates-java' 'nss') + optdepends=('java-rhino: for some JavaScript support') + provides=('java-runtime-headless=8' 'java-runtime-headless-openjdk=8') + # Upstream config files that should go to etc and get backup + _backup_etc=(etc/java-8-openjdk/${_JARCH}/jvm.cfg + etc/java-8-openjdk/calendars.properties + etc/java-8-openjdk/content-types.properties + etc/java-8-openjdk/flavormap.properties + etc/java-8-openjdk/images/cursors/cursors.properties + etc/java-8-openjdk/logging.properties + etc/java-8-openjdk/management/jmxremote.access + etc/java-8-openjdk/management/jmxremote.password + etc/java-8-openjdk/management/management.properties + etc/java-8-openjdk/management/snmp.acl + etc/java-8-openjdk/net.properties + etc/java-8-openjdk/psfont.properties.ja + etc/java-8-openjdk/psfontj2d.properties + etc/java-8-openjdk/security/java.policy + etc/java-8-openjdk/security/java.security + etc/java-8-openjdk/sound.properties) + replaces=('jre8-openjdk-headless-wm') + backup=(${_backup_etc[@]}) + install=install_jre8-openjdk-headless.sh + + cd "${srcdir}/${_imgdir}/jre" + + install -d -m 755 "${pkgdir}${_jvmdir}/jre/" + cp -a bin lib "${pkgdir}${_jvmdir}/jre" + + # Set config files + mv "${pkgdir}${_jvmdir}"/jre/lib/management/jmxremote.password{.template,} + mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,} + + # Remove 'non-headless' lib files + for f in ${_nonheadless[@]}; do + rm "${pkgdir}${_jvmdir}/jre/${f}" + done + + # Man pages + pushd "${pkgdir}${_jvmdir}/jre/bin" + install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/ + for file in *; do + install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \ + "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1" + install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \ + "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1" + done + popd + + # Link JKS keystore from ca-certificates-java + rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts" + ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts" + + # Install license + install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/" + install -m 644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \ + "${pkgdir}/usr/share/licenses/${pkgbase}" + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" + + # Move config files that were set in _backup_etc from ./lib to /etc + for file in ${_backup_etc[@]}; do + _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-8-openjdk/} + install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}" + ln -sf /${file} "${pkgdir}${_filepkgpath}" + done +} + +package_jre8-openjdk() { + pkgdesc='OpenJDK Java 8 full runtime environment (Parabola rebranded)' + depends=("jre8-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme') + optdepends=('alsa-lib: for basic sound support' + 'gtk2: for the Gtk+ look and feel - desktop usage') + # TODO when adding IcedTea: 'icedtea-web-java7: web browser plugin + Java Web Start' + # TODO when adding IcedTea: 'giflib: for gif format support' + # TODO when adding IcedTea: 'libpulse: for advanced sound support' + provides=('java-runtime=8' 'java-runtime-openjdk=8') + install=install_jre8-openjdk.sh + replaces=('jre8-openjdk-wm') + + cd "${srcdir}/${_imgdir}/jre" + + # TODO? Should /usr/lib/jvm/java-8-openjdk/jre/lib/sound.properties belong to jre? + for f in ${_nonheadless[@]}; do + install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}" + done + + # Man pages + pushd "${pkgdir}${_jvmdir}/jre/bin" + install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/ + for file in *; do + install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \ + "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1" + install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \ + "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1" + done + popd + + # Desktop files + # TODO add these when switching to IcedTea + #install -D -m 644 "${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop" \ + # "${pkgdir}/usr/share/applications/policytool.desktop" + + # Install license + install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/" + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" +} + +package_jdk8-openjdk() { + pkgdesc='OpenJDK Java 8 development kit (Parabola rebranded)' + depends=("jre8-openjdk=${pkgver}-${pkgrel}") + provides=('java-environment=8' 'java-environment-openjdk=8') + replaces=('jdk8-openjdk-wm') + install=install_jdk8-openjdk.sh + + cd "${srcdir}/${_imgdir}" + + # Main files + install -d -m 755 "${pkgdir}${_jvmdir}" + + cp -a include lib "${pkgdir}${_jvmdir}" + + # 'bin' files + pushd bin + + # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page + for b in $(ls | grep -v java-rmi.cgi); do + if [ -e ../jre/bin/${b} ]; then + # Provide a link of the jre binary in the jdk/bin/ directory + ln -s ../jre/bin/${b} "${pkgdir}${_jvmdir}/bin/${b}" + else + # Copy binary to jdk/bin/ + install -D -m 755 ${b} "${pkgdir}${_jvmdir}/bin/${b}" + # Copy man page + install -D -m 644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}-${_jdkname}.1" + install -D -m 644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}-${_jdkname}.1" + fi + done + popd + + # Handling 'java-rmi.cgi' separately + install -D -m 755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi" + + # Desktop files. + # TODO add these when switching to IcedTea + #install -m 644 "${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop" \ + # "${pkgdir}/usr/share/applications" + + # link license + install -d -m 755 "${pkgdir}/usr/share/licenses/" + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" +} diff --git a/libre/java8-openjdk/install_jdk8-openjdk.sh b/libre/java8-openjdk/install_jdk8-openjdk.sh new file mode 100644 index 000000000..33f3fe77f --- /dev/null +++ b/libre/java8-openjdk/install_jdk8-openjdk.sh @@ -0,0 +1,38 @@ +this_java='java-8-openjdk' + +post_install() { + default=$(/usr/bin/parabola-java get) + if [ -z "${default}" ]; then + /usr/bin/parabola-java set ${this_java} + elif [ "${default/\/jre}" = "${this_java/\/jre}" ]; then + /usr/bin/parabola-java fix + else + echo "Default Java environment is already set to '${default}'" + echo "To set '${this_java}' as default, consider using:" + echo " parabola-java set '${this_java}'" + fi + + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + JAVA_HOME=/usr/lib/jvm/java-default-runtime /usr/bin/init-jks-keystore + fi +} + +post_upgrade() { + default=$(/usr/bin/parabola-java get) + if [ -z "${default}" ]; then + /usr/bin/parabola-java set ${this_java} + elif [ "${default/\/jre}" = "${this_java/\/jre}" ]; then + /usr/bin/parabola-java fix + fi + + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + JAVA_HOME=/usr/lib/jvm/java-default-runtime /usr/bin/init-jks-keystore + fi +} + +pre_remove() { + default=$(/usr/bin/parabola-java get) + if [ "${default/\/jre}" = "${this_java/\/jre}" ]; then + /usr/bin/parabola-java set ${this_java}/jre + fi +} diff --git a/libre/java8-openjdk/install_jre8-openjdk-headless.sh b/libre/java8-openjdk/install_jre8-openjdk-headless.sh new file mode 100644 index 000000000..7e2834984 --- /dev/null +++ b/libre/java8-openjdk/install_jre8-openjdk-headless.sh @@ -0,0 +1,39 @@ +this_java='java-8-openjdk/jre' + +post_install() { + default=$(/usr/bin/parabola-java get) + if [ -z "${default}" ]; then + /usr/bin/parabola-java set ${this_java} + elif [ "${default/\/jre}" = "${this_java/\/jre}" ]; then + /usr/bin/parabola-java fix + else + echo "Default Java environment is already set to '${default}'" + echo "To set '${this_java}' as default, consider using:" + echo " parabola-java set '${this_java}'" + fi + + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + JAVA_HOME=/usr/lib/jvm/java-default-runtime /usr/bin/init-jks-keystore + fi +} + +post_upgrade() { + default=$(/usr/bin/parabola-java get) + if [ -z "${default}" ]; then + /usr/bin/parabola-java set ${this_java} + elif [ "${default/\/jre}" = "${this_java/\/jre}" ]; then + /usr/bin/parabola-java fix + fi + + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + JAVA_HOME=/usr/lib/jvm/java-default-runtime /usr/bin/init-jks-keystore + fi +} + +pre_remove() { + default=$(/usr/bin/parabola-java get) + if [ "x${default/\/jre}" = "x${this_java/\/jre}" ]; then + /usr/bin/parabola-java unset + echo 'No Java environment is set anymore' + fi +} diff --git a/libre/java8-openjdk/install_jre8-openjdk.sh b/libre/java8-openjdk/install_jre8-openjdk.sh new file mode 100644 index 000000000..ab17eebcb --- /dev/null +++ b/libre/java8-openjdk/install_jre8-openjdk.sh @@ -0,0 +1,45 @@ +this_java='java-8-openjdk/jre' + +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + echo "when you use a non-reparenting window manager" + echo "set _JAVA_AWT_WM_NONREPARENTING=1 in" + echo "/etc/profile.d/jre.sh" + +# update-desktop-database -q + + default=$(/usr/bin/parabola-java get) + if [ -z "${default}" ]; then + /usr/bin/parabola-java set ${this_java} + elif [ "${default/\/jre}" = "${this_java/\/jre}" ]; then + /usr/bin/parabola-java fix + else + echo "Default Java environment is already set to '${default}'" + echo "To set '${this_java}' as default, consider using:" + echo " parabola-java set '${this_java}'" + fi +} + +post_upgrade() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + +# update-desktop-database -q + + default=$(/usr/bin/parabola-java get) + if [ -z "${default}" ]; then + /usr/bin/parabola-java set ${this_java} + elif [ "${default/\/jre}" = "${this_java/\/jre}" ]; then + /usr/bin/parabola-java fix + fi +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + +# update-desktop-database -q + + default=$(/usr/bin/parabola-java get) + if [ "${default/\/jre}" = "${this_java/\/jre}" ]; then + /usr/bin/parabola-java fix + fi +} |