cvs commit: patches/j2sdk j2sdk-1.4.1-fix_intl_files-1.patch j2sdk-1.4.1-link_missing_libs-1.patch j2sdk-1.4.1-motif_mkmsgcat-1.patch j2sdk-1.4.1-remove_fixed_paths-1.patch j2sdk-1.4.1-syntax_fixes-1.patch j2sdk-1.4.1-use_included_motif-1.patch j2sdk-1.4.2-ash-1.patch j2sdk-1.4.2-fix_inline_asm-1.patch j2sdk-1.4.2-motif_mkmsgcat-1.patch j2sdk-1.4.2-nptl-1.patch j2sdk-1.4.2-remove_debug_image-1.patch j2sdk-1.4.2-remove_fixed_paths-1.patch j2sdk-1.4.2-static_cxx-1.patch j2sdk-1.4.2-use_included_motif-1.patch j2sdk-1.4.2-use_system_odbc_lib-1.patch j2sdk-1.4.1-fix-intl-files.patch j2sdk-1.4.1-link-missing-libs.patch j2sdk-1.4.1-motif-mkmsgcat.patch j2sdk-1.4.1-remove-fixed-paths.patch j2sdk-1.4.1-syntax-fixes.patch j2sdk-1.4.1-use-included-motif.patch j2sdk-1.4.2-ash.patch j2sdk-1.4.2-fix-inline-asm-1.patch j2sdk-1.4.2-motif-mkmsgcat.patch j2sdk-1.4.2-nptl.patch j2sdk-1.4.2-remove-debug-image.patch j2sdk-1.4.2-remove-fixed-paths-1.patch j2sdk-1.4.2-static_cxx.patch j2sdk-1.4.2-use-included-motif-1.patch j2sdk-1.4.2-use-system-odbc-lib.patch

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Jun 7 10:28:22 PDT 2004


