diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index dd592f663..9fece4dd9 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -61,10 +61,10 @@
- Expect GCC14 Patch - &expect-gcc14-patch-size;:
+ Expect GCC15 Patch - &expect-gcc15-patch-size;:
- Download:
- MD5 sum: &expect-gcc14-patch-md5;
+ Download:
+ MD5 sum: &expect-gcc15-patch-md5;
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index 0bbd08079..25c16939a 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -50,6 +50,8 @@ echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h
-->
Prepare M4 for compilation:
+sed 's/\[\[__nodiscard__]]//' -i lib/config.hin
+
./configure --prefix=/usr \
--host=$LFS_TGT \
--build=$(build-aux/config.guess)
diff --git a/chapter08/bc.xml b/chapter08/bc.xml
index 3d8cd9983..f22affb30 100644
--- a/chapter08/bc.xml
+++ b/chapter08/bc.xml
@@ -43,15 +43,15 @@
Prepare Bc for compilation:
-CC=gcc ./configure --prefix=/usr -G -O3 -r
+CC='gcc -std=c99' ./configure --prefix=/usr -G -O3 -r
The meaning of the configure options:
- CC=gcc
+ CC='gcc -std=c99'
- This parameter specifies the compiler to use.
+ This parameter specifies the compiler and the C standard to use.
diff --git a/chapter08/expect.xml b/chapter08/expect.xml
index d7c6341f4..2ac70ac04 100644
--- a/chapter08/expect.xml
+++ b/chapter08/expect.xml
@@ -67,9 +67,9 @@
GDBM, and of course Expect itself) will fail catastrophically, and other
subtle breakages may also happen.
- Now, make some changes to allow the package with gcc-14.1 or later:
+ Now, make some changes to allow the package with gcc-15.1 or later:
-patch -Np1 -i ../expect-&expect-version;-gcc14-1.patch
+patch -Np1 -i ../expect-&expect-version;-gcc15-1.patch
Prepare Expect for compilation:
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index e136677b1..19b95659f 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -181,10 +181,7 @@ cd build
Now remove/fix several known test failures:
sed -e '/cpython/d' -i ../gcc/testsuite/gcc.dg/plugin/plugin.exp
-sed -e 's/no-pic /&-no-pie /' -i ../gcc/testsuite/gcc.target/i386/pr113689-1.c
-sed -e 's/300000/(1|300000)/' -i ../libgomp/testsuite/libgomp.c-c++-common/pr109062.c
-sed -e 's/{ target nonpic } //' \
- -e '/GOTPCREL/d' -i ../gcc/testsuite/gcc.target/i386/fentryname3.c
+sed -e 's/300000/(1|300000)/' -i ../libgomp/testsuite/libgomp.c-c++-common/pr109062.c
Test the results as a non-privileged user, but do not stop at errors:
diff --git a/chapter08/gmp.xml b/chapter08/gmp.xml
index cf5051d1e..63247449b 100644
--- a/chapter08/gmp.xml
+++ b/chapter08/gmp.xml
@@ -64,6 +64,8 @@
Prepare GMP for compilation:
+sed '/long long t1;/,+1s/()/(...)/' -i configure
+
./configure --prefix=/usr \
--enable-cxx \
--disable-static \
diff --git a/chapter08/m4.xml b/chapter08/m4.xml
index 2af3fd283..ef947207e 100644
--- a/chapter08/m4.xml
+++ b/chapter08/m4.xml
@@ -47,6 +47,9 @@ echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h
-->
Prepare M4 for compilation:
+sed 's/\[\[__nodiscard__]]//' -i lib/config.hin
+sed 's/test-stdalign\$(EXEEXT) //' -i tests/Makefile.in
+
./configure --prefix=/usr
Compile the package:
diff --git a/packages.ent b/packages.ent
index a00f01067..770d3e53b 100644
--- a/packages.ent
+++ b/packages.ent
@@ -47,10 +47,10 @@
-
+
-
+
@@ -210,10 +210,10 @@
-
-
-
-
+
+
+
+
@@ -531,8 +531,8 @@
-
-
+
+
@@ -628,11 +628,11 @@
-
-
+
+
-
-
+
+
diff --git a/patches.ent b/patches.ent
index c7b2ab19b..9ea2d52a5 100644
--- a/patches.ent
+++ b/patches.ent
@@ -20,9 +20,9 @@
-
-
-
+
+
+