Author: dj
Date: 2005-04-28 23:12:51 -0600 (Thu, 28 Apr 2005)
New Revision: 935
Added:
trunk/jdk/jdk-1.5.0-motif_mkmsgcat-1.patch
trunk/jdk/jdk-1.5.0-remove_broken_demo-1.patch
trunk/jdk/jdk-1.5.0-remove_debug_image-1.patch
trunk/jdk/jdk-1.5.0-remove_fixed_paths-1.patch
trunk/jdk/jdk-1.5.0-static_cxx-1.patch
trunk/jdk/jdk-1.5.0-xorg-6.8.1-1.patch
Removed:
trunk/j2sdk/jdk-1.5.0-gcc342-1.patch
trunk/j2sdk/jdk-1.5.0-motif_mkmsgcat-1.patch
trunk/j2sdk/jdk-1.5.0-remove_broken_demo-1.patch
trunk/j2sdk/jdk-1.5.0-remove_debug_image-1.patch
trunk/j2sdk/jdk-1.5.0-remove_fixed_paths-1.patch
trunk/j2sdk/jdk-1.5.0-static_cxx-1.patch
trunk/j2sdk/jdk-1.5.0-xorg-6.8.1-1.patch
Log:
Removed obsolete jdk-1.5.0-gcc342-1 patch. Moved jdk patches to jdk/ directory.
Deleted: trunk/j2sdk/jdk-1.5.0-gcc342-1.patch
===================================================================
--- trunk/j2sdk/jdk-1.5.0-gcc342-1.patch 2005-04-29 05:04:57 UTC (rev
934)
+++ trunk/j2sdk/jdk-1.5.0-gcc342-1.patch 2005-04-29 05:12:51 UTC (rev
935)
@@ -1,261 +0,0 @@
-Submitted By: DJ Lucas (dj AT linuxfromscratch DOT org)
-Date: 2004-11-27
-Initial Package Version: 1.5.0
-Origin: DJ Lucas (preprocessor macro fixes), Hamish Greig (assembler code
- fixes) and portions of the previous j2sdk-1.4.2 gcc33 and asm patches
-Description: Fixes syntax for use with gcc-3.4.2. Note: this will not work for
- gcc-3.4.0 or gcc-3.4.1.
-
-diff -Naur jdk-build-orig/hotspot/src/cpu/i486/vm/i486.ad
jdk-build/hotspot/src/cpu/i486/vm/i486.ad
---- jdk-build-orig/hotspot/src/cpu/i486/vm/i486.ad 2004-10-19
13:41:32.000000000 -0500
-+++ jdk-build/hotspot/src/cpu/i486/vm/i486.ad 2004-11-23 21:04:35.733661056
-0600
-@@ -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],
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);
-+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);
-
- // !!!!! 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 -Naur
jdk-build-orig/hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp
jdk-build/hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp
----
jdk-build-orig/hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp
2004-10-19 13:41:46.000000000 -0500
-+++ jdk-build/hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp
2004-11-23 21:16:41.012401928 -0600
-@@ -111,7 +111,7 @@
- "cmpxchg8b (%5); xchgl %%ebx, %1"
- : "=A" (old_value), "=r" (lo)
- : "1" (lo), "c" (hi), "A" (compare_value), "r" (dest),
"m" (mp)
-- : "%ebx", "cc", "memory");
-+ : "cc", "memory");
- return old_value;
- }
-
-diff -Naur jdk-build-orig/hotspot/src/share/vm/prims/jvmtiEventController.cpp
jdk-build/hotspot/src/share/vm/prims/jvmtiEventController.cpp
---- jdk-build-orig/hotspot/src/share/vm/prims/jvmtiEventController.cpp
2004-10-19 13:42:32.000000000 -0500
-+++ jdk-build/hotspot/src/share/vm/prims/jvmtiEventController.cpp
2004-11-23 21:04:35.751658320 -0600
-@@ -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 */
-diff -Naur jdk-build-orig/hotspot/src/share/vm/prims/jvmtiExport.cpp
jdk-build/hotspot/src/share/vm/prims/jvmtiExport.cpp
---- jdk-build-orig/hotspot/src/share/vm/prims/jvmtiExport.cpp 2004-10-19
13:42:32.000000000 -0500
-+++ jdk-build/hotspot/src/share/vm/prims/jvmtiExport.cpp 2004-11-23
21:04:35.754657864 -0600
-@@ -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)
-diff -Naur jdk-build-orig/hotspot/src/share/vm/runtime/classFileParser.cpp
jdk-build/hotspot/src/share/vm/runtime/classFileParser.cpp
---- jdk-build-orig/hotspot/src/share/vm/runtime/classFileParser.cpp
2004-10-19 13:42:34.000000000 -0500
-+++ jdk-build/hotspot/src/share/vm/runtime/classFileParser.cpp 2004-11-23
21:04:35.759657104 -0600
-@@ -16,6 +16,9 @@
-
- // We add assert in debug mode when class format is not checked.
-
-+#undef inline
-+#undef __inline
-+
- #ifdef ASSERT
- void inline assert_property(bool b, const char* msg, TRAPS) {
- if (!b) { fatal(msg); }
-diff -Naur jdk-build-orig/hotspot/src/share/vm/runtime/globals_extension.hpp
jdk-build/hotspot/src/share/vm/runtime/globals_extension.hpp
---- jdk-build-orig/hotspot/src/share/vm/runtime/globals_extension.hpp
2004-10-19 13:42:35.000000000 -0500
-+++ jdk-build/hotspot/src/share/vm/runtime/globals_extension.hpp
2004-11-23 21:04:35.759657104 -0600
-@@ -110,7 +110,9 @@
-
- #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)))
-+
-+#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.
-diff -Naur jdk-build-orig/hotspot/src/share/vm/runtime/thread.hpp
jdk-build/hotspot/src/share/vm/runtime/thread.hpp
---- jdk-build-orig/hotspot/src/share/vm/runtime/thread.hpp 2004-10-19
13:42:40.000000000 -0500
-+++ jdk-build/hotspot/src/share/vm/runtime/thread.hpp 2004-11-23
21:04:35.762656648 -0600
-@@ -459,9 +459,53 @@
- static ByteSize stack_base_offset() { return
byte_offset_of(Thread, _stack_base ); }
- 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(); }
-+// Expanded macro...see below that I couldn't fix in definition.
-+
-+static ByteSize tlab_start_offset()
-+{
-+return byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::start_offset();
-+}
-+
-+static ByteSize tlab_end_offset()
-+{
-+return byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::end_offset();
-+}
-
-+static ByteSize tlab_top_offset()
-+{
-+return byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::top_offset();
-+}
-+
-+static ByteSize tlab_size_offset()
-+{
-+return byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::size_offset();
-+}
-+
-+static ByteSize tlab_refill_waste_limit_offset()
-+{
-+return byte_offset_of(Thread, _tlab) +
ThreadLocalAllocBuffer::refill_waste_limit_offset();
-+}
-+
-+static ByteSize tlab_number_of_refills_offset()
-+{
-+return byte_offset_of(Thread, _tlab) +
ThreadLocalAllocBuffer::number_of_refills_offset();
-+}
-+
-+static ByteSize tlab_fast_refill_waste_offset()
-+{
-+return byte_offset_of(Thread, _tlab) +
ThreadLocalAllocBuffer::fast_refill_waste_offset();
-+}
-+
-+static ByteSize tlab_slow_allocations_offset()
-+{
-+return byte_offset_of(Thread, _tlab) +
ThreadLocalAllocBuffer::slow_allocations_offset();
-+}
-+
-+/* Origingal unmodified macro that I couldn't figure
-+ out how to fix like I should have...any takers? ;-)
-+ #define TLAB_FIELD_OFFSET(name) \
-+ static ByteSize tlab_##name##_offset() { return
byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::##name##_offset(); }
-+
- TLAB_FIELD_OFFSET(start)
- TLAB_FIELD_OFFSET(end)
- TLAB_FIELD_OFFSET(top)
-@@ -470,8 +514,9 @@
- TLAB_FIELD_OFFSET(number_of_refills)
- TLAB_FIELD_OFFSET(fast_refill_waste)
- TLAB_FIELD_OFFSET(slow_allocations)
--
-+
- #undef TLAB_FIELD_OFFSET
-+*/
-
- };
-
-diff -Naur jdk-build-orig/share/plugin/mozilla_headers_ns610/nscore.h
jdk-build/share/plugin/mozilla_headers_ns610/nscore.h
---- jdk-build-orig/share/plugin/mozilla_headers_ns610/nscore.h 2001-05-21
11:34:20.000000000 -0500
-+++ jdk-build/share/plugin/mozilla_headers_ns610/nscore.h 2004-11-23
21:04:35.000000000 -0600
-@@ -192,6 +192,10 @@
- #define HAVE_CPP_2BYTE_WCHAR_T
- #endif
-
-+#if defined(__GNUC__)
-+ #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX
-+#endif
-+
- /* until we get an autoconf test for this, we'll assume it's on (since
we're using it already) */
- #define HAVE_CPP_TYPENAME
-
-diff -Naur jdk-build-orig/share/plugin/mozilla_headers_ns7/nscore.h
jdk-build/share/plugin/mozilla_headers_ns7/nscore.h
---- jdk-build-orig/share/plugin/mozilla_headers_ns7/nscore.h 2002-09-07
12:12:44.000000000 -0500
-+++ jdk-build/share/plugin/mozilla_headers_ns7/nscore.h 2004-11-23
21:04:35.000000000 -0600
-@@ -202,6 +202,10 @@
- #define HAVE_CPP_2BYTE_WCHAR_T
- #endif
-
-+#if defined(__GNUC__)
-+ #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX
-+#endif
-+
- /* until we get an autoconf test for this, we'll assume it's on (since
we're using it already) */
- #define HAVE_CPP_TYPENAME
-
---- jdk-build-orig/hotspot/src/share/vm/memory/dump.cpp 2004-10-19
13:42:14.000000000 -0500
-+++ jdk-build/hotspot/src/share/vm/memory/dump.cpp 2004-11-23
23:01:48.764150856 -0600
-@@ -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)0xcafebabebabecafe)
-+#define JSUM_SEED ((jlong)0xcafebabebabecafeULL)
- static jlong
- jsum(jlong start, const char *buf, const int len)
- {
---- jdk-build-orig/j2se/src/solaris/bin/java_md.c 2004-10-19
14:01:43.000000000 -0500
-+++ jdk-build/j2se/src/solaris/bin/java_md.c 2004-11-25 22:53:11.781016448
-0600
-@@ -1136,7 +1136,7 @@
- : /* Inputs */
- "m" (arg)
- : /* Clobbers */
-- "%eax", "%ebx", "%ecx", "%edx"
-+ "%eax", "%ecx", "%edx"
- );
- *eaxp = value_of_eax;
- *ebxp = value_of_ebx;
---- jdk-build-orig/j2se/src/share/native/sun/font/bidi/uchardir.c
2004-10-19 14:00:29.000000000 -0500
-+++ jdk-build/j2se/src/share/native/sun/font/bidi/uchardir.c 2004-11-26
18:15:10.534350400 -0600
-@@ -581,23 +581,7 @@
- 11, 14, 16, 12, 15
- };
-
--UCharDirection u_getDirection(uint32_t cp) {
-- if (cp < ASCII_LIMIT) {
-- return ASCII[cp];
-- }
-- if (cp < RTL_START) {
-- return u_getDirectionInternal(cp);
-- }
-- if (cp < RTL_LIMIT) {
-- return RTL[cp - RTL_START];
-- }
-- if (cp < 0x110000) {
-- return u_getDirectionInternal(cp);
-- }
-- return 0;
--}
--
--static UCharDirection u_getDirectionInternal(uint32_t cp) {
-+UCharDirection u_getDirectionInternal(uint32_t cp) {
- int dc;
- int n;
- int bi = cp & BLOCKMASK;
-@@ -622,6 +606,22 @@
- dc = jx2i[dc];
- }
- return dc;
-+}
-+
-+static UCharDirection u_getDirection(uint32_t cp) {
-+ if (cp < ASCII_LIMIT) {
-+ return ASCII[cp];
-+ }
-+ if (cp < RTL_START) {
-+ return u_getDirectionInternal(cp);
-+ }
-+ if (cp < RTL_LIMIT) {
-+ return RTL[cp - RTL_START];
-+ }
-+ if (cp < 0x110000) {
-+ return u_getDirectionInternal(cp);
-+ }
-+ return 0;
- }
-
- UCharDirection
Deleted: trunk/j2sdk/jdk-1.5.0-motif_mkmsgcat-1.patch
===================================================================
--- trunk/j2sdk/jdk-1.5.0-motif_mkmsgcat-1.patch 2005-04-29 05:04:57 UTC
(rev 934)
+++ trunk/j2sdk/jdk-1.5.0-motif_mkmsgcat-1.patch 2005-04-29 05:12:51 UTC
(rev 935)
@@ -1,27 +0,0 @@
-Submitted By: DJ Lucas <dj AT linuxfromscratch DOT org>
-Date: 2004-11-27
-Initial Package Version: 1.4.1
-Origin: Sent by Sourcemage Guru Hamish Greig
-Description: Motif compilation fix. Needed if default optimization flags
- are used.
-
---- j2sdk-build-orig/motif/lib/Xm/util/mkmsgcat.c 2004-10-19
13:44:16.000000000 -0500
-+++ j2sdk-build/motif/lib/Xm/util/mkmsgcat.c 2004-11-15 20:22:21.000000000
-0600
-@@ -14,7 +14,7 @@
- #include <string.h>
- char buf[1024];
-
--char *OSF_COPYRIGHT = "$\n\
-+char *OSF_COPYRIGHT = "\
- $ @[EMAIL PROTECTED]
- $ 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\
Deleted: trunk/j2sdk/jdk-1.5.0-remove_broken_demo-1.patch
===================================================================
--- trunk/j2sdk/jdk-1.5.0-remove_broken_demo-1.patch 2005-04-29 05:04:57 UTC
(rev 934)
+++ trunk/j2sdk/jdk-1.5.0-remove_broken_demo-1.patch 2005-04-29 05:12:51 UTC
(rev 935)
@@ -1,23 +0,0 @@
-Submitted By: DJ Lucas <dj AT linuxfromscratch DOT org>
-Date: 2003-11-27
-Initial Package Version: 1.5.0
-Origin: DJ Lucas
-Description: The waiters demo is broken with gcc-3.3 and gcc-3.4. I don't
- know how to fix it, so this will remove it. We don't really
- need it anyway, but untill somebody else can take a look and
- fix it properly, this will be sufficient to make a clean build.
-
---- j2sdk-build-orig/j2se/make/mkdemo/jvmti/Makefile 2004-10-19
13:45:03.000000000 -0500
-+++ j2sdk-build/j2se/make/mkdemo/jvmti/Makefile 2004-11-17
21:17:39.000000000 -0600
-@@ -26,8 +26,9 @@
- gctest \
- heapViewer \
- heapTracker \
-- mtrace \
-- waiters
-+ mtrace
-+# mtrace \
-+# waiters
-
- all optimized clean clobber ::
- @for i in $(SUBDIRS) ; do \
Deleted: trunk/j2sdk/jdk-1.5.0-remove_debug_image-1.patch
===================================================================
--- trunk/j2sdk/jdk-1.5.0-remove_debug_image-1.patch 2005-04-29 05:04:57 UTC
(rev 934)
+++ trunk/j2sdk/jdk-1.5.0-remove_debug_image-1.patch 2005-04-29 05:12:51 UTC
(rev 935)
@@ -1,18 +0,0 @@
-Submitted By: DJ Lucas <dj AT linuxfromscratch DOT org>
-Date: 2004-11-27
-Initial Package Version: 1.4.2
-Origin: Sent by Hamish Greig (Formerly of SourceMage)
-Description: Prevents building of the debug image, saving approximately
- 200 MB of disk space.
-
---- j2sdk-build-orig/j2se/make/common/Release.gmk 2004-10-19
13:44:51.000000000 -0500
-+++ j2sdk-build/j2se/make/common/Release.gmk 2004-11-15 20:40:25.000000000
-0600
-@@ -180,7 +180,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.
Deleted: trunk/j2sdk/jdk-1.5.0-remove_fixed_paths-1.patch
===================================================================
--- trunk/j2sdk/jdk-1.5.0-remove_fixed_paths-1.patch 2005-04-29 05:04:57 UTC
(rev 934)
+++ trunk/j2sdk/jdk-1.5.0-remove_fixed_paths-1.patch 2005-04-29 05:12:51 UTC
(rev 935)
@@ -1,221 +0,0 @@
-Submitted By: DJ Lucas <dj AT linuxfromscratch DOT org>
-Date: 2003-11-27
-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.5.0.
-
---- j2sdk-build-orig/control/make/common/Defs-linux.gmk 2004-10-19
13:40:20.000000000 -0500
-+++ j2sdk-build/control/make/common/Defs-linux.gmk 2004-11-15
20:45:06.000000000 -0600
-@@ -45,52 +45,52 @@
- # 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
--MSGFMT = $(USRBIN_PATH)msgfmt
--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
-+MSGFMT = msgfmt
-+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-build-orig/j2se/make/common/Defs-linux.gmk 2004-10-19
13:44:50.000000000 -0500
-+++ j2sdk-build/j2se/make/common/Defs-linux.gmk 2004-11-17
01:18:56.434957160 -0600
-@@ -28,64 +28,57 @@
- # 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
--TAIL = $(USRBIN_PATH)tail
--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
-+TAIL = tail
-+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 \
Deleted: trunk/j2sdk/jdk-1.5.0-static_cxx-1.patch
===================================================================
--- trunk/j2sdk/jdk-1.5.0-static_cxx-1.patch 2005-04-29 05:04:57 UTC (rev
934)
+++ trunk/j2sdk/jdk-1.5.0-static_cxx-1.patch 2005-04-29 05:12:51 UTC (rev
935)
@@ -1,17 +0,0 @@
-Submitted By: DJ Lucas <dj AT linuxfromscratch DOT org>
-Date: 2004-11-27
-Initial Package Version: 1.4.2
-Origin: Gentoo
-Description: Link to shared cxxlibs.
-
---- j2sdk-build-orig/j2se/make/common/Defs-linux.gmk 2004-11-18
00:19:15.021281736 -0600
-+++ jdk-build/j2se/make/common/Defs-linux.gmk 2004-11-18 00:09:33.148739808
-0600
-@@ -22,7 +22,7 @@
- # LDLIBS_COMMON (set $(EXTRA_LIBS) 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
Deleted: trunk/j2sdk/jdk-1.5.0-xorg-6.8.1-1.patch
===================================================================
--- trunk/j2sdk/jdk-1.5.0-xorg-6.8.1-1.patch 2005-04-29 05:04:57 UTC (rev
934)
+++ trunk/j2sdk/jdk-1.5.0-xorg-6.8.1-1.patch 2005-04-29 05:12:51 UTC (rev
935)
@@ -1,23 +0,0 @@
-Submitted By: DJ Lucas (dj AT linuxfromscratch DOT org)
-Date: 2004-11-27
-Initial Package Version: 1.5.0
-Origin: DJ Lucas
-Description: Xorg 6.8.1 builds a shared libXm by default. The build will fail
- as the ifeq is done on the static 2.1 libXm. This forces linking
- against the shared libXm in /usr/X11R6/lib.
-
---- jdk-build-orig/j2se/make/sun/awt/mawt.gmk 2004-10-19 13:45:09.000000000
-0500
-+++ jdk-build/j2se/make/sun/awt/mawt.gmk 2004-11-26 18:32:20.177820800
-0600
-@@ -130,9 +130,9 @@
- ifeq ($(ARCH_DATA_MODEL), 64)
- LIBXT = -lXt
- else
-- LIBXT = /usr/X11R6/lib/libXt.a
-- LIBSM = /usr/X11R6/lib/libSM.a
-- LIBICE = /usr/X11R6/lib/libICE.a
-+ LIBXT = -lXt
-+ LIBSM =
-+ LIBICE =
- endif
- endif
- else
Copied: trunk/jdk/jdk-1.5.0-motif_mkmsgcat-1.patch (from rev 933,
trunk/j2sdk/jdk-1.5.0-motif_mkmsgcat-1.patch)
Copied: trunk/jdk/jdk-1.5.0-remove_broken_demo-1.patch (from rev 933,
trunk/j2sdk/jdk-1.5.0-remove_broken_demo-1.patch)
Copied: trunk/jdk/jdk-1.5.0-remove_debug_image-1.patch (from rev 933,
trunk/j2sdk/jdk-1.5.0-remove_debug_image-1.patch)
Copied: trunk/jdk/jdk-1.5.0-remove_fixed_paths-1.patch (from rev 933,
trunk/j2sdk/jdk-1.5.0-remove_fixed_paths-1.patch)
Copied: trunk/jdk/jdk-1.5.0-static_cxx-1.patch (from rev 933,
trunk/j2sdk/jdk-1.5.0-static_cxx-1.patch)
Copied: trunk/jdk/jdk-1.5.0-xorg-6.8.1-1.patch (from rev 933,
trunk/j2sdk/jdk-1.5.0-xorg-6.8.1-1.patch)
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
