Changeset 788f897

Timestamp:

02/21/2020 04:32:53 PM (3 years ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib-10.1, multilib-before-cross

Children:

bc12dcb

Parents:

54a6bc9

Message:

MultiLib: Merge changes from trunk

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11757 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter03/packages.xml (modified) (2 diffs)
• chapter05/gcc-pass1.xml (modified) (1 diff)
• chapter06/glibc.xml (modified) (1 diff)
• lfs-latest.php (modified) (2 diffs)
• packages.ent (modified) (1 diff)

chapter03/packages.xml

@@ -455 +455 @@
           cost for a subsequent patch level upgrade within a minor release.
           </para>
-
         </note>
       </listitem>
@@ -753 +752 @@
         <para>Download: <ulink url="&vim-url;"/></para>
         <para>MD5 sum: <literal>&vim-md5;</literal></para>
+        <note>
+          <para>
+            The version of vim changes daily. The get the latest version, go to
+            <ulink url="https://github.com/vim/vim/releases">
+            https://github.com/vim/vim/releases</ulink>.
+          </para>
+        </note>
       </listitem>
     </varlistentry>

chapter05/gcc-pass1.xml

@@ -184 +184 @@
 
       <varlistentry>
+        <term><parameter>--with-glibc-version=2.11</parameter></term>
+        <listitem>
+          <para>This option ensures the package will be compatible with the host's
+          version of glibc.  It is set to the minimum glibc requirement 
+          specified in the <xref linkend="ch-partitioning-hostreqs"/>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><parameter>--with-newlib</parameter></term>
         <listitem>

chapter06/glibc.xml

@@ -62 +62 @@
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-glob-patch;</userinput></screen>
 -->
+<!-- No longer needed
     <para>Fix a problem introduced with the linux-5.2 kernel:</para>
 
 <screen><userinput remap="pre">sed -i '/asm.socket.h/a# include &lt;linux/sockios.h&gt;' \
    sysdeps/unix/sysv/linux/bits/socket.h</userinput></screen>
-
+-->
     <para>Create a symlink for LSB
     compliance. Additionally, for x86_64, create a compatibility symlink

lfs-latest.php

@@ -121 +121 @@
 if ( $package == "mpfr"       ) $dirpath = "http://mpfr.loria.fr/mpfr-current";
 if ( $package == "ninja"      ) $dirpath = "https://github.com/ninja-build/ninja/releases";
-if ( $package == "procps-ng"  ) $dirpath = "http://sourceforge.net/projects/procps-ng/files";
-if ( $package == "psmisc"     ) $dirpath = "http://sourceforge.net/projects/$package/files";
+//if ( $package == "procps-ng"  ) $dirpath = "http://sourceforge.net/projects/procps-ng/files";
+if ( $package == "procps-ng"  ) $dirpath = "https://gitlab.com/procps-ng/procps/-/tags";
+//if ( $package == "psmisc"     ) $dirpath = "http://sourceforge.net/projects/$package/files";
+if ( $package == "psmisc"     ) $dirpath = "https://gitlab.com/psmisc/psmisc/-/tags";
 if ( $package == "shadow"     ) $dirpath = "https://github.com/shadow-maint/shadow/releases";
 if ( $package == "systemd"    ) $dirpath = "https://github.com/systemd/systemd/releases";
@@ -276 +278 @@
   }
 
+  if ( $package == "procps-ng" )
+     return find_max( $lines, "/release/", "/^.* ([\d\.]+).*$/" );
+
+  if ( $package == "psmisc" )
+     return find_max( $lines, "/^v/", "/^v([\d\.]+).*$/" );
+
   if ( $package == "grub" )
      return find_max( $lines, "/grub/", "/^.*grub-(\d\..*).tar.xz.*$/" );

packages.ent

@@ -719 +719 @@
 <!ENTITY vim-docdir "vim/vim82">
 <!ENTITY vim-size "14,406 KB">
-<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">
+<!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
+<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">
 <!ENTITY vim-md5 "f5337b1170df90e644a636539a0313a3">
 <!ENTITY vim-home "https://www.vim.org">