*sun-j2sdk-1.4.2 (20 Dec 2003)

  20 Dec 2003; Stefan Jones <cretin@gentoo.org> sun-j2sdk-1.4.2.ebuild :
  New version, cleaned out the patches. Tested with
  sys-devel/gcc-3.3.2-r4, sys-apps/portage-2.0.49-r18
  and sys-libs/glibc-2.3.3_pre20031212 with "nptl" in USE

7 files changed, 355 insertions, 0 deletions

diff --git a/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-force-motif.patch b/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-force-motif.patch
new file mode 100644
index 000000000000..2b5c99d59f4c
--- /dev/null
+++ b/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-force-motif.patch
@@ -0,0 +1,85 @@
+diff -ur j2sdk/control/make/motif-rules.gmk j2sdk.new/control/make/motif-rules.gmk
+--- j2sdk/control/make/motif-rules.gmk	2002-09-06 08:00:16.000000000 +0100
++++ j2sdk.new/control/make/motif-rules.gmk	2003-04-16 15:35:39.000000000 +0100
+@@ -25,7 +25,10 @@
+   ABS_MOTIF_DIR := $(shell $(CD) $(MOTIF_DIR); $(PWD))
+ endif
+ 
+-MOTIF = $(MOTIF_DIR)/lib/libXm.a 
++# Use a non-stadard name for motif lib to avoid using the system installed incompatible lib
++# Similar changes made below.
++# Changed by Tushar Teredesai <tush@yahoo.com>
++MOTIF = $(MOTIF_DIR)/lib/libXm-j2sdk.a 
+ 
+ motif: motif-build motif-install
+ 
+@@ -34,8 +37,8 @@
+ motif-build:
+   ifdef BUILD_MOTIF
+ 	$(CD) $(MOTIF_TOPDIR)/lib/Xm ; \
+-	$(MAKE) MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL); \
+-	$(MAKE) includes MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)
++	$(MAKE) -k MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL); \
++	$(MAKE) -k includes MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)
+   endif
+ 
+ motif-install: motif-install-lib motif-install-include
+@@ -43,15 +46,14 @@
+ motif-install-lib: $(MOTIF_DIR)/lib 
+   ifdef BUILD_MOTIF
+ 	$(CD) $(MOTIF_DIR)/lib; \
+-	$(RM) libXm.a ; \
+-	$(LN) -s $(ABS_MOTIF_TOPDIR)/lib/libXm.a .
++	$(MV) libXm.a libXm-j2sdk.a
+   endif
+ 
+ motif-install-include: $(MOTIF_DIR)/include 
+   ifdef BUILD_MOTIF
+-	$(CD) $(MOTIF_DIR)/include; \
+-	$(RM) Xm ; \
+-	$(LN) -s $(ABS_MOTIF_TOPDIR)/lib/Xm/exports/include/Xm .
++#	$(CD) $(MOTIF_DIR)/include; \
++#	$(RM) Xm ; \
++#	$(LN) -s $(ABS_MOTIF_TOPDIR)/lib/Xm/exports/include/Xm .
+   endif
+ #
+ # clobber the workspace, but note that the motif code misses some
+@@ -62,7 +64,7 @@
+   ifdef BUILD_MOTIF
+ 	( $(CD) $(MOTIF_TOPDIR)/lib/Xm ; \
+ 		$(MAKE) clean MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL); ); \
+-	$(RM) $(MOTIF_TOPDIR)/lib/libXm.a \
++	$(RM) $(MOTIF_TOPDIR)/lib/libXm-j2sdk.a \
+ 	      $(MOTIF_TOPDIR)/lib/Xm/Xm.msg 
+ 	$(RM) -r $(MOTIF_TOPDIR)/lib/Xm/exports
+ 	$(RM) -r $(MOTIF_DIR)/lib $(MOTIF_DIR)/include $(MOTIF_DIR)
+diff -ur j2sdk/j2se/make/sun/awt/Makefile j2sdk.new/j2se/make/sun/awt/Makefile
+--- j2sdk/j2se/make/sun/awt/Makefile	2002-09-06 08:08:23.000000000 +0100
++++ j2sdk.new/j2se/make/sun/awt/Makefile	2003-04-16 15:34:13.000000000 +0100
+@@ -237,8 +237,10 @@
+ ifneq ($(PLATFORM), windows)
+ # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS/LINUX
+ 
++# If using static motif, use the non-standard name for the lib
++# Changed by Tushar Teredesai <tush@yahoo.com>
+ ifeq ($(STATIC_MOTIF),true)
+-  LIBXM = $(MOTIF_LIB)/libXm.a -lXp
++  LIBXM = $(MOTIF_LIB)/libXm-j2sdk.a -lXp
+ else # STATIC_MOTIF
+   LIBXM = -lXm
+ endif # STATIC_MOTIF
+diff -ur j2sdk/j2se/make/sun/awt/mawt.gmk j2sdk.new/j2se/make/sun/awt/mawt.gmk
+--- j2sdk/j2se/make/sun/awt/mawt.gmk	2002-09-06 08:08:24.000000000 +0100
++++ j2sdk.new/j2se/make/sun/awt/mawt.gmk	2003-04-16 15:34:13.000000000 +0100
+@@ -125,8 +125,10 @@
+ else
+ CFLAGS += -DMOTIF_VERSION=$(MOTIF_VERSION)
+ 
++# If using static motif, use non-standard lib name
++# Changed by Tushar Teredesai <tush@yahoo.com>
+ ifeq ($(STATIC_MOTIF),true)
+-LIBXM = $(MOTIF_LIB)/libXm.a -lXp
++LIBXM = $(MOTIF_LIB)/libXm-j2sdk.a -lXp
+ else
+ LIBXM = -lXm
+ endif
diff --git a/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-gcc3.3-fixes.patch b/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-gcc3.3-fixes.patch
new file mode 100644
index 000000000000..4371c7dbb1d4
--- /dev/null
+++ b/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-gcc3.3-fixes.patch
@@ -0,0 +1,68 @@
+--- j2sdk/hotspot/src/cpu/i486/vm/i486.ad.jj	2003-12-19 11:22:00.071710616 +0000
++++ j2sdk/hotspot/src/cpu/i486/vm/i486.ad	2003-12-19 11:22:30.697054856 +0000
+@@ -230,18 +230,18 @@
+ // These masks are used to provide 128-bit aligned bitmasks to the XMM
+ // instructions, to allow sign-masking or sign-bit flipping.  They allow
+ // fast versions of NegF/NegD and AbsF/AbsD.
+-static jlong float_signmask_pool[3] =  {0x7FFFFFFF7FFFFFFF,
+-                                        0x7FFFFFFF7FFFFFFF,
+-                                        0x7FFFFFFF7FFFFFFF};
+-static jlong double_signmask_pool[3] = {0x7FFFFFFFFFFFFFFF,
+-                                        0x7FFFFFFFFFFFFFFF,
+-                                        0x7FFFFFFFFFFFFFFF};
+-static jlong float_signflip_pool[3] =  {0x8000000080000000,
+-                                        0x8000000080000000,
+-                                        0x8000000080000000};
+-static jlong double_signflip_pool[3] = {0x8000000000000000,
+-                                        0x8000000000000000,
+-                                        0x8000000000000000};
++static jlong float_signmask_pool[3] =  {0x7FFFFFFF7FFFFFFFULL,
++                                        0x7FFFFFFF7FFFFFFFULL,
++                                        0x7FFFFFFF7FFFFFFFULL};
++static jlong double_signmask_pool[3] = {0x7FFFFFFFFFFFFFFFULL,
++                                        0x7FFFFFFFFFFFFFFFULL,
++                                        0x7FFFFFFFFFFFFFFFULL};
++static jlong float_signflip_pool[3] =  {0x8000000080000000ULL,
++                                        0x8000000080000000ULL,
++                                        0x8000000080000000ULL};
++static jlong double_signflip_pool[3] = {0x8000000000000000ULL,
++                                        0x8000000000000000ULL,
++                                        0x8000000000000000ULL};
+ 
+ // !!!!! 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
+diff -ur /runtime/jvmdiInterfaceSupport.hpp j2sdk/hotspot/src/share/vm/runtime/jvmdiInterfaceSupport.hpp
+--- /runtime/jvmdiInterfaceSupport.hpp	2003-05-21 12:46:32.000000000 +0200
++++ j2sdk/hotspot/src/share/vm/runtime/jvmdiInterfaceSupport.hpp	2003-05-21 12:48:18.000000000 +0200
+@@ -24,7 +24,7 @@
+   result_type JNICALL methodName signature {                                         \
+     JavaThread* thread = (JavaThread*) ThreadLocalStorage::thread();                 \
+     TransitionClass __tiv(thread);                                                   \
+-    __ENTRY(result_type, methodName##signature, thread)                              \
++    __ENTRY(result_type, methodName#signature, thread)                              \
+     debug_only(VMNativeEntryWrapper __vew;)                                          \
+     debug_only(const char* const _jvmdi_methodName_ = #methodName;)                  \
+     debug_only(bool  _trace_ = trace; );                                             \
+diff -ur /runtime/mutexLocker.cpp j2sdk/hotspot/src/share/vm/runtime/mutexLocker.cpp
+--- /runtime/mutexLocker.cpp	2003-05-21 12:46:32.000000000 +0200
++++ j2sdk/hotspot/src/share/vm/runtime/mutexLocker.cpp	2003-05-21 12:54:18.000000000 +0200
+@@ -95,7 +95,7 @@
+ #endif
+ 
+ #define def(var, type, pri, vm_block) \
+-  var = new type(Mutex::##pri, #var, vm_block)
++  var = new type(Mutex::pri, #var, vm_block)
+ 
+ void mutex_init() {  
+   def(Event_lock                   , Mutex  , event,       true ); // allow to lock in VM
+--- j2sdk/hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp.jj	2003-12-19 12:45:16.646115848 +0000
++++ j2sdk/hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp	2003-12-19 12:45:20.005605128 +0000
+@@ -49,7 +49,7 @@
+   jlong old_value;
+   __asm__ volatile (  "pushl %%ebx;mov 4+%1,%%ecx;mov %1,%%ebx;lock;cmpxchg8b (%3);popl %%ebx"
+                     : "=A" (old_value)
+-                    : "o" (exchange_value), "A" (compare_value), "r" (dest)
++                    : "m" (exchange_value), "A" (compare_value), "r" (dest)
+                     : "%ebx", "%ecx", "memory");
+   return old_value;
+ }
diff --git a/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-pthread.patch b/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-pthread.patch
new file mode 100644
index 000000000000..edb05c759211
--- /dev/null
+++ b/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-pthread.patch
@@ -0,0 +1,35 @@
+--- j2sdk/hotspot/src/os/linux/vm/os_linux.cpp.jj	2003-12-19 13:43:08.184361816 +0000
++++ j2sdk/hotspot/src/os/linux/vm/os_linux.cpp	2003-12-19 13:44:17.071889320 +0000
+@@ -584,7 +584,7 @@
+     ostream_exit();
+     // 4450681 : kill all other threads before abort to make sure the 
+     // calling thread is the one that gets dumped in core file. 
+-    pthread_kill_other_threads_np();
++    //pthread_kill_other_threads_np();
+     ::abort(); // dump core
+   }
+   ostream_exit();
+@@ -1338,12 +1338,7 @@
+   act.sa_flags = SA_RESTART|SA_SIGINFO;
+   act.sa_handler = (void (*)(int)) SR_handler;
+   // SR_signum is blocked by default. 
+-  // 4528190 - We also need to block pthread restart signal (32 on all
+-  // supported Linux platforms). Note that LinuxThreads need to block
+-  // this signal for all threads to work properly. So we don't have
+-  // to use hard-coded signal number when setting up the mask.
+   pthread_sigmask(SIG_BLOCK, NULL, &act.sa_mask);
+-  assert(sigismember(&act.sa_mask, 32), "incompatible pthread library");
+   if (sigaction(SR_signum, &act, 0) == -1) {
+     return -1;
+   }
+--- j2sdk/j2se/src/solaris/native/sun/nio/ch/NativeThread.c.jj	2003-12-19 13:43:25.506728416 +0000
++++ j2sdk/j2se/src/solaris/native/sun/nio/ch/NativeThread.c	2003-12-19 13:43:30.560960056 +0000
+@@ -66,7 +66,7 @@
+ Java_sun_nio_ch_NativeThread_signal(JNIEnv *env, jclass cl, jlong thread)
+ {
+ #ifdef __linux__
+-    if (pthread_kill((pthread_t)thread, INTERRUPT_SIGNAL))
++    if (pthread_kill((pthread_t)(unsigned long int)thread, INTERRUPT_SIGNAL))
+ 	JNU_ThrowIOExceptionWithLastError(env, "Thread signal failed");
+ #endif
+ }
diff --git a/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-remove-fixed-paths.patch b/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-remove-fixed-paths.patch
new file mode 100644
index 000000000000..cc4e725080ba
--- /dev/null
+++ b/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-remove-fixed-paths.patch
@@ -0,0 +1,141 @@
+--- j2sdk/control/make/common/Defs-linux.gmk.jj	2003-12-20 11:46:03.840900800 +0000
++++ j2sdk/control/make/common/Defs-linux.gmk	2003-12-20 12:10:24.915783656 +0000
+@@ -50,51 +50,51 @@
+ # non-standard locations
+ #
+ 
+-AR             = $(USRBIN_PATH)ar
+-BASENAME       = $(UNIXCOMMAND_PATH)basename
+-CAT            = $(UNIXCOMMAND_PATH)cat
++AR             = ar
++BASENAME       = basename
++CAT            = cat
+ CD             = cd # intrinsic unix command
+-CHMOD          = $(UNIXCOMMAND_PATH)chmod
+-CMP            = $(USRBIN_PATH)cmp
+-COMM           = $(USRBIN_PATH)comm
+-COMPRESS       = $(USRBIN_PATH)compress
+-CP             = $(UNIXCOMMAND_PATH)cp
+-CPIO           = $(UNIXCOMMAND_PATH)cpio
+-CUT            = $(USRBIN_PATH)cut
+-DATE           = $(UNIXCOMMAND_PATH)date
+-DF             = $(UNIXCOMMAND_PATH)df
+-DIFF           = $(USRBIN_PATH)diff
+-DIRNAME        = $(USRBIN_PATH)dirname
++CHMOD          = chmod
++CMP            = cmp
++COMM           = comm
++COMPRESS       = compress
++CP             = cp
++CPIO           = cpio
++CUT            = cut
++DATE           = date
++DF             = df
++DIFF           = diff
++DIRNAME        = dirname
+ ECHO           = echo -e # intrinsic unix command, with backslash-escaped character interpretation 
+-EGREP          = $(UNIXCOMMAND_PATH)egrep
+-EXPR           = $(USRBIN_PATH)expr
+-FIND           = $(USRBIN_PATH)find
+-GREP           = $(UNIXCOMMAND_PATH)grep
+-LEX            = $(USRBIN_PATH)lex
+-LN             = $(UNIXCOMMAND_PATH)ln
+-LS             = $(UNIXCOMMAND_PATH)ls
+-M4             = $(USRBIN_PATH)m4
+-MKDIR          = $(UNIXCOMMAND_PATH)mkdir
+-MV             = $(UNIXCOMMAND_PATH)mv
+-NAWK           = $(USRBIN_PATH)gawk
+-PWD            = $(UNIXCOMMAND_PATH)pwd
++EGREP          = egrep
++EXPR           = expr
++FIND           = find
++GREP           = grep
++LEX            = lex
++LN             = ln
++LS             = ls
++M4             = m4
++MKDIR          = mkdir
++MV             = mv
++NAWK           = gawk
++PWD            = pwd
+ #RM   is defined by GNU Make as 'rm -f'
+-RMDIR          = $(UNIXCOMMAND_PATH)rmdir
+-RPM            = $(UNIXCOMMAND_PATH)rpm
+-SED            = $(UNIXCOMMAND_PATH)sed
+-SH             = $(UNIXCOMMAND_PATH)sh
+-SORT           = $(UNIXCOMMAND_PATH)sort
+-STRIP          = $(USRBIN_PATH)strip
+-TAR            = $(UNIXCOMMAND_PATH)tar
+-TOUCH          = $(UNIXCOMMAND_PATH)touch
+-TR             = $(USRBIN_PATH)tr
+-TRUE           = $(UNIXCOMMAND_PATH)true
+-UNAME          = $(UNIXCOMMAND_PATH)uname
+-UNIQ           = $(USRBIN_PATH)uniq
+-UNZIPSFX       = $(USRBIN_PATH)unzipsfx
+-WC             = $(USRBIN_PATH)wc
+-YACC           = $(USRBIN_PATH)yacc
+-ZIPEXE         = $(USRBIN_PATH)zip
++RMDIR          = rmdir
++RPM            = rpm
++SED            = sed
++SH             = sh
++SORT           = sort
++STRIP          = strip
++TAR            = tar
++TOUCH          = touch
++TR             = tr
++TRUE           = true
++UNAME          = uname
++UNIQ           = uniq
++UNZIPSFX       = unzipsfx
++WC             = wc
++YACC           = yacc
++ZIPEXE         = zip
+ 
+ 
+ archExpr = case "`$(UNAME) -m`" in  \
+--- j2sdk/j2se/make/common/Defs-linux.gmk.jj	2003-12-20 11:45:57.788820856 +0000
++++ j2sdk/j2se/make/common/Defs-linux.gmk	2003-12-20 11:46:11.051804576 +0000
+@@ -131,30 +131,30 @@
+ 
+ # UNIXCOMMAND_PATH is the path to where the most common Unix
+ # commands are installed.
+-UNIXCOMMAND_PATH = /bin/
++UNIXCOMMAND_PATH = 
+ # Allow the user to override the default value...
+-ifdef ALT_UNIXCOMMAND_PATH
++#ifdef ALT_UNIXCOMMAND_PATH
+ # make sure that there is a "/" on the end...
+-UNIXCOMMAND_PATH = $(subst //,/,$(ALT_UNIXCOMMAND_PATH)/)
+-endif
++#UNIXCOMMAND_PATH = $(subst //,/,$(ALT_UNIXCOMMAND_PATH)/)
++#endif
+ 
+ # USRBIN_PATH is the path to where the most common Unix
+ # commands are installed.
+-USRBIN_PATH = /usr/bin/
++USRBIN_PATH = 
+ # Allow the user to override the default value...
+-ifdef ALT_USRBIN_PATH
++#ifdef ALT_USRBIN_PATH
+ # make sure that there is a "/" on the end...
+-USRBIN_PATH = $(subst //,/,$(ALT_USRBIN_PATH)/)
+-endif
++#USRBIN_PATH = $(subst //,/,$(ALT_USRBIN_PATH)/)
++#endif
+ 
+ # COMPILER_PATH is the path to where the compiler and tools 
+ # are installed.
+-COMPILER_PATH = /usr/bin/
++COMPILER_PATH = 
+ #
+ # Allow the user to override the default value...
+-ifdef ALT_COMPILER_PATH
+-COMPILER_PATH = $(subst //,/,$(subst \,/,$(ALT_COMPILER_PATH))/)
+-endif
++#ifdef ALT_COMPILER_PATH
++#COMPILER_PATH = $(subst //,/,$(subst \,/,$(ALT_COMPILER_PATH))/)
++#endif
+ 
+ # DEVTOOLS_PATH is for other tools required for building (such as
+ # zip, etc.)
diff --git a/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-static_cxx.patch b/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-static_cxx.patch
new file mode 100644
index 000000000000..78e8ecf21eab
--- /dev/null
+++ b/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-static_cxx.patch
@@ -0,0 +1,11 @@
+--- j2sdk/j2se/make/common/Defs-linux.gmk.jj	2003-12-20 10:42:01.745988008 +0000
++++ j2sdk/j2se/make/common/Defs-linux.gmk	2003-12-20 10:42:21.892925208 +0000
+@@ -23,7 +23,7 @@
+ #   LINTFLAGS     (set $(OTHER_LINTFLAGS) instead)
+ 
+ # statically link libstdc++ before C++ ABI is stablized on Linux
+-STATIC_CXX     = true
++STATIC_CXX     = false
+ 
+ # define these to avoid picking up ones from aliases or from
+ # non-standard locations
diff --git a/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.4.2 b/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.4.2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.4.2
diff --git a/dev-java/sun-j2sdk/files/sun-j2sdk-1.4.2 b/dev-java/sun-j2sdk/files/sun-j2sdk-1.4.2
new file mode 100644
index 000000000000..a98dcd7ba871
--- /dev/null
+++ b/dev-java/sun-j2sdk/files/sun-j2sdk-1.4.2
@@ -0,0 +1,15 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author: Karl Trygve Kalleberg
+# Maintainer: Tools Team <tools@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/files/sun-j2sdk-1.4.2,v 1.1 2003/12/20 14:02:13 cretin Exp $
+
+VERSION="Sun JDK @PV@"
+JAVA_HOME=/opt/@P@
+CLASSPATH=.:/opt/@P@/jre/lib:/opt/@P@/lib/tools.jar
+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 CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH"