[lfs] 02/02: Merge gcc15 branch (which will be merged to trunk soon)

"Git Owner" ([email protected] via lfs-book Mailing List) <[email protected]>
Newsgroups gmane.linux.lfs.book
Message-ID <[email protected]>
This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch multilib
in repository lfs.

commit d76971c0967ce059e844f592c46b0747c67be4bc
Merge: 414df8a81 14b85031e
Author: Thomas Trepl <[email protected]>
AuthorDate: Sat May 31 07:59:23 2025 +0200

    Merge gcc15 branch (which will be merged to trunk soon)

 chapter01/changelog.xml | 42 +++++++++++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml  | 36 ++++++++++++++++++++++------------
 chapter03/patches.xml   | 37 +++++++++++++++++++++--------------
 chapter05/gcc-pass1.xml | 14 -------------
 chapter06/bash.xml      | 24 +++--------------------
 chapter06/gcc-pass2.xml |  8 +++++---
 chapter08/bc.xml        |  4 ++--
 chapter08/coreutils.xml |  4 ++++
 chapter08/expect.xml    |  2 +-
 chapter08/gmp.xml       |  4 ++++
 chapter08/ncurses.xml   |  4 ++--
 chapter08/perl.xml      |  4 ++++
 chapter08/python.xml    | 21 ++++++++++++++++----
 packages.ent            | 52 +++++++++++++++++++++++++++++++++++--------------
 patches.ent             | 37 +++++++++++++++++++++++++----------
 15 files changed, 194 insertions(+), 99 deletions(-)

diff --cc chapter06/gcc-pass2.xml
index 685882649,13baefa48..7a680ce65
--- a/chapter06/gcc-pass2.xml
+++ b/chapter06/gcc-pass2.xml
@@@ -114,29 -99,9 +113,32 @@@ cd       build</userinput></screen
      --disable-libsanitizer     \
      --disable-libssp           \
      --disable-libvtv           \
-     --enable-languages=c,c++</userinput></screen>
+     --enable-languages=c,c++   \
++    LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc</userinput></screen>
 +<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure" 
 +    arch="ml_32">mlist=m64,m32</userinput><userinput remap="configure"
 +    arch="ml_x32">mlist=m64,mx32</userinput><userinput remap="configure"
 +    arch="ml_all">mlist=m64,m32,mx32</userinput>
 +<userinput remap="configure">../configure                                       \
 +    --build=$(../config.guess)                     \
 +    --host=$LFS_TGT                                \
 +    --target=$LFS_TGT                              \
 +    LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc      \
 +    --prefix=/usr                                  \
 +    --with-build-sysroot=$LFS                      \
 +    --enable-default-pie                           \
 +    --enable-default-ssp                           \
 +    --disable-nls                                  \
 +    --enable-multilib --with-multilib-list=$mlist  \
 +    --disable-libatomic                            \
 +    --disable-libgomp                              \
 +    --disable-libquadmath                          \
 +    --disable-libsanitizer                         \
 +    --disable-libssp                               \
 +    --disable-libvtv                               \
-     --enable-languages=c,c++</userinput></screen>
++    --enable-languages=c,c++                       \
+     LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc 
+     </userinput></screen>
  
      <variablelist>
        <title>The meaning of the new configure options:</title><!-- WIP -->
diff --cc chapter08/gmp.xml
index 63247449b,f0f0a8b3b..6718bc3f9
--- a/chapter08/gmp.xml
+++ b/chapter08/gmp.xml
@@@ -62,10 -62,12 +62,14 @@@
             CFLAGS is still automatically set to -march=something.  -->
      </note>
  
+     <para>First, make an adjustment for compatibilty with gcc-15 and later:</para>
+ 
+ <screen><userinput remap="pre">sed -i '/long long t1;/,+1s/()/(...)/' configure</userinput></screen>
+ 
      <para>Prepare GMP for compilation:</para>
  
 +<screen><userinput remap="pre">sed '/long long t1;/,+1s/()/(...)/' -i configure</userinput></screen>
 +
  <screen><userinput remap="configure">./configure --prefix=/usr    \
              --enable-cxx     \
              --disable-static \
diff --cc packages.ent
index 7199ad8c7,405b0c373..2a0b07461
--- a/packages.ent
+++ b/packages.ent
@@@ -48,7 -48,7 +48,11 @@@
  <!ENTITY automake-fin-sbu "less than 0.1 SBU (about 1.1 SBU with tests)">
  
  <!ENTITY bash-version "5.3-rc1">
