Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (9aa9752c4297fb2afa7a61e185daa3a81e0cb8a2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (9aa9752c4297fb2afa7a61e185daa3a81e0cb8a2)
  • Date: Sat, 24 Nov 2007 13:30:45 -0600

GIT changes to master z-rejected grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

z-java/jdk6-bin/DETAILS | 4 ++--
z-java/jdk6-bin/HISTORY | 9 +++++++++
z-java/jdk6-bin/INSTALL | 4 +---
z-java/jdk6-bin/PRE_BUILD | 24 +++++++++++++++++++++++-
4 files changed, 35 insertions(+), 6 deletions(-)

New commits:
commit 9aa9752c4297fb2afa7a61e185daa3a81e0cb8a2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jdk6-bin: Fix for x86_64 (also tested on x86)

diff --git a/z-java/jdk6-bin/DETAILS b/z-java/jdk6-bin/DETAILS
index d22a9f9..627e962 100755
--- a/z-java/jdk6-bin/DETAILS
+++ b/z-java/jdk6-bin/DETAILS
@@ -2,7 +2,7 @@
SPELL=jdk6-bin
VERSION=6u3
VER=1.6.0_03
- PATCHLEVEL=1
+ PATCHLEVEL=2
case "${SMGL_COMPAT_ARCHS[0]}" in
ia32|32)
SOURCE=jdk-$VERSION-dlj-linux-i586.bin
@@ -30,7 +30,7 @@ esac
SOURCE_URL=http://dlc.sun.com/dlj/binaries/$SOURCE
LICENSE=DLJ
WEB_SITE=http://java.sun.com/javase/downloads/index.jsp
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/jdk${VER/_01}
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/jdk${VER}
ENTERED=20070208
ARCHIVE="off"
REJECT="is non-source"
diff --git a/z-java/jdk6-bin/HISTORY b/z-java/jdk6-bin/HISTORY
index 53d10e4..0351690 100644
--- a/z-java/jdk6-bin/HISTORY
+++ b/z-java/jdk6-bin/HISTORY
@@ -1,3 +1,11 @@
+2007-11-24 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: SOURCE_DIRECTORY uses _03, not _01 now
+ Updated PATCHLEVEL, anyone on amd64 will have no JAVA from this
+ * PRE_BUILD: Extraction script for amd64 is broken, us unzip method
+ Unzip always fails, even when successful, here so pass || true
+ Unpack JAR files (done with the --unpack command to the script)
+ * INSTALL: Copy files to $INSTALL_ROOT/usr/lib, don't extract in
INSTALL
+
2007-10-24 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated to version 6u3

@@ -30,3 +38,4 @@

2007-02-08 David Kowis <dkowis AT shlrm.org>
* ALL: created spell based off the jdk1.5-bin spell
+
diff --git a/z-java/jdk6-bin/INSTALL b/z-java/jdk6-bin/INSTALL
index e8fce29..343e85a 100755
--- a/z-java/jdk6-bin/INSTALL
+++ b/z-java/jdk6-bin/INSTALL
@@ -1,6 +1,4 @@
-cd ${INSTALL_ROOT}/usr/lib &&
-
-sh $SOURCE_CACHE/$SOURCE --accept-license --unpack &&
+cp -va $SOURCE_DIRECTORY /usr/lib &&

if [[ "${ARCHITECTURE[0]}" == "i386" || "${ARCHITECTURE[0]}" == "i486" ]]
then
diff --git a/z-java/jdk6-bin/PRE_BUILD b/z-java/jdk6-bin/PRE_BUILD
index b65c931..9939c1e 100755
--- a/z-java/jdk6-bin/PRE_BUILD
+++ b/z-java/jdk6-bin/PRE_BUILD
@@ -1 +1,23 @@
-unpack_file ''
+verify_file '' &&
+mk_source_dir $SOURCE_DIRECTORY &&
+unzip -qq -d $BUILD_DIRECTORY $SOURCE_CACHE/$SOURCE || true &&
+cd $SOURCE_DIRECTORY &&
+
+#
+# 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 &&
+
+#
+# Unpack JAR files
+#
+for pack_file in jre/lib/rt.pack jre/lib/jsse.pack jre/lib/charsets.pack
lib/tools.pack jre/lib/ext/localedata.pack
+do
+ bin/unpack200 $pack_file ${pack_file/pack/jar}
+done



  • [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (9aa9752c4297fb2afa7a61e185daa3a81e0cb8a2), Eric Sandall, 11/24/2007

Archive powered by MHonArc 2.6.24.

Top of Page