jim         04/06/07 11:28:22

  Added:       j2sdk    j2sdk-1.4.1-fix_intl_files-1.patch
                        j2sdk-1.4.1-link_missing_libs-1.patch
                        j2sdk-1.4.1-motif_mkmsgcat-1.patch
                        j2sdk-1.4.1-remove_fixed_paths-1.patch
                        j2sdk-1.4.1-syntax_fixes-1.patch
                        j2sdk-1.4.1-use_included_motif-1.patch
                        j2sdk-1.4.2-ash-1.patch
                        j2sdk-1.4.2-fix_inline_asm-1.patch
                        j2sdk-1.4.2-motif_mkmsgcat-1.patch
                        j2sdk-1.4.2-nptl-1.patch
                        j2sdk-1.4.2-remove_debug_image-1.patch
                        j2sdk-1.4.2-remove_fixed_paths-1.patch
                        j2sdk-1.4.2-static_cxx-1.patch
                        j2sdk-1.4.2-use_included_motif-1.patch
                        j2sdk-1.4.2-use_system_odbc_lib-1.patch
  Removed:     j2sdk    j2sdk-1.4.1-fix-intl-files.patch
                        j2sdk-1.4.1-link-missing-libs.patch
                        j2sdk-1.4.1-motif-mkmsgcat.patch
                        j2sdk-1.4.1-remove-fixed-paths.patch
                        j2sdk-1.4.1-syntax-fixes.patch
                        j2sdk-1.4.1-use-included-motif.patch
                        j2sdk-1.4.2-ash.patch
                        j2sdk-1.4.2-fix-inline-asm-1.patch
                        j2sdk-1.4.2-motif-mkmsgcat.patch
                        j2sdk-1.4.2-nptl.patch
                        j2sdk-1.4.2-remove-debug-image.patch
                        j2sdk-1.4.2-remove-fixed-paths-1.patch
                        j2sdk-1.4.2-static_cxx.patch
                        j2sdk-1.4.2-use-included-motif-1.patch
                        j2sdk-1.4.2-use-system-odbc-lib.patch
  Log:
  Naming Scheme Update
  
  Revision  Changes    Path
  1.1                  patches/j2sdk/j2sdk-1.4.1-fix_intl_files-1.patch
  
  Index: j2sdk-1.4.1-fix_intl_files-1.patch
  ===================================================================
  Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
  Date: 2003-10-03
  Initial Package Version: 1.4.1
  Origin: None
  Description: Removes duplicate intl messages which cause compilation to fail with recent gettext versions.
  --- Build.orig/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po	2002-09-06 02:31:47.000000000 -0500
  +++ Build/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po	2003-01-13 09:41:22.000000000 -0600
  @@ -21,8 +21,9 @@
   msgstr "plugin: java á£Ê©ÄØÇÞعæÀÈÔäÚ"
   msgid  "  a core file was generated"
   msgstr "  ÄØܨÆíÕøÅÀóòÕù"
  -msgid  "Plugin: trouble with work request from child"
  -msgstr "Plugin: ÄÍùËɱÍÔÓÑÊåÎûÄÖÉ¢àõÆíÙÂ÷î"
  +# Extra messages. Deleted by Tushar Teredesai <tush at yahoo.com>
  +#msgid  "Plugin: trouble with work request from child"
  +#msgstr "Plugin: ÄÍùËɱÍÔÓÑÊåÎûÄÖÉ¢àõÆíÙÂ÷î"
   msgid  "Plugin: can't find IP address for current host"
   msgstr "Plugin: ÊÆÄâ̯ÆøЩÅäñ¢Îû IP ÈíÉß"
   msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
  --- Build.orig/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po	2002-09-06 02:31:47.000000000 -0500
  +++ Build/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po	2003-01-13 09:41:55.000000000 -0600
  @@ -21,8 +21,9 @@
   msgstr "plugin: java µ{§Ç¤w¦]°T¸¹¦Ó·´"
   msgid  "  a core file was generated"
   msgstr "  ¤w²£¥Í®Ö¤ßÀÉ®×"
  -msgid  "Plugin: trouble with work request from child"
  -msgstr "Plugin: ¤lÃþ§O©Ò­n¨Dªº¤u§@µo¥Í°ÝÃD"
  +# Extra messages. Removed by Tushar Teredesai <tush at yahoo.com>
  +#msgid  "Plugin: trouble with work request from child"
  +#msgstr "Plugin: ¤lÃþ§O©Ò­n¨Dªº¤u§@µo¥Í°ÝÃD"
   msgid  "Plugin: can't find IP address for current host"
   msgstr "Plugin: §ä¤£¨ì¥Ø«e¥D¾÷ªº IP ¦ì§}"
   msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.1-link_missing_libs-1.patch
  
  Index: j2sdk-1.4.1-link_missing_libs-1.patch
  ===================================================================
  Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
  Date: 2003-10-03
  Initial Package Version: 1.4.1
  Origin: None.
  Description: Add linking of libraries to fix compilation with recent glibc and gcc releases.
  --- Build.orig/hotspot/build/linux/makefiles/vm.make	2002-09-06 02:01:22.000000000 -0500
  +++ Build/hotspot/build/linux/makefiles/vm.make	2003-01-13 09:33:53.000000000 -0600
  @@ -134,7 +134,9 @@
   
   # The whole megilla:
   
  -LIBS += -lnsl -lm -ldl -lpthread
  +# The build uses gcc to compile a c++ file and hence libstdc++ is not linked automatically
  +# Fixed by Tushar Teredesai <tush at yahoo.com>
  +LIBS += -lnsl -lm -ldl -lpthread -lstdc++
   
   JVM = jvm$(G_SUFFIX)
   LIBJVM = lib$(JVM).so
  --- Build.orig/j2se/make/java/net/Makefile	2002-09-06 02:07:34.000000000 -0500
  +++ Build/j2se/make/java/net/Makefile	2003-01-13 09:35:07.000000000 -0600
  @@ -61,6 +61,8 @@
   #
   # Include rules
   #
  +# Added a missing -lpthread for linux
  +# Changed by Tushar Teredesai <tush at yahoo.com>
   include $(BUILDDIR)/common/Mapfile-vers.gmk
   
   include $(BUILDDIR)/common/Library.gmk
  @@ -70,7 +72,7 @@
     COMPILER_WARNING_LEVEL=2
   else
     LIBSOCKET = -lsocket
  -  OTHER_LDLIBS = $(LIBSOCKET) -lnsl -ldl $(JVMLIB)
  +  OTHER_LDLIBS = $(LIBSOCKET) -lnsl -ldl $(JVMLIB) -lpthread
   endif
   
   CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl
  --- Build.orig/j2se/make/java/nio/Makefile	2002-09-06 02:07:34.000000000 -0500
  +++ Build/j2se/make/java/nio/Makefile	2003-01-13 09:35:50.000000000 -0600
  @@ -112,7 +112,9 @@
   endif
   ifeq ($(PLATFORM), linux)
   OTHER_CFLAGS += -Werror
  -OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH)$(SUFFIX) -ljava$(SUFFIX) -lnet$(SUFFIX)
  +# Added missing -lpthread for linux
  +# Changed by Tushar Teredesai <tush at yahoo.com>
  +OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH)$(SUFFIX) -ljava$(SUFFIX) -lnet$(SUFFIX) -lpthread
   endif
   ifeq ($(PLATFORM), solaris)
   OTHER_LDLIBS += $(JVMLIB) -lsocket -lposix4 \
  --- Build.orig//j2se/make/jpda/back/Makefile	2002-09-06 02:07:39.000000000 -0500
  +++ Build/j2se/make/jpda/back/Makefile	2003-01-13 09:36:33.000000000 -0600
  @@ -33,8 +33,10 @@
   endif
   endif # PLATFORM
   
  +# Also needs to link to JVMLIB (-ljvm) to resolve symbol fork1
  +# Changed by Tushar Teredesai <tush at yahoo.com>
   ifeq ($(PLATFORM), linux)
  -  OTHER_LDLIBS = -ldl 
  +  OTHER_LDLIBS = -ldl $(JVMLIB)
   endif # PLATFORM
   
   ifeq ($(PLATFORM), solaris)
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.1-motif_mkmsgcat-1.patch
  
  Index: j2sdk-1.4.1-motif_mkmsgcat-1.patch
  ===================================================================
  Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
  Date: 2003-10-03
  Initial Package Version: 1.4.1
  Origin: Sent by Sourcemage Guru Hamish Greig
  Description: Motif compilation fix. Needed only if optimization flags are used.
  	     Also needed for 1.4.2
  
  diff -ru Build.orig/motif/lib/Xm/util/mkmsgcat.c Build/motif/lib/Xm/util/mkmsgcat.c
  --- Build.orig/motif/lib/Xm/util/mkmsgcat.c	2002-09-06 17:06:06.000000000 +1000
  +++ Build/motif/lib/Xm/util/mkmsgcat.c	2003-05-26 17:13:38.000000000 +1000
  @@ -14,7 +14,7 @@
   #include <string.h>
   char buf[1024];
   
  -char *OSF_COPYRIGHT = "$\n\
  +char *OSF_COPYRIGHT = "\
   $  @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\
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.1-remove_fixed_paths-1.patch
  
  Index: j2sdk-1.4.1-remove_fixed_paths-1.patch
  ===================================================================
  Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
  Date: 2003-10-03
  Initial Package Version: 1.4.1
  Origin: None
  Description: Instead of fixing the path where binraries are located, use the binaries
  in the user's path.
  --- Build.orig/control/make/common/Defs-linux.gmk	2002-09-06 02:00:17.000000000 -0500
  +++ Build/control/make/common/Defs-linux.gmk	2003-01-13 09:23:49.000000000 -0600
  @@ -44,52 +44,54 @@
   # define these to avoid picking up ones from aliases or from
   # non-standard locations
   #
  +# The sane thing to do is to use the PATH set by user!
  +# Changed by Tushar Teredesai <tush at yahoo.com>
   
  -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
  -UNZIP          = $(USRBIN_PATH)unzip
  -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
  +UNZIP          = unzip
  +WC             = wc
  +YACC           = yacc
  +ZIPEXE         = zip
   
   
   archExpr = case "`$(UNAME) -m`" in  \
  --- Build.orig/j2se/make/common/Defs-linux.gmk	2002-09-06 02:07:13.000000000 -0500
  +++ Build/j2se/make/common/Defs-linux.gmk	2003-01-13 09:24:54.000000000 -0600
  @@ -25,56 +25,58 @@
   # define these to avoid picking up ones from aliases or from
   # non-standard locations
   #
  +# The sane thing to do is to use the PATH set by user!
  +# Changed by Tushar Teredesai <tush at yahoo.com>
   
  -AR             = $(USRBIN_PATH)ar
  -BASENAME       = $(UNIXCOMMAND_PATH)basename
  -CAT            = $(UNIXCOMMAND_PATH)cat
  -CC             = $(COMPILER_PATH)gcc
  -CPP            = $(COMPILER_PATH)gcc -E
  -CXX            = $(COMPILER_PATH)g++
  +AR             = ar
  +BASENAME       = basename
  +CAT            = cat
  +CC             = gcc
  +CPP            = gcc -E
  +CXX            = g++
   CD             = cd # intrinsic unix command
  -CHMOD          = $(UNIXCOMMAND_PATH)chmod
  -CMP            = $(USRBIN_PATH)cmp
  -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
  +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
  -HEAD           = $(USRBIN_PATH)head
  -GDB            = $(USRBIN_PATH)gdb
  -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
  +HEAD           = head
  +GDB            = gdb
  +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
  -UNZIP          = $(USRBIN_PATH)unzip
  -UNZIPSFX       = $(USRBIN_PATH)unzipsfx
  -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
  +UNZIP          = unzip
  +UNZIPSFX       = unzipsfx
  +YACC           = yacc
  +ZIPEXE         = zip
   
   
   archExpr = case "`$(UNAME) -m`" in  \
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.1-syntax_fixes-1.patch
  
  Index: j2sdk-1.4.1-syntax_fixes-1.patch
  ===================================================================
  Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
  Date: 2003-10-03
  Initial Package Version: 1.4.1
  Origin: None
  Description: Some compilation fixes for recent glibc and gcc versions.
  --- Build.orig/hotspot/src/share/vm/c1/c1_FrameMap.hpp	2002-09-06 02:03:41.000000000 -0500
  +++ Build/hotspot/src/share/vm/c1/c1_FrameMap.hpp	2003-01-13 09:38:16.000000000 -0600
  @@ -196,7 +196,8 @@
   //--------------------------------------------------------
   
   class ArgumentLocation VALUE_OBJ_CLASS_SPEC {
  -  friend CallingConvention;
  +  /* Syntax fix. Tushar Teredesai <tush at yahoo.com> */
  +  friend struct CallingConvention;
    private:
     int _n;         // either a register number 0-5 (I0-I5 or O0-O5), or an offset (in words) from SP/FP
   
  @@ -246,7 +247,8 @@
   //--------------------------------------------------------
   
   class CallingConvention: public ResourceObj {
  -  friend FrameMap;
  +  /* Syntax fix. Tushar Teredesai <tush at yahoo.com> */
  +  friend class FrameMap;
   
    private:
     intStack* _args;
  --- Build.orig/hotspot/src/share/vm/opto/loopnode.hpp	2002-09-06 02:04:33.000000000 -0500
  +++ Build/hotspot/src/share/vm/opto/loopnode.hpp	2003-01-13 09:39:00.000000000 -0600
  @@ -308,7 +308,8 @@
   // Computes the mapping from Nodes to IdealLoopTrees.  Organizes IdealLoopTrees into a
   // loop tree.  Drives the loop-based transformations on the ideal graph.
   class PhaseIdealLoop : public PhaseTransform {
  -  friend IdealLoopTree;
  +  /* Syntax fix. Tushar Teredesai <tush at yahoo.com> */
  +  friend class IdealLoopTree;
     // Pre-computed def-use info
     PhaseIterGVN &_igvn;
   
  --- Build.orig/j2se/ext/plugin/oji-plugin/src/motif/common/utils.c	2002-09-06 02:31:43.000000000 -0500
  +++ Build/j2se/ext/plugin/oji-plugin/src/motif/common/utils.c	2003-01-13 09:39:45.000000000 -0600
  @@ -12,6 +12,8 @@
   #include <locale.h>
   #include <errno.h>
   #include <strings.h>
  +/* Needed by newer gcc3. Tushar Teredesai <tush at yahoo.com> */
  +#include <string.h>
   #include <dlfcn.h>
   #include "plugin_defs.h"
   #include "pluginversion.h"
  --- Build.orig/j2se/ext/plugin/oji-plugin/src/motif/navig5/ProxySupport5.cpp	2002-09-06 02:31:45.000000000 -0500
  +++ Build/j2se/ext/plugin/oji-plugin/src/motif/navig5/ProxySupport5.cpp	2003-01-13 09:40:44.000000000 -0600
  @@ -30,7 +30,8 @@
   #include "ProxySupport5.h"
   extern "C" {
   #ifdef __linux__
  -extern int gethostname(char *, size_t);
  +/* Syntax fix. Tushar Teredesai <tush at yahoo.com> */
  +extern int gethostname(char *, size_t) __THROW;
   #else
   extern int gethostname(char *, int);
   #endif
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.1-use_included_motif-1.patch
  
  Index: j2sdk-1.4.1-use_included_motif-1.patch
  ===================================================================
  Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
  Date: 2003-10-03
  Initial Package Version: 1.4.1
  Origin: None
  Description: j2sdk includes its hacked/fixed version of motif source that it
  links against. In some cases it ends up linking against the system installed
  motif instead of the internal statically compiled libXm. This patch fixes the
  code so that the internal motif lib is renamed to a different and unique name
  and then links against that lib instead.
  --- Build.orig/control/make/motif-rules.gmk	2002-09-06 02:00:16.000000000 -0500
  +++ Build/control/make/motif-rules.gmk	2003-01-13 09:30:02.000000000 -0600
  @@ -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 at yahoo.com>
  +MOTIF = $(MOTIF_DIR)/lib/libXm-j2sdk.a 
   
   motif: motif-build motif-install
   
  @@ -43,8 +46,8 @@
   motif-install-lib: $(MOTIF_DIR)/lib 
     ifdef BUILD_MOTIF
   	$(CD) $(MOTIF_DIR)/lib; \
  -	$(RM) libXm.a ; \
  -	$(LN) -s $(ABS_MOTIF_TOPDIR)/lib/libXm.a .
  +	$(RM) libXm-j2sdk.a ; \
  +	$(LN) -s $(ABS_MOTIF_TOPDIR)/lib/libXm.a libXm-j2sdk.a
     endif
   
   motif-install-include: $(MOTIF_DIR)/include 
  @@ -62,7 +65,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)
  --- Build.orig/j2se/make/sun/awt/Makefile	2002-09-06 02:08:23.000000000 -0500
  +++ Build/j2se/make/sun/awt/Makefile	2003-01-13 09:30:56.000000000 -0600
  @@ -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 at 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
  --- Build.orig/j2se/make/sun/awt/mawt.gmk	2002-09-06 02:08:24.000000000 -0500
  +++ Build/j2se/make/sun/awt/mawt.gmk	2003-01-13 09:32:30.000000000 -0600
  @@ -125,8 +125,10 @@
   else
   CFLAGS += -DMOTIF_VERSION=$(MOTIF_VERSION)
   
  +# If using static motif, use non-standard lib name
  +# Changed by Tushar Teredesai <tush at yahoo.com>
   ifeq ($(STATIC_MOTIF),true)
  -LIBXM = $(MOTIF_LIB)/libXm.a -lXp
  +LIBXM = $(MOTIF_LIB)/libXm-j2sdk.a -lXp
   else
   LIBXM = -lXm
   endif
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.2-ash-1.patch
  
  Index: j2sdk-1.4.2-ash-1.patch
  ===================================================================
  Submitted By: Nathan Coulson
  Date: 2004-03-27
  Initial Package Version: 1.4.2
  Origin: blfs-support
  Description: Allows compilation if /bin/sh is linked to /bin/ash by calling bash instead
  diff -Naur j2sdk-1.4.2.OLD/hotspot/build/linux/Makefile j2sdk-1.4.2/hotspot/build/linux/Makefile
  --- j2sdk-1.4.2.OLD/hotspot/build/linux/Makefile	2003-09-10 19:40:03.000000000 -0600
  +++ j2sdk-1.4.2/hotspot/build/linux/Makefile	2004-02-24 00:10:35.000000000 -0700
  @@ -71,7 +71,7 @@
   	chmod +x ./test; ./test
   
   ${OS}_${ARCH}_compiler2/debug ${OS}_${ARCH}_compiler2/optimized ${OS}_${ARCH}_compiler2/fastdebug ${OS}_${ARCH}_compiler2/jvmg ${OS}_${ARCH}_compiler2/profiled ${OS}_${ARCH}_compiler2/product : $(buildATree)
  -	sh $(buildATree) compiler2 ${GAMMADIR} ${OS} ${ARCH}
  +	bash $(buildATree) compiler2 ${GAMMADIR} ${OS} ${ARCH}
   
   debug: ${OS}_${ARCH}_compiler2/debug
   	(cd ${OS}_${ARCH}_compiler2/debug; $(MAKE))
  @@ -98,7 +98,7 @@
   #	@(cd ${OS}_${ARCH}_compiler2/profiled; gamma=gamma; $(RUN_TEST))
   
   ${OS}_${ARCH}_compiler1/debug ${OS}_${ARCH}_compiler1/optimized ${OS}_${ARCH}_compiler1/fastdebug ${OS}_${ARCH}_compiler1/jvmg ${OS}_${ARCH}_compiler1/profiled ${OS}_${ARCH}_compiler1/product : $(buildATree)
  -	sh $(buildATree) compiler1 ${GAMMADIR} ${OS} ${ARCH}
  +	bash $(buildATree) compiler1 ${GAMMADIR} ${OS} ${ARCH}
   
   debug1: ${OS}_${ARCH}_compiler1/debug
   	(cd ${OS}_${ARCH}_compiler1/debug; $(MAKE))
  @@ -125,7 +125,7 @@
   #	@(cd ${OS}_${ARCH}_compiler1/profiled; gamma=gamma; $(RUN_TEST))
   
   ${OS}_${ARCH}_core/debug ${OS}_${ARCH}_core/optimized ${OS}_${ARCH}_core/fastdebug ${OS}_${ARCH}_core/jvmg ${OS}_${ARCH}_core/profiled ${OS}_${ARCH}_core/product : $(buildATree)
  -	sh $(buildATree) core ${GAMMADIR} ${OS} ${ARCH}
  +	bash $(buildATree) core ${GAMMADIR} ${OS} ${ARCH}
   
   debugcore: ${OS}_${ARCH}_core/debug
   	(cd ${OS}_${ARCH}_core/debug; $(MAKE))
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.2-fix_inline_asm-1.patch
  
  Index: j2sdk-1.4.2-fix_inline_asm-1.patch
  ===================================================================
  Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
  Date: 2003-10-19
  Initial Package Version: 1.4.2
  Origin: Suggestion from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12590
  Description: Fixes inline asm error listed below
  
  	hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp:
  	In  function `jboolean JVM_CX8Field(JNIEnv*, _jobject*, _jfieldID*, long long
          int, long long int)':
  	hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp:50:
  	error: impossible constraint in `asm'
   
  
  diff -Naur java.orig/hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp java/hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp
  --- java.orig/hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp	2003-09-11 01:40:30.000000000 +0000
  +++ java/hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp	2003-10-19 17:41:48.000000000 +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;
   }
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.2-motif_mkmsgcat-1.patch
  
  Index: j2sdk-1.4.2-motif_mkmsgcat-1.patch
  ===================================================================
  Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
  Date: 2003-10-03
  Initial Package Version: 1.4.1
  Origin: Sent by Sourcemage Guru Hamish Greig
  Description: Motif compilation fix. Needed only if optimization flags are used.
  
  diff -ru Build.orig/motif/lib/Xm/util/mkmsgcat.c Build/motif/lib/Xm/util/mkmsgcat.c
  --- Build.orig/motif/lib/Xm/util/mkmsgcat.c	2002-09-06 17:06:06.000000000 +1000
  +++ Build/motif/lib/Xm/util/mkmsgcat.c	2003-05-26 17:13:38.000000000 +1000
  @@ -14,7 +14,7 @@
   #include <string.h>
   char buf[1024];
   
  -char *OSF_COPYRIGHT = "$\n\
  +char *OSF_COPYRIGHT = "\
   $  @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\
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.2-nptl-1.patch
  
  Index: j2sdk-1.4.2-nptl-1.patch
  ===================================================================
  Submitted By:  DJ Lucas (dj_AT_lucasit_DOT_com)
  Date:  2004-01-10
  Initial Package Version: 1.4.2
  Origin:  Suggestion from following url:
    https://listman.redhat.com/archives/phil-list/2003-January/msg00094.html
      And from gentoo portage availible here:
    http://gentoo.tiscali.nl/gentoo-portage/dev-java/sun-j2sdk/files/1.4.2/
  Description:  Fixes trivila compile error with nptl.
  
  diff -Naur j2sdk-orig/hotspot/src/os/linux/vm/os_linux.cpp j2sdk/hotspot/src/os/linux/vm/os_linux.cpp
  --- j2sdk-orig/hotspot/src/os/linux/vm/os_linux.cpp	2003-09-10 20:40:25.000000000 -0500
  +++ j2sdk/hotspot/src/os/linux/vm/os_linux.cpp	2004-01-10 20:59:22.814788848 -0600
  @@ -582,9 +582,6 @@
       NOT_PRODUCT(tty->print("Current thread is %p\n", pthread_self()));
       NOT_PRODUCT(tty->print("Dumping core ...\n"));
       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();
       ::abort(); // dump core
     }
     ostream_exit();
  @@ -1337,13 +1334,7 @@
     /* Set up signal handler for suspend/resume */
     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;
     }
  diff -Naur j2sdk-orig/j2se/src/solaris/native/sun/nio/ch/NativeThread.c j2sdk/j2se/src/solaris/native/sun/nio/ch/NativeThread.c
  --- j2sdk-orig/j2se/src/solaris/native/sun/nio/ch/NativeThread.c	2003-09-10 20:55:49.000000000 -0500
  +++ j2sdk/j2se/src/solaris/native/sun/nio/ch/NativeThread.c	2004-01-10 21:01:27.267869104 -0600
  @@ -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
   }
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.2-remove_debug_image-1.patch
  
  Index: j2sdk-1.4.2-remove_debug_image-1.patch
  ===================================================================
  Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
  Date: 2004-01-24
  Initial Package Version: 1.4.2
  Origin: Sent by Hamish Greig (SourceMage)
  Description: Prevents building of the debug image, saving approximately 200 MB of disk space.
  
  --- Build-sun-j2sdk-1.4.2-standard/j2se/make/common/Release.gmk.orig	2004-01-22 20:42:35.000000000 -0600
  +++ Build-sun-j2sdk-1.4.2-standard/j2se/make/common/Release.gmk	2004-01-22 20:43:22.000000000 -0600
  @@ -157,7 +157,7 @@
   compare-image-jre compare-image-jdk ::
   	@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."; 
   
  -images:: sanity-images post-sanity-images image-jre image-jdk image-jdk-debug
  +images:: sanity-images post-sanity-images image-jre image-jdk
   
   #
   # Sources we ship in the SDK.
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.2-remove_fixed_paths-1.patch
  
  Index: j2sdk-1.4.2-remove_fixed_paths-1.patch
  ===================================================================
  Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
  Date: 2003-10-14
  Initial Package Version: 1.4.2
  Origin: j2sdk-1.4.1-remove-fixed-paths.patch
  Description: Instead of fixing the path where binaries are located, use the binaries
  	     in the user's path. Updated for 1.4.2
  
  diff -Naur java.orig/control/make/common/Defs-linux.gmk java/control/make/common/Defs-linux.gmk
  --- java.orig/control/make/common/Defs-linux.gmk	2003-09-11 01:39:24.000000000 +0000
  +++ java/control/make/common/Defs-linux.gmk	2003-10-14 16:52:24.000000000 +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  \
  diff -Naur java.orig/deploy/make/common/Defs-linux.gmk java/deploy/make/common/Defs-linux.gmk
  --- java.orig/deploy/make/common/Defs-linux.gmk	2003-09-11 01:57:23.000000000 +0000
  +++ java/deploy/make/common/Defs-linux.gmk	2003-10-14 16:52:24.000000000 +0000
  @@ -8,8 +8,8 @@
   include $(CONTROL_TOPDIR)/make/common/Defs-linux.gmk
   
   BUNDLE_SUFFIX  = .zip
  -CC	       = $(COMPILER_PATH)gcc
  -HEAD           = $(USRBIN_PATH)head
  +CC	       = gcc
  +HEAD           = head
   EXEDIR         = $(OUTPUTDIR)/bin
   JUMP_EXE       = $(PROTO_DIR)/javawsbin$(SUFFIX)
   CLASSPATH_SEP  = $(CLASSPATH_SEPARATOR)
  diff -Naur java.orig/j2se/make/common/Defs-linux.gmk java/j2se/make/common/Defs-linux.gmk
  --- java.orig/j2se/make/common/Defs-linux.gmk	2003-09-11 01:42:56.000000000 +0000
  +++ java/j2se/make/common/Defs-linux.gmk	2003-10-14 16:52:49.000000000 +0000
  @@ -29,63 +29,56 @@
   # non-standard locations
   #
   
  -AR             = $(USRBIN_PATH)ar
  -BASENAME       = $(UNIXCOMMAND_PATH)basename
  -CAT            = $(UNIXCOMMAND_PATH)cat
  -CC             = $(COMPILER_PATH)gcc
  -CPP            = $(COMPILER_PATH)gcc -E
  -ifeq ($(STATIC_CXX),true)
  -# g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++"
  -# We need to use gcc to statically link the C++ runtime. gcc and g++ use
  -# the same subprocess to compile C++ files, so it is OK to build using gcc.
  -CXX            = $(COMPILER_PATH)gcc
  -else
  -CXX            = $(COMPILER_PATH)g++
  -endif
  +AR             = ar
  +BASENAME       = basename
  +CAT            = cat
  +CC             = gcc
  +CPP            = gcc -E
  +CXX            = g++
   CD             = cd # intrinsic unix command
  -CHMOD          = $(UNIXCOMMAND_PATH)chmod
  -CMP            = $(USRBIN_PATH)cmp
  -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
  +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
  -HEAD           = $(USRBIN_PATH)head
  -GDB            = $(USRBIN_PATH)gdb
  -GREP           = $(UNIXCOMMAND_PATH)grep
  -GUNZIP         = $(UNIXCOMMAND_PATH)gunzip
  -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
  +HEAD           = head
  +GDB            = gdb
  +GREP           = grep
  +GUNZIP         = gunzip
  +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
  -TEST	       = $(USRBIN_PATH)test
  -TOUCH          = $(UNIXCOMMAND_PATH)touch
  -TR             = $(USRBIN_PATH)tr
  -TRUE           = $(UNIXCOMMAND_PATH)true
  -UNAME          = $(UNIXCOMMAND_PATH)uname
  -UNIQ           = $(USRBIN_PATH)uniq
  -UNZIPSFX       = $(USRBIN_PATH)unzipsfx
  -YACC           = $(USRBIN_PATH)yacc
  -ZIPEXE         = $(USRBIN_PATH)zip
  +RMDIR          = rmdir
  +RPM            = rpm
  +SED            = sed
  +SH             = sh
  +SORT           = sort
  +STRIP          = strip
  +TAR            = tar
  +TEST	       = test
  +TOUCH          = touch
  +TR             = tr
  +TRUE           = true
  +UNAME          = uname
  +UNIQ           = uniq
  +UNZIPSFX       = unzipsfx
  +YACC           = yacc
  +ZIPEXE         = zip
   
   
   archExpr = case "`$(UNAME) -m`" in  \
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.2-static_cxx-1.patch
  
  Index: j2sdk-1.4.2-static_cxx-1.patch
  ===================================================================
  Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
  Date: 2004-01-24
  Initial Package Version: 1.4.2
  Origin: Gentoo
  Description: Link to shared libstd++.
  
  --- 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
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.2-use_included_motif-1.patch
  
  Index: j2sdk-1.4.2-use_included_motif-1.patch
  ===================================================================
  Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
  Date: 2003-10-07
  Initial Package Version: 1.4.2
  Origin: j2sdk-1.4.1-use-included-motif.patch
  Description: j2sdk includes its hacked/fixed version of motif source that it
  	     links against. In some cases it ends up linking against the system installed
  	     motif instead of the internal statically compiled libXm. This patch fixes the
  	     code so that the internal motif lib is renamed to a different and unique name
  	     and then links against that lib instead.
   
  diff -Naur java.orig/control/make/motif-rules.gmk java/control/make/motif-rules.gmk
  --- java.orig/control/make/motif-rules.gmk	2003-09-11 01:39:24.000000000 +0000
  +++ java/control/make/motif-rules.gmk	2003-10-07 08:00:13.000000000 +0000
  @@ -32,7 +32,7 @@
     ABS_MOTIF_DIR := $(shell $(CD) $(MOTIF_DIR); $(PWD))
   endif
   
  -MOTIF = $(MOTIF_DIR)/lib/libXm.a 
  +MOTIF = $(MOTIF_DIR)/lib/libXm-j2sdk.a 
   
   motif: motif-build motif-install
   
  @@ -50,8 +50,8 @@
   motif-install-lib: $(MOTIF_DIR)/lib 
     ifdef BUILD_MOTIF
   	$(CD) $(MOTIF_DIR)/lib; \
  -	$(RM) libXm.a ; \
  -	$(LN) -s $(ABS_MOTIF_TOPDIR)/lib/libXm.a .
  +	$(RM) libXm-j2sdk.a ; \
  +	$(LN) -s $(ABS_MOTIF_TOPDIR)/lib/libXm-j2sdk.a .
     endif
   
   motif-install-include: $(MOTIF_DIR)/include 
  @@ -69,7 +69,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 -Naur java.orig/j2se/make/sun/awt/Makefile java/j2se/make/sun/awt/Makefile
  --- java.orig/j2se/make/sun/awt/Makefile	2003-09-11 01:43:13.000000000 +0000
  +++ java/j2se/make/sun/awt/Makefile	2003-10-07 07:57:59.000000000 +0000
  @@ -280,8 +280,10 @@
   ifneq ($(PLATFORM), windows)
   # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS/LINUX
   
  +# If using static motif, use the non-standard name for the lib
  +# Changed by Tushar Teredesai <tush at 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 -Naur java.orig/j2se/make/sun/awt/mawt.gmk java/j2se/make/sun/awt/mawt.gmk
  --- java.orig/j2se/make/sun/awt/mawt.gmk	2003-09-11 01:43:14.000000000 +0000
  +++ java/j2se/make/sun/awt/mawt.gmk	2003-10-07 07:57:59.000000000 +0000
  @@ -123,8 +123,10 @@
   else
   CFLAGS += -DMOTIF_VERSION=$(MOTIF_VERSION)
   
  +# If using static motif, use non-standard lib name
  +# Changed by Tushar Teredesai <tush at yahoo.com>
   ifeq ($(STATIC_MOTIF),true)
  -LIBXM = $(MOTIF_LIB)/libXm.a -lXp
  +LIBXM = $(MOTIF_LIB)/libXm-j2sdk.a -lXp
   else
   LIBXM = -lXm
   endif
  
  diff -Naur java.orig/motif/lib/Xm/Makefile java/motif/lib/Xm/Makefile
  --- java.orig/motif/lib/Xm/Makefile	2003-09-11 01:42:17.000000000 +0000
  +++ java/motif/lib/Xm/Makefile	2003-10-07 07:57:59.000000000 +0000
  @@ -1295,20 +1295,20 @@
   	$(RM) $(DESTDIR)$(USRLIBDIR)/libXm.so
   	$(LN) libXm.so.$(SOXMREV) $(DESTDIR)$(USRLIBDIR)/libXm.so
   
  -all:: ../libXm.a
  +all:: ../libXm-j2sdk.a
   
  -../libXm.a: $(OBJS) $(EXTRALIBRARYDEPS)
  +../libXm-j2sdk.a: $(OBJS) $(EXTRALIBRARYDEPS)
   	$(RM) $@
   	(cd unshared; $(AR) ../$@ $(OBJS))
   	$(RANLIB) $@
   	$(_NULLCMD_)
   
  -install:: ../libXm.a
  +install:: ../libXm-j2sdk.a
   	echo "install"
   	@if [ -d $(DESTDIR)$(USRLIBDIR) ]; then set +x; \
   	else (set -x; $(MKDIRHIER) $(DESTDIR)$(USRLIBDIR)); fi
  -	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libXm.a $(DESTDIR)$(USRLIBDIR)
  -	@#$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(USRLIBDIR)/libXm.a
  +	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libXm-j2sdk.a $(DESTDIR)$(USRLIBDIR)
  +	@#$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(USRLIBDIR)/libXm-j2sdk.a
   
   lintlib:: llib-lXm.ln
   
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.2-use_system_odbc_lib-1.patch
  
  Index: j2sdk-1.4.2-use_system_odbc_lib-1.patch
  ===================================================================
  Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
  Date: 2004-01-24
  Initial Package Version: 1.4.1
  Origin: NA
  Description: Link to libodbc. See unixodbc.org for downloading the lib.
  
  --- Build-j2sdk-1.4.1-standard/j2se/make/sun/jdbc/Makefile.orig	2003-03-11 23:51:45.000000000 -0600
  +++ Build-j2sdk-1.4.1-standard/j2se/make/sun/jdbc/Makefile	2003-03-11 23:59:27.000000000 -0600
  @@ -29,10 +29,10 @@
   FILES_export = \
       sun/jdbc/odbc/JdbcOdbc.java 
   
  -ifeq ($(PLATFORM),linux)
  +#ifeq ($(PLATFORM),linux)
       # on linux you may not have an odbc library
  -     INIT = make_libs
  -endif
  +     #INIT = make_libs
  +#endif
   
   ifeq ($(PLATFORM),windows)
     # Files built here do not compile with warning level 3
  
  
  



More information about the patches mailing list