Преглед на файлове

Merge changes from trunk

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11614 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Thomas Trepl преди 6 години
родител
ревизия
f690f4ff95
променени са 8 файла, в които са добавени 65 реда и са изтрити 44 реда
  1. 30 0
      chapter01/changelog.xml
  2. 5 5
      chapter01/whatsnew.xml
  3. 7 2
      chapter06/bison.xml
  4. 0 8
      chapter06/e2fsprogs.xml
  5. 2 3
      chapter06/expat.xml
  6. 0 5
      chapter06/perl.xml
  7. 3 3
      general.ent
  8. 18 18
      packages.ent

+ 30 - 0
chapter01/changelog.xml

@@ -45,6 +45,36 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2019-06-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to perl-5.30.0. Fixes
+          <ulink url="&lfs-ticket-root;4474">#4474</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.1.6. Fixes
+          <ulink url="&lfs-ticket-root;4473">#4473</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to openssl-1.1.1c. Fixes
+          <ulink url="&lfs-ticket-root;4476">#4476</ulink>.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[bdubbs] - Update to eudev-3.2.8. Fixes
+          <ulink url="&lfs-ticket-root;4472">#4472</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bison-3.4.1. Fixes
+          <ulink url="&lfs-ticket-root;4471">#4471</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to e2fsprogs-1.45.2. Fixes
+          <ulink url="&lfs-ticket-root;4475">#4475</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem revision="sysv">
       <para>2019-05-24</para>
       <itemizedlist>

+ 5 - 5
chapter01/whatsnew.xml

@@ -47,9 +47,9 @@
     <!--<listitem>
       <para>Binutils-&binutils-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Bison-&bison-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Bzip2-&bzip2-version;</para>
     </listitem>-->
@@ -68,11 +68,11 @@
     <!--<listitem>
       <para>Diffutils-&diffutils-version;</para>
     </listitem>-->
-    <!--<listitem revision="sysv">
-      <para>Eudev-&eudev-version;</para>
-   </listitem>-->
    <listitem>
       <para>E2fsprogs-&e2fsprogs-version;</para>
+   </listitem>
+    <listitem revision="sysv">
+      <para>Eudev-&eudev-version;</para>
    </listitem>
    <!--<listitem>
       <para>Expat-&expat-version;</para>

+ 7 - 2
chapter06/bison.xml

@@ -40,13 +40,18 @@
   <sect2 role="installation">
     <title>Installation of Bison</title>
 
+    <para>First, fix a build problem with the current version:</para>
+
+<screen><userinput remap="pre">sed -i '6855 s/mv/cp/' Makefile.in</userinput></screen>
+
     <para>Prepare Bison for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/bison-&bison-version;</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para>Compile the package, but work around a race condition in the 
+    current version:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make -j1</userinput></screen>
 
 <!--
     <para>To test the results (about 2.2 SBU), issue:</para>

+ 0 - 8
chapter06/e2fsprogs.xml

@@ -64,7 +64,6 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
              --disable-libblkid      \
              --disable-libuuid       \
              --disable-uuidd         \
-             --with-crond-dir=no     \
              --disable-fsck</userinput></screen>
 
     <variablelist>
@@ -101,13 +100,6 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><parameter>--with-crond-dir=no</parameter></term>
-        <listitem>
-          <para>This disables the installation of an unneded file.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><parameter>--disable-*</parameter></term>
         <listitem>

+ 2 - 3
chapter06/expat.xml

@@ -102,7 +102,7 @@ rm -rf DESTDIR</userinput></screen>
   <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
   
   <sect2 arch="ml_x32,ml_all" role="installation">
-    <title>Installation of Zlib - x32-bit</title>
+    <title>Installation of Expat - x32-bit</title>
 
     <para>Clean previous build:</para>
 
@@ -111,8 +111,7 @@ make clean</userinput></screen>
 
     <para>Prepare Expat for compilation:</para>
 
-<screen><userinput remap="configure">
-CC="gcc -mx32" ./configure \
+<screen><userinput remap="configure">CC="gcc -mx32" ./configure \
     --prefix=/usr          \
     --libdir=/usr/libx32   \
     --host=x86_64-pc-linux-gnux32</userinput></screen>

+ 0 - 5
chapter06/perl.xml

@@ -62,11 +62,6 @@ export BUILD_BZIP2=0</userinput></screen>
 <screen><userinput remap="pre">patch -Np1 -i ../&perl-gcc5-fixes-patch;</userinput></screen>
 -->
 
-    <para>Apply a change to allow the program to build correctly when building
-    with the latest versions of gcc:</para>
-
-<screen><userinput remap="pre">sed -i 's/67]/6789]/' Configure</userinput></screen>
-
     <para>To have full control over the way Perl is set up, you can remove the
     <quote>-des</quote> options from the following command and hand-pick the way
     this package is built. Alternatively, use the command exactly as below to

