diff options
| -rw-r--r-- | dev-java/sun-j2sdk/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/sun-j2sdk/files/1.5.0/j2sdk-1.5.0-syntax.patch | 144 | ||||
| -rw-r--r-- | dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.5.0 | 3 | ||||
| -rw-r--r-- | dev-java/sun-j2sdk/files/sun-j2sdk-1.5.0 | 12 | ||||
| -rw-r--r-- | dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild | 145 |
5 files changed, 308 insertions, 0 deletions
diff --git a/dev-java/sun-j2sdk/Manifest b/dev-java/sun-j2sdk/Manifest index 02b9ec5551f3..1ba71555c26b 100644 --- a/dev-java/sun-j2sdk/Manifest +++ b/dev-java/sun-j2sdk/Manifest @@ -1,10 +1,14 @@ MD5 c06e2a9da33afc0c4cede26fd96ac628 sun-j2sdk-1.4.2.ebuild 3857 +MD5 1bf91cb3b2d26e7e5ea4841f19dfbe58 sun-j2sdk-1.5.0.ebuild 3778 +MD5 5edbd843e39bdbd6ef141ca437f594e9 screenlog.0 947 +MD5 5d7b11b58b298cd9413787180d798117 .sun-j2sdk-1.5.0.ebuild.swp 16384 MD5 b713a26f4a6f3579d549a17a011a91e4 ChangeLog 4844 MD5 f4eeb1e3cd292967d0a36065d8bc1e3e sun-j2sdk-1.4.1-r1.ebuild 3990 MD5 e6418a470f5fcef0c9f4a4de3e2dceea metadata.xml 243 MD5 3151dccccac816a78850fca950201f6f files/sun-j2sdk-1.4.1 447 MD5 60bd680f79f527d9c9800ac78bac5dbe files/sun-j2sdk-1.4.2 447 MD5 8dd70a39cc87436b9e6f41ea3fbfd480 files/digest-sun-j2sdk-1.4.2 223 +MD5 0bc76c4f01884d5ff372ee2b73d3100d files/digest-sun-j2sdk-1.5.0 217 MD5 5ad67dddd14ba49a697fc53bc1a9ddb9 files/digest-sun-j2sdk-1.4.1-r1 153 MD5 1592f54543a5a9c5b9ddd873bc1d5449 files/1.4.1/j2sdk-1.4.1-pthread.patch 1724 MD5 527f4756568740c19c32b1e5eb59ee20 files/1.4.1/j2sdk-1.4.1-disable-sanity-check.patch 650 diff --git a/dev-java/sun-j2sdk/files/1.5.0/j2sdk-1.5.0-syntax.patch b/dev-java/sun-j2sdk/files/1.5.0/j2sdk-1.5.0-syntax.patch new file mode 100644 index 000000000000..1c57b16b69f0 --- /dev/null +++ b/dev-java/sun-j2sdk/files/1.5.0/j2sdk-1.5.0-syntax.patch @@ -0,0 +1,144 @@ +--- ./motif/lib/Xm/util/mkmsgcat.c 2005-01-28 09:42:33.000000000 -0800 ++++ ./motif/lib/Xm/util/mkmsgcat.c.jj 2005-01-28 09:42:24.000000000 -0800 +@@ -14,7 +14,7 @@ + #include <string.h> + char buf[1024]; + +-char *OSF_COPYRIGHT = "$\n\ ++char *OSF_COPYRIGHT = "$ \n\ + $ @OSF_COPYRIGHT@\n\ + $ COPYRIGHT NOTICE\n\ + $ Copyright (c) 1990, 1991, 1992, 1993 Open Software Foundation, Inc.\n\ +@@ -28,7 +28,7 @@ + $ (c) Copyright 1996 Novell, Inc. \n\ + $ (c) Copyright 1996 FUJITSU LIMITED.\n\ + $ (c) Copyright 1996 Hitachi.\n\ +-$"; ++$ "; + + char *OSF_COPYRIGHT_C = "/*\n\ + *\n\ +--- ./hotspot/src/cpu/i486/vm/i486.ad 2005-01-27 20:26:50.000000000 -0800 ++++ ./hotspot/src/cpu/i486/vm/i486.ad.jj 2005-01-27 20:23:19.000000000 -0800 +@@ -246,10 +246,10 @@ + static jlong fp_signmask_pool[(4+1)*2]; // 4*128bits(data) + 128bits(alignment) + + // Static initialization during VM startup. ++static jlong *float_signmask_pool = double_quadword(&fp_signmask_pool[1*2], 0x7FFFFFFF7FFFFFFFULL, 0x7FFFFFFF7FFFFFFFULL); ++static jlong *double_signmask_pool = double_quadword(&fp_signmask_pool[2*2], 0x7FFFFFFFFFFFFFFFULL, 0x7FFFFFFFFFFFFFFFULL); ++static jlong *float_signflip_pool = double_quadword(&fp_signmask_pool[3*2], 0x8000000080000000ULL, 0x8000000080000000ULL); ++static jlong *double_signflip_pool = double_quadword(&fp_signmask_pool[4*2], 0x8000000000000000ULL, 0x8000000000000000ULL); +-static jlong *float_signmask_pool = double_quadword(&fp_signmask_pool[1*2], 0x7FFFFFFF7FFFFFFF, 0x7FFFFFFF7FFFFFFF); +-static jlong *double_signmask_pool = double_quadword(&fp_signmask_pool[2*2], 0x7FFFFFFFFFFFFFFF, 0x7FFFFFFFFFFFFFFF); +-static jlong *float_signflip_pool = double_quadword(&fp_signmask_pool[3*2], 0x8000000080000000, 0x8000000080000000); +-static jlong *double_signflip_pool = double_quadword(&fp_signmask_pool[4*2], 0x8000000000000000, 0x8000000000000000); + + // !!!!! Special hack to get all type of calls to specify the byte offset + // from the start of the call to the point where the return address +--- ./hotspot/src/share/vm/prims/jvmtiExport.cpp 2005-01-27 20:48:18.000000000 -0800 ++++ ./hotspot/src/share/vm/prims/jvmtiExport.cpp.jj 2005-01-27 20:48:12.000000000 -0800 +@@ -13,8 +13,8 @@ + extern struct JVMDI_Interface_1_ jvmdiTrace_Interface; // temporary + + #ifdef JVMTI_TRACE ++#define EVT_TRACE(evt,out) if ((JvmtiTrace::event_trace_flags(evt) & JvmtiTrace::SHOW_EVENT_SENT) != 0) { SafeResourceMark rm; tty->print_cr out; } ++#define EVT_TRIG_TRACE(evt,out) if ((JvmtiTrace::event_trace_flags(evt) & JvmtiTrace::SHOW_EVENT_TRIGGER) != 0) { SafeResourceMark rm; tty->print_cr out; } +-#define EVT_TRACE(evt,out) if ((JvmtiTrace::event_trace_flags(evt) & JvmtiTrace::SHOW_EVENT_SENT) != 0) { SafeResourceMark rm; tty->print_cr##out; } +-#define EVT_TRIG_TRACE(evt,out) if ((JvmtiTrace::event_trace_flags(evt) & JvmtiTrace::SHOW_EVENT_TRIGGER) != 0) { SafeResourceMark rm; tty->print_cr##out; } + #else + #define EVT_TRIG_TRACE(evt,out) + #define EVT_TRACE(evt,out) +--- ./hotspot/src/share/vm/prims/jvmtiEventController.cpp 2005-01-27 20:47:15.000000000 -0800 ++++ ./hotspot/src/share/vm/prims/jvmtiEventController.cpp.jj 2005-01-27 20:47:12.000000000 -0800 +@@ -10,7 +10,7 @@ + # include "incls/_jvmtiEventController.cpp.incl" + + #ifdef JVMTI_TRACE ++#define EC_TRACE(out) if (JvmtiTrace::trace_event_controller()) { SafeResourceMark rm; tty->print_cr out; } while (0) +-#define EC_TRACE(out) if (JvmtiTrace::trace_event_controller()) { SafeResourceMark rm; tty->print_cr##out; } while (0) + #else + #define EC_TRACE(out) + #endif /*JVMTI_TRACE */ +--- ./hotspot/src/share/vm/runtime/globals_extension.hpp 2005-01-27 20:32:39.000000000 -0800 ++++ ./hotspot/src/share/vm/runtime/globals_extension.hpp.jj 2005-01-27 20:32:15.000000000 -0800 +@@ -110,7 +110,7 @@ + + #define FLAG_SET_DEFAULT(name, value) ((name) = (value)) + ++#define FLAG_SET(type, name, value) (CommandLineFlagsEx::type##AtPut(FLAG_MEMBER_WITH_TYPE(name,type), (type)(value))) +-#define FLAG_SET(type, name, value) (CommandLineFlagsEx::##type##AtPut(FLAG_MEMBER_WITH_TYPE(name,type), (type)(value))) + + // Can't put the following in CommandLineFlags because + // of a circular dependency on the enum definition. +--- ./hotspot/src/share/vm/runtime/thread.hpp 2005-01-27 20:15:15.000000000 -0800 ++++ ./hotspot/src/share/vm/runtime/thread.hpp.jj 2005-01-27 20:14:41.000000000 -0800 +@@ -460,7 +460,7 @@ + static ByteSize stack_size_offset() { return byte_offset_of(Thread, _stack_size ); } + + #define TLAB_FIELD_OFFSET(name) \ ++ static ByteSize tlab_##name##_offset() { return byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::name##_offset(); } +- static ByteSize tlab_##name##_offset() { return byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::##name##_offset(); } + + TLAB_FIELD_OFFSET(start) + TLAB_FIELD_OFFSET(end) +--- ./hotspot/src/share/vm/memory/dump.cpp 2005-01-27 20:38:23.000000000 -0800 ++++ ./hotspot/src/share/vm/memory/dump.cpp.jj 2005-01-27 20:38:21.000000000 -0800 +@@ -1035,7 +1035,7 @@ + // Support for a simple checksum of the contents of the class list + // file to prevent trivial tampering. The algorithm matches that in + // the MakeClassList program used by the J2SE build process. ++#define JSUM_SEED ((jlong)0xcafebabebabecafeULL) +-#define JSUM_SEED ((jlong)0xcafebabebabecafe) + static jlong + jsum(jlong start, const char *buf, const int len) + { + +--- ./deploy/make/plugin/adapter/Makefile.jj 2005-01-29 16:44:24.000000000 -0800 ++++ ./deploy/make/plugin/adapter/Makefile 2005-01-29 16:44:25.000000000 -0800 +@@ -18,9 +18,9 @@ + SUBDIRS += ns4-adapter + endif + +-ifeq ($(PLATFORM), linux) +- SUBDIRS += ns7-gcc29-adapter +-endif ++#ifeq ($(PLATFORM), linux) ++# SUBDIRS += ns7-gcc29-adapter ++#endif + + all optimized debug clobber:: $(SUBDIRS) + +--- ./deploy/make/plugin/nscore/Makefile.jj 2005-01-29 16:52:18.000000000 -0800 ++++ ./deploy/make/plugin/nscore/Makefile 2005-01-29 16:52:36.000000000 -0800 +@@ -18,9 +18,9 @@ + SUBDIRS += unix + endif + +-ifeq ($(PLATFORM), linux) +- SUBDIRS += linux-gcc29 +-endif ++#ifeq ($(PLATFORM), linux) ++# SUBDIRS += linux-gcc29 ++#endif + + all optimized debug clobber:: $(SUBDIRS) + +--- ./hotspot/src/os/linux/vm/os_linux.cpp.jj 2005-01-30 13:05:21.028754800 -0800 ++++ ./hotspot/src/os/linux/vm/os_linux.cpp 2005-01-30 13:07:31.295951176 -0800 +@@ -6,6 +6,16 @@ + * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. + */ + ++/* ++ Some gcc version do not consider noinline defined ++ so some linux/compiler.hpp version define it as blank ++ which screws up ++ static void _expand_stack_to(address bottom) __attribute__ ((noinline)); ++ */ ++#ifndef noinline ++#define noinline noinline ++#endif ++ + // do not include precompiled header file + # include "incls/_os_linux.cpp.incl" + diff --git a/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.5.0 b/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.5.0 new file mode 100644 index 000000000000..259145a85999 --- /dev/null +++ b/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.5.0 @@ -0,0 +1,3 @@ +MD5 7802831198068c9a0df727c3ea6617a9 jdk-1_5_0-src-scsl.zip 58338869 +MD5 a832e5a668967a1dfa27912dfc717dcc jdk-1_5_0-mozilla_headers-unix.zip 7767304 +MD5 3c3b2c079628141fa28f5f0f1cde5bf0 jdk-1_5_0-bin-scsl.zip 2219433 diff --git a/dev-java/sun-j2sdk/files/sun-j2sdk-1.5.0 b/dev-java/sun-j2sdk/files/sun-j2sdk-1.5.0 new file mode 100644 index 000000000000..1c5570e5cf54 --- /dev/null +++ b/dev-java/sun-j2sdk/files/sun-j2sdk-1.5.0 @@ -0,0 +1,12 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/files/sun-j2sdk-1.5.0,v 1.1 2005/01/30 21:19:55 cretin Exp $ + +VERSION="Sun JDK @PV@" +JAVA_HOME=/opt/@P@ +JDK_HOME=/opt/@P@ +JAVAC=${JAVA_HOME}/bin/javac +ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" +ADDLDPATH="/opt/@P@/jre/lib/" + +ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH" diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild new file mode 100644 index 000000000000..8b100ff5a0f2 --- /dev/null +++ b/dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild,v 1.1 2005/01/30 21:19:55 cretin Exp $ + +inherit java + +JAVA_PATCHES="syntax" + +S=${WORKDIR}/j2sdk + +MY_PV=${PV//./_} +SRC_JAVA="jdk-${MY_PV}-src-scsl.zip" +SRC_MOZHEADERS="jdk-${MY_PV}-mozilla_headers-unix.zip" +SRC_BINJAVA="jdk-${MY_PV}-bin-scsl.zip" + +SRC_URI="${SRC_JAVA} ${SRC_MOZHEADERS} ${SRC_BINJAVA}" + +DESCRIPTION="Sun's J2SE Development Kit, version 1.4.2 (From sources)" +HOMEPAGE="http://wwws.sun.com/software/java2/download.html" + +SLOT="0" +KEYWORDS="~x86 -ppc -alpha -sparc" +LICENSE="sun-csl" +IUSE="nptl doc mozilla" + +RDEPEND="virtual/libc + virtual/x11 + >=dev-java/java-config-0.1.3" +DEPEND="${RDEPEND} + app-arch/cpio + app-arch/zip + app-arch/unzip + >=virtual/jdk-1.4 + >=media-libs/alsa-lib-0.9.1" +PDEPEND="doc? ( =dev-java/java-sdk-docs-1.4.2* )" + +PROVIDE="virtual/jre-1.4.2 + virtual/jdk-1.4.2 + virtual/java-scheme-2" + +RESTRICT="fetch" + +pkg_nofetch() { + einfo "Please download" + einfo " - ${SRC_MOZHEADERS}" + einfo " - ${SRC_JAVA}" + einfo " - ${SRC_BINJAVA}" + einfo "from ${HOMEPAGE} and place them in ${DISTDIR}" +} + +pkg_setup() { + #Check if we have enough space + if [ `df -P ${PORTAGE_TMPDIR}/portage/ | tail -n 1 | awk '{ print $4 }'` -le 2597152 ] ; then + eerror "You need about 2.5G of disk space to compile this at ${PORTAGE_TMPDIR}/portage," + eerror "it seems you don't have that much, quitting, sorry!" + die "Not enough disk space" + fi + + #Check the Current java-version ~ 1.4 and is jdk + JAVAC=`java-config --javac` + if [ -z $JAVAC ] ; then + eerror "Set java-config to use a jdk not a jre" + die "The version of java set by java-config doesn't contain javac" + fi + + if [ `java-config --java-version 2>&1 | grep "1\.4\." | wc -l` -lt 1 ] ; then + eerror "JDK is too old, >= 1.4 is required" + die "The version of jdk pointed to by java-config is not >=1.4" + fi +} + +src_unpack() { + mkdir ${S} + cd ${S} + unpack ${SRC_JAVA} + unpack ${SRC_BINJAVA} + + mkdir mozilla + cd mozilla + unpack ${SRC_MOZHEADERS} + + cd ${S} + for patch in $JAVA_PATCHES ; do + einfo "Applying patch ${patch}" + patch -p1 < ${FILESDIR}/${PV}/j2sdk-${PV}-${patch}.patch \ + || die "Failed to apply ${patch}" + done +} + +src_compile () { + cd ${S} + unset CLASSPATH JAVA_HOME JAVAC + + unset CFLAGS CXXFLAGS LDFLAGS + + export ALT_MOZILLA_PATH="${S}/mozilla" + export ALT_BOOTDIR=`java-config --jdk-home` + export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts + export ALT_DEVTOOLS_PATH="/usr/bin" + export MILESTONE="gentoo" + export BUILD_NUMBER=`date +%s` + export INSANE=true + export MAKE_VERBOSE=true + export DEV_ONLY=true + export USRBIN_PATH="" + + cd ${S}/control/make + # MUST use make, we DONT want any -j options! + JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"` + if [ -z "$JOBS" ]; then + JOBS=1 + fi + make scsl HOTSPOT_BUILD_JOBS=${JOBS} || die +} + +src_install () { + + dodir /opt/${P} + + cd ${S}/control/build/linux-*/j2sdk-image + local dirs="bin include jre lib" + dodir /opt/${P} + + for i in $dirs ; do + cp -a $i ${D}/opt/${P}/ + done + + dodoc COPYRIGHT LICENSE + dohtml README.html + + doman man/man1/*.1 + + dodir /opt/${P}/share/ + cp -a sample demo src.zip ${D}/opt/${P}/share/ + + chown -R root:root ${D}/opt/${P} + + use mozilla && install_mozilla_plugin /opt/${P}/jre/plugin/i386/ns7/libjavaplugin_oji.so + set_java_env ${FILESDIR}/${VMHANDLE} +} + +pkg_postinst () { + # Set as default VM if none exists + java_pkg_postinst +} |