r3042 - in trunk: BOOK BOOK/general/prog BOOK/introduction/welcome patches

dj at linuxfromscratch.org dj at linuxfromscratch.org
Sat Nov 27 01:53:54 PST 2004


Author: dj
Date: 2004-11-27 02:53:52 -0700 (Sat, 27 Nov 2004)
New Revision: 3042

Added:
   trunk/patches/j2sdk-1.4.2-nptl-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/prog/j2sdk.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Added nptl patch to j2sdk additional downloads

Modified: trunk/BOOK/general/prog/j2sdk.xml
===================================================================
--- trunk/BOOK/general/prog/j2sdk.xml	2004-11-27 04:57:11 UTC (rev 3041)
+++ trunk/BOOK/general/prog/j2sdk.xml	2004-11-27 09:53:52 UTC (rev 3042)
@@ -80,6 +80,7 @@
 <listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-fix_inline_asm-1.patch"/></para></listitem>
 <listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-gcc33-1.patch"/></para></listitem>
 <listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-motif_mkmsgcat-1.patch"/></para></listitem>
+<listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-nptl-1.patch"/></para></listitem>
 <listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-remove_debug_image-1.patch"/></para></listitem>
 <listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-remove_fixed_paths-1.patch"/></para></listitem>
 <listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-static_cxx-1.patch"/></para></listitem>
@@ -125,26 +126,26 @@
 download the source owing to license restrictions, skip ahead to the 
 configuration section.</para>
 
-<para>Add the recently compiled <acronym>JDK</acronym> to the path.</para>
+<para>Add the recently installed <acronym>JDK</acronym> to the path.</para>
 
 <screen><userinput><command>export JAVA_HOME=/opt/j2sdk/j2sdk-precompiled-${MV} &&
 export PATH=$PATH:${JAVA_HOME}/bin</command></userinput></screen>
 
 <para>Unzip the source:</para>
 
-<screen><userinput><command>VERSION=&j2sdk-src-version; &&
+<screen><userinput><command>mkdir j2sdk-build &&
+cd j2sdk-build &&
+VERSION=&j2sdk-src-version; &&
 V=`echo $VERSION | sed -e "s/\./_/g"` &&
-unzip j2sdk-${V}-src-scsl.zip &&
-unzip j2sdk-${V}-mozilla_headers-unix.zip &&
-unzip j2sdk-${V}-bin-scsl.zip</command></userinput></screen>
+unzip ../j2sdk-${V}-src-scsl.zip &&
+unzip ../j2sdk-${V}-mozilla_headers-unix.zip &&
+unzip ../j2sdk-${V}-bin-scsl.zip</command></userinput></screen>
 
 <para>Apply all the patches downloaded above.</para>
 
-<screen><userinput><command>for PATCH in fix_inline_asm-1 gcc33-1 \
-             motif_mkmsgcat-1 remove_debug_image-1 remove_fixed_paths-1 \
-             static_cxx-1 nptl-1
+<screen><userinput><command>for PATCH in ../j2skd-&j2sdk-src-version;*.patch
 do
-   patch -Np1 -i j2sdk-&j2sdk-src-version;-$PATCH.patch
+   patch -Np1 -i $PATCH
 done</command></userinput></screen>
 
 <para>Set/unset some variables which affect the build:</para>
@@ -246,8 +247,8 @@
 
 <sect3><title>Configuration Information</title>
 
-<para>We have two Java 2 <acronym>SDK</acronym>'s installed in
-<filename>/opt/j2sdk</filename>. Decide on which one you
+<para>There are now two Java 2 <acronym>SDK</acronym>'s installed in
+<filename>/opt/j2sdk</filename>. You should decide on which one you
 would like to use as the default. For example if you decide to use the source
 compiled <application>J2SDK</application>, do the following:</para>
 
@@ -266,8 +267,8 @@
 <para>The <application>Java</application> plugin is in the directory
 <filename class="directory">$JAVA_HOME/jre/plugin/i?86/ns610/</filename>.
 Make a symbolic link to the file in that directory from your plugins directory.
-Note that plugin must be a symlink for it to work. If not, the browsers
-just crash when a Java plugin is attempted to be loaded.</para>
+Note that the plugin must be a symlink for it to work. If not, the browsers
+just crash when you attempt to load a Java plugin.</para>
 
 </sect3>
 

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2004-11-27 04:57:11 UTC (rev 3041)
+++ trunk/BOOK/general.ent	2004-11-27 09:53:52 UTC (rev 3042)
@@ -1,4 +1,4 @@
-<!ENTITY day          "26">
+<!ENTITY day          "27">
 <!ENTITY month        "11">
 <!ENTITY year         "2004">
 <!ENTITY version      "svn-&year;&month;&day;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-11-27 04:57:11 UTC (rev 3041)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-11-27 09:53:52 UTC (rev 3042)
@@ -22,6 +22,10 @@
 
 <itemizedlist>
 
+<listitem><para>November 27th, 2004 [dj]: Added nptl patch to j2sdk
+instructions and did minor cleanups on the instructions and
+text.</para></listitem>
+
 <listitem><para>November 26th, 2004 [randy]: Updated to GConf Editor-2.8.2, 
 GGV-2.8.0, File Roller-2.8.3 and gucharmap-1.4.2.</para></listitem>
 

Added: trunk/patches/j2sdk-1.4.2-nptl-1.patch
===================================================================
--- trunk/patches/j2sdk-1.4.2-nptl-1.patch	2004-11-27 04:57:11 UTC (rev 3041)
+++ trunk/patches/j2sdk-1.4.2-nptl-1.patch	2004-11-27 09:53:52 UTC (rev 3042)
@@ -0,0 +1,51 @@
+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.
+
+$LastChangedBy$
+$Date$
+
+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
+ }


Property changes on: trunk/patches/j2sdk-1.4.2-nptl-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list