sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (58a8d5b908173df64a5f7ede5ee113c182de8193)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (58a8d5b908173df64a5f7ede5ee113c182de8193)
- Date: Thu, 4 Feb 2021 03:59:11 +0000
GIT changes to master z-rejected grimoire by Eric Sandall
<sandalle AT sourcemage.org>:
ChangeLog | 3 +++
z-java/jdk1.5-bin/CONFLICTS | 3 ++-
z-java/jdk1.5-bin/HISTORY | 3 +++
z-java/jdk11-bin/BUILD | 1 +
z-java/jdk11-bin/CONFIGURE | 7 +++++++
z-java/jdk11-bin/CONFLICTS | 11 +++++++++++
z-java/jdk11-bin/DEPENDS | 7 +++++++
z-java/jdk11-bin/DETAILS | 15 +++++++++++++++
z-java/jdk11-bin/FINAL | 3 +++
z-java/jdk11-bin/HISTORY | 3 +++
z-java/jdk11-bin/INSTALL | 35 +++++++++++++++++++++++++++++++++++
z-java/jdk11-bin/JAVA_WARNING | 13 +++++++++++++
z-java/jdk11-bin/PRE_BUILD | 12 ++++++++++++
z-java/jdk11-bin/PROVIDES | 8 ++++++++
z-java/jdk11-bin/UNATTEND_SAFE | 1 +
z-java/jdk6-bin/CONFLICTS | 3 ++-
z-java/jdk6-bin/HISTORY | 3 +++
z-java/jdk7-bin/CONFLICTS | 1 +
z-java/jdk7-bin/HISTORY | 3 +++
z-java/jdk8-bin/CONFLICTS | 1 +
z-java/jdk8-bin/HISTORY | 3 +++
z-java/jre1.5-bin/CONFLICTS | 3 ++-
z-java/jre1.5-bin/HISTORY | 3 +++
z-java/jre6-bin/CONFLICTS | 3 ++-
z-java/jre6-bin/HISTORY | 3 +++
z-java/jre7-bin/CONFLICTS | 3 ++-
z-java/jre7-bin/HISTORY | 3 +++
z-java/jre8-bin/CONFLICTS | 1 +
z-java/jre8-bin/HISTORY | 3 +++
29 files changed, 156 insertions(+), 5 deletions(-)
New commits:
commit 58a8d5b908173df64a5f7ede5ee113c182de8193
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
z-java/jdk11-bin: Added JDK 11 spell
diff --git a/ChangeLog b/ChangeLog
index 101e0c1..017cc75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2021-02-03 Eric Sandall <sandalle AT sourcemage.org>
+ * z-java/jdk11-bin: Added JDK 11 spell
+
2020-01-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* FUNCTIONS: filter -fno-plt in disable_pic
diff --git a/z-java/jdk1.5-bin/CONFLICTS b/z-java/jdk1.5-bin/CONFLICTS
index 9cad3fe..1db5997 100755
--- a/z-java/jdk1.5-bin/CONFLICTS
+++ b/z-java/jdk1.5-bin/CONFLICTS
@@ -5,4 +5,5 @@ conflicts jre6-bin &&
conflicts jdk6-bin &&
conflicts jre7-bin &&
conflicts jre8-bin &&
-conflicts jdk7-bin
+conflicts jdk7-bin &&
+conflicts jdk11-bin
diff --git a/z-java/jdk1.5-bin/HISTORY b/z-java/jdk1.5-bin/HISTORY
index b28ecc9..47775b8 100644
--- a/z-java/jdk1.5-bin/HISTORY
+++ b/z-java/jdk1.5-bin/HISTORY
@@ -1,3 +1,6 @@
+2021-02-03 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jdk11-bin
+
2014-04-23 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Conflicts with jre8-bin
diff --git a/z-java/jdk11-bin/BUILD b/z-java/jdk11-bin/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/z-java/jdk11-bin/BUILD
@@ -0,0 +1 @@
+true
diff --git a/z-java/jdk11-bin/CONFIGURE b/z-java/jdk11-bin/CONFIGURE
new file mode 100755
index 0000000..ee38dba
--- /dev/null
+++ b/z-java/jdk11-bin/CONFIGURE
@@ -0,0 +1,7 @@
+# download java sources warning.
+#
+source $SPELL_DIRECTORY/JAVA_WARNING &&
+
+# Standard rejected warnings.
+#
+source $GRIMOIRE/REJECTED_MSG
diff --git a/z-java/jdk11-bin/CONFLICTS b/z-java/jdk11-bin/CONFLICTS
new file mode 100755
index 0000000..75fb170
--- /dev/null
+++ b/z-java/jdk11-bin/CONFLICTS
@@ -0,0 +1,11 @@
+conflicts j2sdk &&
+conflicts j2sdk-bin &&
+conflicts jdk1.5-bin &&
+conflicts jdk6-bin &&
+conflicts jdk7-bin &&
+conflicts jdk8-bin &&
+conflicts jre1.5-bin &&
+conflicts jre6-bin &&
+conflicts jre7-bin &&
+conflicts jre8-bin &&
+conflicts server-jre8-bin
diff --git a/z-java/jdk11-bin/DEPENDS b/z-java/jdk11-bin/DEPENDS
new file mode 100755
index 0000000..2343910
--- /dev/null
+++ b/z-java/jdk11-bin/DEPENDS
@@ -0,0 +1,7 @@
+depends alsa-lib &&
+depends gcc &&
+depends libx11 &&
+depends libxext &&
+depends libxt &&
+depends libxtst &&
+depends ODBC-MGR
diff --git a/z-java/jdk11-bin/DETAILS b/z-java/jdk11-bin/DETAILS
new file mode 100755
index 0000000..d4dd256
--- /dev/null
+++ b/z-java/jdk11-bin/DETAILS
@@ -0,0 +1,15 @@
+. $GRIMOIRE/FUNCTIONS
+ SPELL=jdk11-bin
+ VERSION=11.0.10
+ SOURCE=jdk-${VERSION}_linux-x64_bin.tar.gz
+
SOURCE_HASH=sha512:1773eacdde92fd52e58b7acea81dc274b1c3c7272673573ed2292b97aebb30542faeff8696155de8126ec6ee9aa567e18611784e48786c7da2a91f524c80cedd
+
WEB_SITE=https://www.oracle.com/java/technologies/javase-downloads.html#JDK11
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/jdk-${VERSION}"
+ ENTERED=20210203
+ ARCHIVE="off"
+ REJECT="is non-source"
+ SHORT="Java 11 Software Development Kit"
+cat << EOF
+The Java 11 Development Kit is a feature-complete development and
+deployment platform.
+EOF
diff --git a/z-java/jdk11-bin/FINAL b/z-java/jdk11-bin/FINAL
new file mode 100755
index 0000000..4d405ec
--- /dev/null
+++ b/z-java/jdk11-bin/FINAL
@@ -0,0 +1,3 @@
+# ensure the JAVA_HOME is available.
+#
+source /etc/profile.d/java.sh
diff --git a/z-java/jdk11-bin/HISTORY b/z-java/jdk11-bin/HISTORY
new file mode 100644
index 0000000..ef02354
--- /dev/null
+++ b/z-java/jdk11-bin/HISTORY
@@ -0,0 +1,3 @@
+2021-02-03 Eric Sandall <sandalle AT sourcemage.org>
+ * Created
+
diff --git a/z-java/jdk11-bin/INSTALL b/z-java/jdk11-bin/INSTALL
new file mode 100755
index 0000000..4e62199
--- /dev/null
+++ b/z-java/jdk11-bin/INSTALL
@@ -0,0 +1,35 @@
+cp -pPR "${SOURCE_DIRECTORY}" "${INSTALL_ROOT}"/usr/lib &&
+
+if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]; then
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk-${VERSION}/jre/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/mozilla/plugins/libnpjp2.so
+fi &&
+
+if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]; then
+ message "${MESSAGE_COLOR}Installing plugin for xulrunner${DEFAULT_COLOR}"
&&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk-${VERSION}/jre/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libnpjp2.so
+fi &&
+
+if [ -d ${INSTALL_ROOT}/usr/lib/firefox/plugins ]; then
+ message "${MESSAGE_COLOR}Installing plugin for firefox${DEFAULT_COLOR}" &&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk-${VERSION}/jre/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/firefox/plugins/libnpjp2.so
+fi &&
+
+if [ -d ${INSTALL_ROOT}/opt/firefox/plugins ]; then
+ message "${MESSAGE_COLOR}Installing plugin for
firefox-bin${DEFAULT_COLOR}" &&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk-${VERSION}/jre/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/opt/firefox/plugins/libnpjp2.so
+fi
+
+if [ -d ${INSTALL_ROOT}/usr/lib/seamonkey/plugins ]; then
+ message "${MESSAGE_COLOR}Installing plugin for seamonkey${DEFAULT_COLOR}"
&&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk-${VERSION}/jre/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/seamonkey/plugins/libnpjp2.so
+fi
+
+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-${VERSION}/
${INSTALL_ROOT}/usr/lib/j2sdk &&
+ln -sfn ${INSTALL_ROOT}/usr/lib/jdk-${VERSION}/
${INSTALL_ROOT}/usr/lib/java11
diff --git a/z-java/jdk11-bin/JAVA_WARNING b/z-java/jdk11-bin/JAVA_WARNING
new file mode 100644
index 0000000..d098017
--- /dev/null
+++ b/z-java/jdk11-bin/JAVA_WARNING
@@ -0,0 +1,13 @@
+# Special messages with regards to JRE 1.6.0 sources.
+#
+if [[ ! -f $SOURCE_CACHE/$SOURCE ]]; then
+ message "\n${MESSAGE_COLOR}For $SPELL you need to manually download the
sources for JRE \
+\nversion ${VERSION} from Oracle's website: \
+${DEFAULT_COLOR}\n ${WEB_SITE} \
+\n${MESSAGE_COLOR}Put the downloaded file $SOURCE in \
+${DEFAULT_COLOR}/var/spool/sorcery/ \
+${MESSAGE_COLOR}so cast will find it.\n${DEFAULT_COLOR}" &&
+
+ message "${MESSAGE_COLOR}Please recast when you have the
sources!\n${DEFAULT_COLOR}"
+ return 1
+fi
diff --git a/z-java/jdk11-bin/PRE_BUILD b/z-java/jdk11-bin/PRE_BUILD
new file mode 100755
index 0000000..0bfa2a4
--- /dev/null
+++ b/z-java/jdk11-bin/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" || "${SMGL_COMPAT_ARCHS[1]}" ==
"em64t" ]]
+then
+ if [[ ! -d $INSTALL_ROOT/lib64 ]] && [[ ! -h $INSTALL_ROOT/lib64 ]]
+ then
+ ln -sf $INSTALL_ROOT/lib $INSTALL_ROOT/lib64
+ fi
+fi
diff --git a/z-java/jdk11-bin/PROVIDES b/z-java/jdk11-bin/PROVIDES
new file mode 100755
index 0000000..66c356a
--- /dev/null
+++ b/z-java/jdk11-bin/PROVIDES
@@ -0,0 +1,8 @@
+JAVA
+JAVA7
+JAVA8
+JAVA11
+JDK
+JDK7
+JDK8
+JDK11
diff --git a/z-java/jdk11-bin/UNATTEND_SAFE b/z-java/jdk11-bin/UNATTEND_SAFE
new file mode 100644
index 0000000..b3d64f9
--- /dev/null
+++ b/z-java/jdk11-bin/UNATTEND_SAFE
@@ -0,0 +1 @@
+License has already been agreed to on first cast
diff --git a/z-java/jdk6-bin/CONFLICTS b/z-java/jdk6-bin/CONFLICTS
index c26acde..5ea5c8f 100755
--- a/z-java/jdk6-bin/CONFLICTS
+++ b/z-java/jdk6-bin/CONFLICTS
@@ -5,4 +5,5 @@ conflicts jre6-bin &&
conflicts jdk1.5-bin &&
conflicts jre7-bin &&
conflicts jre8-bin &&
-conflicts jdk7-bin
+conflicts jdk7-bin &&
+conflicts jdk11-bin
diff --git a/z-java/jdk6-bin/HISTORY b/z-java/jdk6-bin/HISTORY
index 7ed2ba4..b450729 100644
--- a/z-java/jdk6-bin/HISTORY
+++ b/z-java/jdk6-bin/HISTORY
@@ -1,3 +1,6 @@
+2021-02-03 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jdk11-bin
+
2019-07-08 Eric Sandall <sandalle AT sourcemage.org>
* Set 64-bit for EM64T as well.
Sorcery devel (from git), glibc, gcc, or updated smgl-archspecs
changed
diff --git a/z-java/jdk7-bin/CONFLICTS b/z-java/jdk7-bin/CONFLICTS
index 1913951..7dc8b39 100755
--- a/z-java/jdk7-bin/CONFLICTS
+++ b/z-java/jdk7-bin/CONFLICTS
@@ -2,6 +2,7 @@ conflicts j2sdk &&
conflicts j2sdk-bin &&
conflicts jdk1.5-bin &&
conflicts jdk6-bin &&
+conflicts jdk11-bin &&
conflicts jre1.5-bin &&
conflicts jre6-bin &&
conflicts jre7-bin &&
diff --git a/z-java/jdk7-bin/HISTORY b/z-java/jdk7-bin/HISTORY
index 50b987c..9b534c7 100644
--- a/z-java/jdk7-bin/HISTORY
+++ b/z-java/jdk7-bin/HISTORY
@@ -1,3 +1,6 @@
+2021-02-03 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jdk11-bin
+
2019-07-08 Eric Sandall <sandalle AT sourcemage.org>
* Set 64-bit for EM64T as well.
Sorcery devel (from git), glibc, gcc, or updated smgl-archspecs
changed
diff --git a/z-java/jdk8-bin/CONFLICTS b/z-java/jdk8-bin/CONFLICTS
index 5b8ab44..1ac9578 100755
--- a/z-java/jdk8-bin/CONFLICTS
+++ b/z-java/jdk8-bin/CONFLICTS
@@ -3,6 +3,7 @@ conflicts j2sdk-bin &&
conflicts jdk1.5-bin &&
conflicts jdk6-bin &&
conflicts jdk7-bin &&
+conflicts jdk11-bin &&
conflicts jre1.5-bin &&
conflicts jre6-bin &&
conflicts jre7-bin &&
diff --git a/z-java/jdk8-bin/HISTORY b/z-java/jdk8-bin/HISTORY
index 352a283..f3c03ab 100644
--- a/z-java/jdk8-bin/HISTORY
+++ b/z-java/jdk8-bin/HISTORY
@@ -1,3 +1,6 @@
+2021-02-03 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jdk11-bin
+
2020-02-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 8u241
Remove SMGL_COMPAT_ARCHS support as I don't think anyone uses
32-bit-only
diff --git a/z-java/jre1.5-bin/CONFLICTS b/z-java/jre1.5-bin/CONFLICTS
index ec9c2fa..4757983 100755
--- a/z-java/jre1.5-bin/CONFLICTS
+++ b/z-java/jre1.5-bin/CONFLICTS
@@ -4,4 +4,5 @@ conflicts jdk1.5-bin &&
conflicts jdk6-bin &&
conflicts jre7-bin &&
conflicts jre8-bin &&
-conflicts jdk7-bin
+conflicts jdk7-bin &&
+conflicts jdk11-bin
diff --git a/z-java/jre1.5-bin/HISTORY b/z-java/jre1.5-bin/HISTORY
index 3e8190f..12b3236 100644
--- a/z-java/jre1.5-bin/HISTORY
+++ b/z-java/jre1.5-bin/HISTORY
@@ -1,3 +1,6 @@
+2021-02-03 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jdk11-bin
+
2014-04-23 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Conflicts with jre8-bin
diff --git a/z-java/jre6-bin/CONFLICTS b/z-java/jre6-bin/CONFLICTS
index e128ccb..d5b5fed 100755
--- a/z-java/jre6-bin/CONFLICTS
+++ b/z-java/jre6-bin/CONFLICTS
@@ -5,4 +5,5 @@ conflicts jre1.5-bin &&
conflicts jdk6-bin &&
conflicts jre7-bin &&
conflicts jre8-bin &&
-conflicts jdk7-bin
+conflicts jdk7-bin &&
+conflicts jdk11-bin
diff --git a/z-java/jre6-bin/HISTORY b/z-java/jre6-bin/HISTORY
index 0c6d9b1..0dbe7c3 100644
--- a/z-java/jre6-bin/HISTORY
+++ b/z-java/jre6-bin/HISTORY
@@ -1,3 +1,6 @@
+2021-02-03 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jdk11-bin
+
2019-07-08 Eric Sandall <sandalle AT sourcemage.org>
* Set 64-bit for EM64T as well.
Sorcery devel (from git), glibc, gcc, or updated smgl-archspecs
changed
diff --git a/z-java/jre7-bin/CONFLICTS b/z-java/jre7-bin/CONFLICTS
index dfc5b49..8128881 100755
--- a/z-java/jre7-bin/CONFLICTS
+++ b/z-java/jre7-bin/CONFLICTS
@@ -5,4 +5,5 @@ conflicts jre1.5-bin &&
conflicts jdk6-bin &&
conflicts jre6-bin &&
conflicts jre8-bin &&
-conflicts jdk7-bin
+conflicts jdk7-bin &&
+conflicts jdk11-bin
diff --git a/z-java/jre7-bin/HISTORY b/z-java/jre7-bin/HISTORY
index 1bed87a..7b77498 100644
--- a/z-java/jre7-bin/HISTORY
+++ b/z-java/jre7-bin/HISTORY
@@ -1,3 +1,6 @@
+2021-02-03 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jdk11-bin
+
2019-07-08 Eric Sandall <sandalle AT sourcemage.org>
* Set 64-bit for EM64T as well.
Sorcery devel (from git), glibc, gcc, or updated smgl-archspecs
changed
diff --git a/z-java/jre8-bin/CONFLICTS b/z-java/jre8-bin/CONFLICTS
index 5a6b507..38871ce 100755
--- a/z-java/jre8-bin/CONFLICTS
+++ b/z-java/jre8-bin/CONFLICTS
@@ -4,6 +4,7 @@ conflicts jdk1.5-bin &&
conflicts jdk6-bin &&
conflicts jdk7-bin &&
conflicts jdk8-bin &&
+conflicts jdk11-bin &&
conflicts jre1.5-bin &&
conflicts jre6-bin &&
conflicts jre7-bin &&
diff --git a/z-java/jre8-bin/HISTORY b/z-java/jre8-bin/HISTORY
index 32b793c..3be57cd 100644
--- a/z-java/jre8-bin/HISTORY
+++ b/z-java/jre8-bin/HISTORY
@@ -1,3 +1,6 @@
+2021-02-03 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jdk11-bin
+
2020-02-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 8u241
Remove SMGL_COMPAT_ARCHS support as I don't think anyone uses
32-bit-only
- [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (58a8d5b908173df64a5f7ede5ee113c182de8193), Eric Sandall, 02/03/2021
Archive powered by MHonArc 2.6.24.