Changeset d7bee48 for general/prog/gcc-java.xml

Timestamp:

05/07/2016 08:10:29 PM (8 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

systemd-13485

Children:

2e633b6

Parents:

37191af

Message:

Sync to trunk r17332

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@17335 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• general/prog/gcc-java.xml (modified) (5 diffs)

general/prog/gcc-java.xml

@@ -7 +7 @@
   <!ENTITY gcc-java-download-http  "http://ftpmirror.gnu.org/gcc/gcc-&gcc-java-version;/gcc-&gcc-java-version;.tar.bz2">
   <!ENTITY gcc-java-download-ftp   "ftp://ftp.gnu.org/gnu/gcc/gcc-&gcc-java-version;/gcc-&gcc-java-version;.tar.bz2">
-  <!ENTITY gcc-java-md5sum         "c9616fd448f980259c31de613e575719">
-  <!ENTITY gcc-java-size           "92 MB">
-  <!ENTITY gcc-java-buildsize      "4.1 GB">
-  <!ENTITY gcc-java-time           "86 SBU (including 72 SBU for tests)">
-
-  <!ENTITY ecj-download-ftp    "ftp://sourceware.org/pub/java/ecj-latest.jar">
+  <!ENTITY gcc-java-md5sum         "8fb6cb98b8459f5863328380fbf06bd1">
+  <!ENTITY gcc-java-size           "95 MB">
+  <!ENTITY gcc-java-buildsize      "5 GB">
+  <!ENTITY gcc-java-time           "29 SBU (with tests and parallelism=4)">
+
+  <!ENTITY ecj-download-ftp    "ftp://sourceware.org/pub/java/ecj-4.9.jar">
 
   <!ENTITY antlr-version       "4.5.1">
@@ -157 +157 @@
 <screen><userinput>sed -i 's/\(install.*:\) install-.*recursive/\1/' libffi/Makefile.in         &amp;&amp;
 sed -i 's/\(install-data-am:\).*/\1/'             libffi/include/Makefile.in &amp;&amp;
-
-cp ../ecj-latest.jar ./ecj.jar &amp;&amp;
+sed -i 's/absolute/file normalize/' libjava/testsuite/lib/libjava.exp &amp;&amp;
+sed -i 's/major.*1000.*minor/major/' gcc/java/decl.c &amp;&amp;
+
+cp ../ecj-4.9.jar ./ecj.jar &amp;&amp;
 
 mkdir build &amp;&amp;
@@ -207 +209 @@
     /usr/lib/gcc/*linux-gnu/&gcc-java-version;/include{,-fixed} &amp;&amp;
 
-gcj -o ecj ../../ecj-latest.jar \
+gcj -o ecj ../../ecj-4.9.jar \
     --main=org.eclipse.jdt.internal.compiler.batch.Main &amp;&amp;
 mv ecj /usr/bin &amp;&amp;
@@ -218 +220 @@
 
     <para>
-      The two <command>sed</command> commands prevent the
+      The first two <command>sed</command> commands prevent the
       installation of the <application>libffi</application> library bundled
       with <application>GCC</application>, since it is outdated compared to
       <xref linkend="libffi"/>.
+    </para>
+
+    <para>
+      The next two <command>sed</command> commands implement upstream fixes
+      to the <application>GCC Java</application> compiler and tests.
     </para>
 
@@ -298 +305 @@
       /usr/lib/gcc/*linux-gnu/...</command>:
       If the package is built by a user other than root, the ownership of the
-      installed <filename class="directory">include</filename> directory (and its
-      content) will be incorrect. This commands changes the ownership to the
-      <systemitem class="username">root</systemitem> user and group.
+      installed <filename class="directory">include</filename> directory (and
+      its content) will be incorrect. This command changes the ownership to 
+      the <systemitem class="username">root</systemitem> user and group.
     </para>