Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (990fc5815cd2b15dd79c366c908c24185bebde9f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (990fc5815cd2b15dd79c366c908c24185bebde9f)
  • Date: Sat, 26 Sep 2020 09:48:38 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

java/openjdk13/CONFLICTS | 9 +++++++++
java/openjdk13/DEPENDS | 38 ++++++++++++++++++++++++++++++++++++++
java/openjdk13/FINAL | 3 +++
java/openjdk13/HISTORY | 4 ++++
java/openjdk13/INSTALL | 6 ++++++
java/openjdk13/PRE_BUILD | 16 ++++++++++++++++
java/openjdk13/PROVIDES | 4 ++++
7 files changed, 80 insertions(+)

New commits:
commit 990fc5815cd2b15dd79c366c908c24185bebde9f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

java/openjdk13: add missing files

diff --git a/java/openjdk13/CONFLICTS b/java/openjdk13/CONFLICTS
new file mode 100755
index 0000000..31a9940
--- /dev/null
+++ b/java/openjdk13/CONFLICTS
@@ -0,0 +1,9 @@
+CONFLICT_SPELLS=(
+ j2sdk j2sdk-bin
+ jdk1.5-bin jdk6-bin jdk7-bin jdk8-bin
+ jre1.5-bin jre6-bin jre7-bin jre8-bin
+ openjdk12 openjdk12-bin openjdk13-bin
+ server-jre8-bin) &&
+for conflict_spell in "${CONFLICT_SPELLS[@]}"; do
+ conflicts "$conflict_spell"
+done
diff --git a/java/openjdk13/DEPENDS b/java/openjdk13/DEPENDS
new file mode 100755
index 0000000..9ad8ef0
--- /dev/null
+++ b/java/openjdk13/DEPENDS
@@ -0,0 +1,38 @@
+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 &&
+
+depends GIFLIB "--with-giflib=system" &&
+depends lcms2 "--with-lcms=system" &&
+depends JPEG "--with-libjpeg=system" &&
+depends libpng "--with-libpng=system" &&
+depends zlib "--with-zlib=system"
diff --git a/java/openjdk13/FINAL b/java/openjdk13/FINAL
new file mode 100755
index 0000000..4d405ec
--- /dev/null
+++ b/java/openjdk13/FINAL
@@ -0,0 +1,3 @@
+# ensure the JAVA_HOME is available.
+#
+source /etc/profile.d/java.sh
diff --git a/java/openjdk13/HISTORY b/java/openjdk13/HISTORY
index a2ccd02..47f3cfe 100644
--- a/java/openjdk13/HISTORY
+++ b/java/openjdk13/HISTORY
@@ -1,3 +1,7 @@
+2020-09-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * CONFLICTS, DEPENDS, FINAL, INSTALL, PRE_BUILD, PROVIDES: add
+ missing files
+
2020-07-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, BUILD: version 13.0.4+8

diff --git a/java/openjdk13/INSTALL b/java/openjdk13/INSTALL
new file mode 100755
index 0000000..2602952
--- /dev/null
+++ b/java/openjdk13/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/java13
diff --git a/java/openjdk13/PRE_BUILD b/java/openjdk13/PRE_BUILD
new file mode 100755
index 0000000..ace8772
--- /dev/null
+++ b/java/openjdk13/PRE_BUILD
@@ -0,0 +1,16 @@
+default_pre_build &&
+
+cd "$SOURCE_DIRECTORY" &&
+
+unpack_file 2 &&
+
+#
+# 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/java/openjdk13/PROVIDES b/java/openjdk13/PROVIDES
new file mode 100755
index 0000000..8f2b7c0
--- /dev/null
+++ b/java/openjdk13/PROVIDES
@@ -0,0 +1,4 @@
+JAVA
+JAVA13
+JDK
+JDK13



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (990fc5815cd2b15dd79c366c908c24185bebde9f), Florian Franzmann, 09/26/2020

Archive powered by MHonArc 2.6.24.

Top of Page