++<<<<<<< HEAD
 +<!ENTITY bash-size "10,868 KB">
++=======
+ <!ENTITY bash-size "10,491 KB">
++>>>>>>> origin/gcc15
  <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
  <!ENTITY bash-md5 "f58f56196606a0d0cef9b96b733d256c">
  <!ENTITY bash-home "&gnu-software;bash/">
@@@ -211,7 -211,7 +215,11 @@@
  <!ENTITY gawk-fin-sbu "0.2 SBU">
  
  <!ENTITY gcc-version "15.1.0">
++<<<<<<< HEAD
 +<!ENTITY gcc-size "93,744 KB">
++=======
+ <!ENTITY gcc-size "95,966 KB">
++>>>>>>> origin/gcc15
  <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
  <!ENTITY gcc-md5 "e55d13c55428bca27b4d2ea02f883135">
  <!ENTITY gcc-home "https://gcc.gnu.org/">
@@@ -529,9 -519,10 +537,16 @@@
  <!ENTITY mpfr-fin-du "43 MB">
  <!ENTITY mpfr-fin-sbu "0.2 SBU">
  
++<<<<<<< HEAD
 +<!ENTITY ncurses-version "6.5">
 +<!ENTITY ncurses-size "3,699 KB">
 +<!ENTITY ncurses-url "https://invisible-mirror.net/archives/ncurses/current/ncurses-&ncurses-version;-20250517.tgz">
++=======
+ <!ENTITY ncurses-version "6.5-20250517">
+ <!ENTITY ncurses-base-version "6.5">
+ <!ENTITY ncurses-size "3,700 KB">
+ <!ENTITY ncurses-url "https://invisible-mirror.net/archives/ncurses/current/ncurses-&ncurses-version;.tgz">
++>>>>>>> origin/gcc15
  <!ENTITY ncurses-md5 "f969398c02415326ca075db69e04f87f">
  <!ENTITY ncurses-home "&gnu-software;ncurses/">
  <!ENTITY ncurses-tmp-du "53 MB">
@@@ -628,10 -619,10 +643,17 @@@
  <!ENTITY python-docs-md5 "5b65ca5579dac14e425cd247af6fd043">
  <!ENTITY python-docs-size "10,112 KB">
  
++<<<<<<< HEAD
 +<!ENTITY readline-version "8.3">
 +<!ENTITY readline-soversion "8.3"><!-- used for stripping -->
 +<!ENTITY readline-size "2,974 KB">
 +<!ENTITY readline-url "&gnu;readline/readline-&readline-version;-rc1.tar.gz">
++=======
+ <!ENTITY readline-version "8.3-rc1">
+ <!ENTITY readline-soversion "8.3"><!-- used for stripping -->
+ <!ENTITY readline-size "3,336 KB">
+ <!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
++>>>>>>> origin/gcc15
  <!ENTITY readline-md5 "65e32c25e6ba871e5b026d22d0b81002">
  <!ENTITY readline-home "https://tiswww.case.edu/php/chet/readline/rltop.html">
  <!ENTITY readline-fin-du "16 MB">
diff --cc patches.ent
index 9ea2d52a5,dc666134a..bb423066a
--- a/patches.ent
+++ b/patches.ent
@@@ -20,9 -20,13 +20,19 @@@
  <!ENTITY coreutils-i18n-patch-md5 "33ebfad32b2dfb8417c3335c08671206">
  <!ENTITY coreutils-i18n-patch-size "159 KB">
  
++<<<<<<< HEAD
 +<!ENTITY expect-gcc15-patch "expect-&expect-version;-gcc15-1.patch">
 +<!ENTITY expect-gcc15-patch-md5 "0ca4d6bb8d572fbcdb13cb36cd34833e">
 +<!ENTITY expect-gcc15-patch-size "11.8 KB">
++=======
+ <!ENTITY coreutils-upstream-patch "coreutils-&coreutils-version;-upstream_fix-1.patch">
+ <!ENTITY coreutils-upstream-patch-md5 "96382a5aa85d6651a74f94ffb61785d9">
+ <!ENTITY coreutils-upstream-patch-size "4.1 KB">
+ 
+ <!ENTITY expect-gcc15-patch "expect-&expect-version;-gcc15-1.patch">
+ <!ENTITY expect-gcc15-patch-md5 "0ca4d6bb8d572fbcdb13cb36cd34833e">
+ <!ENTITY expect-gcc15-patch-size "12 KB">
++>>>>>>> origin/gcc15
  
  <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
  <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.