Changeset 9b36a3a

Timestamp:

05/31/2015 08:19:43 AM (9 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 7.10, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gimp3, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

0d12bbe

Parents:

9ae6ea1

Message:

Add a variable to allow building openjdk on Linux-4, and tag for gcc-5

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16056 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• general/prog/openjdk.xml (modified) (4 diffs)

general/prog/openjdk.xml

@@ -81 +81 @@
     </para>
 
-    &lfs77_checked;
+    &lfs77_checked;&gcc5_checked;
 
     <note>
@@ -320 +320 @@
     -e '/DGifOpen/s/c)/c, NULL)/'     \
     -i jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c</userinput></screen>
-<!-- Seems to be corrected
-    <para>
-      Fix a bug in a shell script used to set the flags for
-      <command>make</command>:
-    </para>
-
-<screen><userinput>sed 's/\([ \t]\)\]\([^\]\)/\1I]\2/g' \
-    -i hotspot/make/linux/makefiles/adjust-mflags.sh</userinput></screen>
--->
+
     <note>
       <para>
@@ -357 +349 @@
    --with-zlib=system         \
    --with-giflib=system       &amp;&amp;
-make DEBUG_BINARIES=true all  &amp;&amp;
+make DEBUG_BINARIES=true                 \
+     DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \
+     all  &amp;&amp;
 find build/*/images/j2sdk-image -iname \*.diz -delete
 </userinput></screen>
@@ -583 +577 @@
 
     <para>
-      <command>make DEBUG_BINARIES=true all</command>: The build fails
-      if DEBUG_BINARIES is not set to true.
+      <command>make DEBUG_BINARIES=true
+      DISABLE_HOTSPOT_OS_VERSION_CHECK=ok all</command>: The build fails if
+      DEBUG_BINARIES is not set to true. Furthermore, OS version checking in
+      hotspot's Makefile does not account for Linux version 4.x. Disabling the
+      test is harmless and allows building.
     </para>