summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--java/java.sh6
-rwxr-xr-xjava/openjdk12/BUILD18
-rwxr-xr-xjava/openjdk12/CONFLICTS11
-rwxr-xr-xjava/openjdk12/DEPENDS61
-rwxr-xr-xjava/openjdk12/DETAILS15
-rwxr-xr-xjava/openjdk12/FINAL3
-rw-r--r--java/openjdk12/HISTORY2
-rwxr-xr-xjava/openjdk12/INSTALL6
-rwxr-xr-xjava/openjdk12/PREPARE7
-rwxr-xr-xjava/openjdk12/PRE_BUILD12
-rwxr-xr-xjava/openjdk12/PRE_INSTALL3
-rwxr-xr-xjava/openjdk12/PROVIDES4
13 files changed, 151 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 791f08295e..0889a5b04f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2019-05-31 Remko van der Vossen <wich@sourcemage.org>
+ * java/openjdk12: new spell, JDK 12
+
2019-05-30 Eric Sandall <sandalle@sourcemage.org>
* protect_special_libs: Export LD_LIBRARY_PATH to include $PROTECT path
Otherwise $PROTECT does nothing effective (e.g. when readline updates)
diff --git a/java/java.sh b/java/java.sh
new file mode 100644
index 0000000000..709155856a
--- /dev/null
+++ b/java/java.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+JAVA_HOME=/usr/lib/j2sdk
+
+export JAVA_HOME
+export PATH=$PATH:$JAVA_HOME/bin
diff --git a/java/openjdk12/BUILD b/java/openjdk12/BUILD
new file mode 100755
index 0000000000..9a1130d5ba
--- /dev/null
+++ b/java/openjdk12/BUILD
@@ -0,0 +1,18 @@
+cd "$SOURCE_DIRECTORY" &&
+NOWARN="-Wno-error=stringop-truncation"
+NOWARN+=" -Wno-error=format-overflow"
+NOWARN+=" -Wno-error=class-memaccess"
+NOWARN+=" -Wno-error=stringop-overflow"
+NOWARN+=" -Wno-error=implicit-fallthrough"
+NOWARN+=" -Wno-error=cast-function-type"
+NOWARN+=" -Wno-error=missing-attributes"
+NOWARN+=" -Wno-error=format-truncation"
+AUTOCONF=/usr/bin/autoconf bash configure \
+ --with-vendor-name="Source Mage GNU/Linux" \
+ --with-vendor-url="http://www.sourcemage.org" \
+ --with-vendor-bug-url="http://bugs.sourcemage.org" \
+ --with-extra-cflags="$CFLAGS $NOWARN" \
+ --with-extra-cxxflags="$CXXFLAGS $NOWARN" \
+ --with-extra-ldflags="$LDFLAGS" \
+ $OPTS --with-memory-size=1024 &&
+make images
diff --git a/java/openjdk12/CONFLICTS b/java/openjdk12/CONFLICTS
new file mode 100755
index 0000000000..26217320ae
--- /dev/null
+++ b/java/openjdk12/CONFLICTS
@@ -0,0 +1,11 @@
+CONFLICT_SPELLS=(
+ j2sdk j2sdk-bin
+ jdk1.5-bin jdk6-bin jdk7-bin jdk8-bin
+ jre1.5-bin jre6-bin jre7-bin jre8-bin
+ openjdk12-bin
+ server-jre8-bin) &&
+for conflict_spell in "${CONFLICT_SPELLS[@]}"; do
+ if [[ "$conflict_spell" != "$BUILD_JDK" ]]; then
+ conflicts "$conflict_spell"
+ fi
+done
diff --git a/java/openjdk12/DEPENDS b/java/openjdk12/DEPENDS
new file mode 100755
index 0000000000..36a40074fd
--- /dev/null
+++ b/java/openjdk12/DEPENDS
@@ -0,0 +1,61 @@
+depends alsa-lib &&
+depends autoconf &&
+depends bash &&
+depends binutils &&
+depends coreutils &&
+depends cups &&
+depends diffutils &&
+depends file &&
+depends findutils &&
+depends fontconfig &&
+depends freetype2 &&
+depends gawk &&
+depends gcc &&
+depends glibc &&
+depends grep &&
+depends gzip &&
+depends libffi &&
+depends libx11 &&
+depends libxext &&
+depends libxi &&
+depends libxrandr &&
+depends libxrender &&
+depends libxt &&
+depends libxtst &&
+depends make &&
+depends pkgconfig &&
+depends sed &&
+depends tar &&
+depends unzip &&
+depends which &&
+depends xorgproto &&
+depends zip &&
+
+optional_depends giflib \
+ "--with-giflib=system" \
+ "--with-giflib=bundled" \
+ "Use system giflib instead of bundled" &&
+
+optional_depends lcms \
+ "--with-lcms=system" \
+ "--with-lcms=bundled" \
+ "Use system lcms instead of bundled" &&
+
+optional_depends JPEG \
+ "--with-libjpeg=system" \
+ "--with-libjpeg=bundled" \
+ "Use system libjpeg instead of bundled" &&
+
+optional_depends libpng \
+ "--with-libpng=system" \
+ "--with-libpng=bundled" \
+ "Use system libpng instead of bundled" &&
+
+optional_depends zlib \
+ "--with-zlib=system" \
+ "--with-zlib=bundled" \
+ "Use system zlib instead of bundled" &&
+
+if [[ "$BUILD_JDK" != "$SPELL" ]]; then
+ depends $BUILD_JDK
+fi
diff --git a/java/openjdk12/DETAILS b/java/openjdk12/DETAILS
new file mode 100755
index 0000000000..09b385427a
--- /dev/null
+++ b/java/openjdk12/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=openjdk12
+ VERSION=12.0.1+12
+ SOURCE=jdk-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/jdk12u-jdk-$VERSION
+ WEB_SITE=http://openjdk.java.net/
+ SOURCE_URL[0]=http://hg.openjdk.java.net/jdk-updates/jdk12u/archive/$SOURCE
+ SOURCE_HASH=sha512:594cebad5b1733127a860d48c695f7ec2b5a570156e41de261341c34d3e94dda295ea0515be934e37660f5ba3ff54c4812891e874388796317b5ff717a89d236
+ STAGED_INSTALL=off
+ LICENSE[0]=GPL
+ ENTERED=20190525
+ KEYWORDS="java"
+ SHORT="an opensource implementation of the Java Platform, Standard Edition"
+cat << EOF
+an opensource implementation of the Java Platform, Standard Edition
+EOF
diff --git a/java/openjdk12/FINAL b/java/openjdk12/FINAL
new file mode 100755
index 0000000000..4d405ec4a6
--- /dev/null
+++ b/java/openjdk12/FINAL
@@ -0,0 +1,3 @@
+# ensure the JAVA_HOME is available.
+#
+source /etc/profile.d/java.sh
diff --git a/java/openjdk12/HISTORY b/java/openjdk12/HISTORY
new file mode 100644
index 0000000000..02e5e14ba6
--- /dev/null
+++ b/java/openjdk12/HISTORY
@@ -0,0 +1,2 @@
+2019-05-31 Remko van der Vossen <wich@sourcemage.org>
+ * Created spell.
diff --git a/java/openjdk12/INSTALL b/java/openjdk12/INSTALL
new file mode 100755
index 0000000000..cc033f9513
--- /dev/null
+++ b/java/openjdk12/INSTALL
@@ -0,0 +1,6 @@
+cp -pPR "${SOURCE_DIRECTORY}/build/linux-x86_64-server-release/images/jdk" "${INSTALL_ROOT}/usr/lib/jdk-$VER" &&
+
+mkdir -p ${INSTALL_ROOT}/etc/profile.d/ &&
+install -m 0644 $SECTION_DIRECTORY/java.sh ${INSTALL_ROOT}/etc/profile.d/ &&
+ln -sfn ${INSTALL_ROOT}/usr/lib/jdk-$VER/ ${INSTALL_ROOT}/usr/lib/j2sdk &&
+ln -sfn ${INSTALL_ROOT}/usr/lib/jdk-$VER/ ${INSTALL_ROOT}/usr/lib/java12
diff --git a/java/openjdk12/PREPARE b/java/openjdk12/PREPARE
new file mode 100755
index 0000000000..a26cfa3271
--- /dev/null
+++ b/java/openjdk12/PREPARE
@@ -0,0 +1,7 @@
+persistent_remove BUILD_JDK &&
+if spell_ok $SPELL; then
+ BUILD_JDK=$SPELL
+else
+ local JDKS=$(gaze provides JDK12 | grep -v "^$SPELL\$" | tail +2) &&
+ config_query_list BUILD_JDK "Which JDK provider do you want to use to build ${SPELL}?" $JDKS
+fi
diff --git a/java/openjdk12/PRE_BUILD b/java/openjdk12/PRE_BUILD
new file mode 100755
index 0000000000..eb807ae4f9
--- /dev/null
+++ b/java/openjdk12/PRE_BUILD
@@ -0,0 +1,12 @@
+default_pre_build &&
+
+#
+# Java binaries have hardcoded /lib64/ld-linux-x86-64.so.2
+#
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]
+then
+ if [[ ! -d $INSTALL_ROOT/lib64 ]] && [[ ! -h $INSTALL_ROOT/lib64 ]]
+ then
+ ln -sf $INSTALL_ROOT/lib $INSTALL_ROOT/lib64
+ fi
+fi
diff --git a/java/openjdk12/PRE_INSTALL b/java/openjdk12/PRE_INSTALL
new file mode 100755
index 0000000000..973f13c6e6
--- /dev/null
+++ b/java/openjdk12/PRE_INSTALL
@@ -0,0 +1,3 @@
+if [[ "$BUILD_JDK" != "$SPELL" ]]; then
+ dispel $BUILD_JDK
+fi
diff --git a/java/openjdk12/PROVIDES b/java/openjdk12/PROVIDES
new file mode 100755
index 0000000000..a4284887ee
--- /dev/null
+++ b/java/openjdk12/PROVIDES
@@ -0,0 +1,4 @@
+JAVA
+JAVA12
+JDK
+JDK12