+ 3 - 3
general.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20190524">
+<!ENTITY version         "SVN-20190603">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20190519-systemd">
+<!ENTITY versiond        "20190603-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "May 24, 2019">
+<!ENTITY releasedate     "June 3, 2019">
 
 <!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.5">

+ 18 - 18
packages.ent

@@ -70,10 +70,10 @@
 <!ENTITY binutils-ch6-du "4.9 GB">
 <!ENTITY binutils-ch6-sbu "6.9 SBU">
 
-<!ENTITY bison-version "3.3.2">
-<!ENTITY bison-size "2,060 KB">
+<!ENTITY bison-version "3.4.1">
+<!ENTITY bison-size "2,147 KB">
 <!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz">
-<!ENTITY bison-md5 "c9b552dee234b2f6b66e56b27e5234c9">
+<!ENTITY bison-md5 "201286a573b12da109df96282fe4ff4a">
 <!ENTITY bison-home "&gnu-software;bison/">
 <!ENTITY bison-ch5-du "37 MB">
 <!ENTITY bison-ch5-sbu "0.3 SBU">
@@ -144,10 +144,10 @@
 <!ENTITY diffutils-ch6-du "36 MB">
 <!ENTITY diffutils-ch6-sbu "0.3 SBU">
 
-<!ENTITY e2fsprogs-version "1.45.1">
-<!ENTITY e2fsprogs-size "7,619 KB">
+<!ENTITY e2fsprogs-version "1.45.2">
+<!ENTITY e2fsprogs-size "7,735 KB">
 <!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "cdc40d50750356afef929c7922ecb4ae">
+<!ENTITY e2fsprogs-md5 "45933b29a045735c2d5a2b29ce3f4480">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-ch6-du "96 MB">
 <!ENTITY e2fsprogs-ch6-sbu "1.6 SBU">
@@ -160,10 +160,10 @@
 <!ENTITY elfutils-ch6-du "105 MB">
 <!ENTITY elfutils-ch6-sbu "1.3 SBU">
 
-<!ENTITY eudev-version "3.2.7">
-<!ENTITY eudev-size "1,849 KB">
+<!ENTITY eudev-version "3.2.8">
+<!ENTITY eudev-size "1,850 KB">
 <!ENTITY eudev-url "https://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz">
-<!ENTITY eudev-md5 "c75d99910c1791dd9430d26ab76059c0">
+<!ENTITY eudev-md5 "ce166b3fdd910c2a4a840378f48fedaf">
 <!ENTITY eudev-ch6-du "82 MB">
 <!ENTITY eudev-ch6-sbu "0.2 SBU">
 
@@ -431,12 +431,12 @@
 
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "1">
-<!ENTITY linux-patch-version "3">
+<!ENTITY linux-patch-version "6">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "103,754 KB">
+<!ENTITY linux-size "103,771 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "3f730ddd144d8ff83a10291e8c8cf0b4">
+<!ENTITY linux-md5 "252fe34c28205fcaaa6b1b3782576b84">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -535,10 +535,10 @@
 <!ENTITY ninja-ch6-du "65 MB">
 <!ENTITY ninja-ch6-sbu "0.2 SBU">
 
-<!ENTITY openssl-version "1.1.1b">
-<!ENTITY openssl-size "8,022 KB">
+<!ENTITY openssl-version "1.1.1c">
+<!ENTITY openssl-size "8,657 KB">
 <!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
-<!ENTITY openssl-md5 "4532712e7bcc9414f5bce995e4e13930">
+<!ENTITY openssl-md5 "15e21da6efe8aa0e0768ffd8cd37a5f6">
 <!ENTITY openssl-home "https://www.openssl.org/">
 <!ENTITY openssl-ch6-du "141 MB">
 <!ENTITY openssl-ch6-sbu "1.7 SBU">
@@ -553,10 +553,10 @@
 <!ENTITY patch-ch6-du "13 MB">
 <!ENTITY patch-ch6-sbu "0.2 SBU">
 
-<!ENTITY perl-version "5.28.2">
-<!ENTITY perl-size "12,085 KB">
+<!ENTITY perl-version "5.30.0">
+<!ENTITY perl-size "12,129 KB">
 <!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
-<!ENTITY perl-md5 "6bb75770e9ba085b32bf13e4be71e4ac">
+<!ENTITY perl-md5 "037c35000550bdcb47552ad0f6d3064d">
 <!ENTITY perl-home "https://www.perl.org/">
 <!ENTITY perl-ch5-du "275 MB">
 <!ENTITY perl-ch5-sbu "1.6 SBU">