提交: cbdbaa528f5ab97fa372e3cf7708cd7e441fc33f - LFScripts (git)

Commit MetaInfo

• 修订版: cbdbaa528f5ab97fa372e3cf7708cd7e441fc33f (tree)
• 时间: 2024-06-09 21:47:10
• 作者: matsuand <30614168+matsuand@user...>
• Commiter: matsuand

Log Message

5gcc.sh

更改概述

• modified: LFS/5libstdc.sh
• modified: LFS/6bash.sh
• modified: LFS/6gcc.sh
• modified: LFS/6ncurses.sh
• modified: LFS/7changingowner.sh
• modified: LFS/7kernfs.sh
• modified: LFS/7libstdc.sh
• modified: LFS/7python.sh
• modified: LFS/7util-linux.sh
• modified: LFS/8bash.sh
• modified: LFS/8expect.sh
• modified: LFS/8gcc.sh
• modified: LFS/8glibc.sh
• modified: LFS/8iana-etc.sh
• modified: LFS/8inetutils.sh
• modified: LFS/8jinja2.sh
• modified: LFS/8man-db.sh
• modified: LFS/8ncurses.sh
• modified: LFS/8ninja.sh
• modified: LFS/8openssl.sh
• modified: LFS/8python.sh
• modified: LFS/8readline.sh
• modified: LFS/8setuptools.sh
• modified: LFS/8stripping.sh
• modified: LFS/8systemd.sh
• modified: LFS/8tcl.sh
• modified: LFS/8util-linux.sh
• modified: LFS/8vim.sh

差异

--- a/LFS/5libstdc.sh
+++ b/LFS/5libstdc.sh
@@ -2,7 +2,7 @@
 
 CHAP=5
 APPNAME=libstdc++
-VER=13.2.0
+VER=14.1.0
 TARGET=$APPNAME-$VER
 TARGETBALL=gcc-$VER.tar.xz
 TARGETDIR=gcc-$VER

--- a/LFS/6bash.sh
+++ b/LFS/6bash.sh
@@ -27,6 +27,7 @@ echo \ \ Configuring...
             --build=$(sh support/config.guess) \
             --host=$LFS_TGT                    \
             --without-bash-malloc              \
+            bash_cv_strtold_broken=no          \
 	1> $LOG/$CHAP.$TARGET.1_conf.log 2>&1 || exit 1
 
 echo \ \ Making...

--- a/LFS/6gcc.sh
+++ b/LFS/6gcc.sh
@@ -3,7 +3,7 @@
 CHAP=6
 APPNAME=gcc
 APPVER=.2
-VER=13.2.0
+VER=14.1.0
 TARGET=$APPNAME-$VER
 TARGETBALL=$TARGET.tar.xz
 TARGETDIR=$TARGET

--- a/LFS/6ncurses.sh
+++ b/LFS/6ncurses.sh
@@ -2,10 +2,10 @@
 
 CHAP=6
 APPNAME=ncurses
-VER=6.4
+VER=6.5
 TARGET=$APPNAME-$VER
-TARGETBALL=$APPNAME-$VER-20230520.tar.xz
-TARGETDIR=$APPNAME-$VER-20230520
+TARGETBALL=$TARGET.tar.gz
+TARGETDIR=$TARGET
 
 . ./_lfsset.sh
 
@@ -48,7 +48,6 @@ echo \ \ Configuring...
             --without-debug              \
             --without-ada                \
             --disable-stripping          \
-            --enable-widec               \
 	1> $LOG/$CHAP.$TARGET.1_conf.log 2>&1 || exit 1
 
 echo \ \ Making...
@@ -58,7 +57,8 @@ make \
 echo \ \ Installing...
 make DESTDIR=$LFS TIC_PATH=$(pwd)/build/progs/tic install \
 	1> $LOG/$CHAP.$TARGET.3_install.log 2>&1 || exit 1
-ln -sv libncursesw.so $LFS/usr/lib/libncurses.so
+ln -sfv libncursesw.so $LFS/usr/lib/libncurses.so \
+	1>> $LOG/$CHAP.$TARGET.3_install.log 2>&1 || exit 1
 sed -e 's/^#if.*XOPEN.*$/#if 1/' \
     -i $LFS/usr/include/curses.h
 

--- a/LFS/7changingowner.sh
+++ b/LFS/7changingowner.sh
@@ -5,8 +5,7 @@ TARGET=changingowner
 
 LFS=/mnt/lfs
 
-chown -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools}
+chown --from lfs -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools}
 case $(uname -m) in
-  x86_64) chown -R root:root $LFS/lib64 ;;
+  x86_64) chown --from lfs -R root:root $LFS/lib64 ;;
 esac
-

--- a/LFS/7kernfs.sh
+++ b/LFS/7kernfs.sh
@@ -11,7 +11,7 @@ mkdir -pv $LFS/{dev,proc,sys,run}
 
 mount -v --bind /dev $LFS/dev
 
-mount -v --bind /dev/pts $LFS/dev/pts
+mount -vt devpts devpts -o gid=5,mode=0620 $LFS/dev/pts
 mount -vt proc proc $LFS/proc
 mount -vt sysfs sysfs $LFS/sys
 mount -vt tmpfs tmpfs $LFS/run

--- a/LFS/7libstdc.sh
+++ b/LFS/7libstdc.sh
@@ -2,7 +2,7 @@
 
 CHAP=7
 APPNAME=libstdc++
-VER=13.1.0
+VER=14.1.0
 TARGET=$APPNAME-$VER
 TARGETBALL=gcc-$VER.tar.xz
 TARGETDIR=gcc-$VER

--- a/LFS/7python.sh
+++ b/LFS/7python.sh
@@ -2,7 +2,7 @@
 
 CHAP=7
 APPNAME=python
-VER=3.12.2
+VER=3.12.3
 TARGET=$APPNAME-$VER
 TARGETBALL=Python-$VER.tar.xz
 TARGETDIR=Python-$VER

--- a/LFS/7util-linux.sh
+++ b/LFS/7util-linux.sh
@@ -2,7 +2,7 @@
 
 CHAP=7
 APPNAME=util-linux
-VER=2.40
+VER=2.40.1
 TARGET=$APPNAME-$VER
 TARGETBALL=$TARGET.tar.xz
 TARGETDIR=$TARGET

--- a/LFS/8bash.sh
+++ b/LFS/8bash.sh
@@ -27,9 +27,10 @@ patch -Np1 -i $DLD/bash-$VER-upstream_fixes-1.patch \
 	1> $LOG/$CHAP.$TARGET.0_patch.log 2>&1 || exit 1
 
 echo \ \ Configuring...
-./configure --prefix=/usr                    \
-            --without-bash-malloc            \
-            --with-installed-readline        \
+./configure --prefix=/usr                     \
+            --without-bash-malloc             \
+            --with-installed-readline         \
+            bash_cv_strtold_broken=no         \
             --docdir=/usr/share/doc/bash-$VER \
 	1> $LOG/$CHAP.$TARGET.1_conf.log 2>&1 || exit 1
 

--- a/LFS/8expect.sh
+++ b/LFS/8expect.sh
@@ -22,10 +22,15 @@ TimeStart
 
 cd $TARGETDIR
 
+echo \ \ Patching...
+patch -Np1 -i $DLD/expect-$VER-gcc14-1.patch \
+	1> $LOG/$CHAP.$TARGET.0_patch.log 2>&1 || exit 1
+
 echo \ \ Configuring...
 ./configure --prefix=/usr           \
             --with-tcl=/usr/lib     \
             --enable-shared         \
+            --disable-rpath         \
             --mandir=/usr/share/man \
             --with-tclinclude=/usr/include \
 	1> $LOG/$CHAP.$TARGET.1_conf.log 2>&1 || exit 1

--- a/LFS/8gcc.sh
+++ b/LFS/8gcc.sh
@@ -2,7 +2,7 @@
 
 CHAP=8
 APPNAME=gcc
-VER=13.2.0
+VER=14.1.0
 TARGET=$APPNAME-$VER
 TARGETBALL=$TARGET.tar.xz
 TARGETDIR=$TARGET
@@ -38,6 +38,7 @@ echo \ \ Configuring...
              --enable-languages=c,c++ \
              --enable-default-pie     \
              --enable-default-ssp     \
+             --enable-host-pie        \
              --disable-multilib       \
              --disable-bootstrap      \
              --disable-fixincludes    \

--- a/LFS/8glibc.sh
+++ b/LFS/8glibc.sh
@@ -27,8 +27,8 @@ cd $TARGETDIR
 echo \ \ Patching...
 patch -Np1 -i $DLD/glibc-$VER-fhs-1.patch \
 	1> $LOG/$CHAP.$TARGET.0_patch.log 2>&1 || exit 1
-#patch -Np1 -i $DLD/glibc-$VER-upstream_fixes-4.patch \
-#	1>> $LOG/$CHAP.$TARGET.0_patch.log 2>&1 || exit 1
+patch -Np1 -i $DLD/glibc-$VER-upstream_fix-2.patch \
+	1>> $LOG/$CHAP.$TARGET.0_patch.log 2>&1 || exit 1
 
 mkdir build
 cd    build

--- a/LFS/8iana-etc.sh
+++ b/LFS/8iana-etc.sh
@@ -2,7 +2,7 @@
 
 CHAP=8
 APPNAME=iana-etc
-VER=20240318
+VER=20240502
 TARGET=$APPNAME-$VER
 TARGETBALL=$TARGET.tar.gz
 TARGETDIR=$TARGET

--- a/LFS/8inetutils.sh
+++ b/LFS/8inetutils.sh
@@ -22,6 +22,8 @@ TimeStart
 
 cd $TARGETDIR
 
+sed -i 's/def HAVE_TERMCAP_TGETENT/ 1/' telnet/telnet.c
+
 echo \ \ Configuring...
 ./configure --prefix=/usr        \
             --bindir=/usr/bin    \

--- a/LFS/8jinja2.sh
+++ b/LFS/8jinja2.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 CHAP=8
-APPNAME=Jinja2
-VER=3.1.3
+APPNAME=jinja2
+VER=3.1.4
 TARGET=$APPNAME-$VER
 TARGETBALL=$TARGET.tar.gz
 TARGETDIR=$TARGET

--- a/LFS/8man-db.sh
+++ b/LFS/8man-db.sh
@@ -2,7 +2,7 @@
 
 CHAP=8
 APPNAME=man-db
-VER=2.12.0
+VER=2.12.1
 TARGET=$APPNAME-$VER
 TARGETBALL=$TARGET.tar.xz
 TARGETDIR=$TARGET

--- a/LFS/8ncurses.sh
+++ b/LFS/8ncurses.sh
@@ -2,10 +2,10 @@
 
 CHAP=8
 APPNAME=ncurses
-VER=6.4
+VER=6.5
 TARGET=$APPNAME-$VER
-TARGETBALL=$APPNAME-$VER-20230520.tar.xz
-TARGETDIR=$APPNAME-$VER-20230520
+TARGETBALL=$TARGET.tar.gz
+TARGETDIR=$TARGET
 
 echo $TARGET
 
@@ -30,7 +30,6 @@ echo \ \ Configuring...
             --without-normal        \
             --with-cxx-shared       \
             --enable-pc-files       \
-            --enable-widec          \
             --with-pkg-config-libdir=/usr/lib/pkgconfig \
 	1> $LOG/$CHAP.$TARGET.1_conf.log 2>&1 || exit 1
 
@@ -41,13 +40,13 @@ make \
 echo \ \ Installing...
 make DESTDIR=$PWD/dest install \
 	1> $LOG/$CHAP.$TARGET.3_install.log 2>&1 || exit 1
-porg -lp+ $TARGET -E`pwd` "\
-install -vm755 dest/usr/lib/libncursesw.so.6.4 /usr/lib" \
+porg -lp+ $TARGET -E$PWD "\
+install -vm755 dest/usr/lib/libncursesw.so.6.5 /usr/lib" \
 	1>> $LOG/$CHAP.$TARGET.3_install.log 2>&1 || exit 1
-rm -v  dest/usr/lib/libncursesw.so.6.4
+rm -v  dest/usr/lib/libncursesw.so.6.5
 sed -e 's/^#if.*XOPEN.*$/#if 1/' \
     -i dest/usr/include/curses.h
-porg -lp+ $TARGET -E`pwd` "\
+porg -lp+ $TARGET -E$PWD "\
 cp -av dest/* /" \
 	1>> $LOG/$CHAP.$TARGET.3_install.log 2>&1 || exit 1
 

--- a/LFS/8ninja.sh
+++ b/LFS/8ninja.sh
@@ -2,7 +2,7 @@
 
 CHAP=8
 APPNAME=ninja
-VER=1.11.1
+VER=1.12.0
 TARGET=$APPNAME-$VER
 TARGETBALL=$TARGET.tar.gz
 TARGETDIR=$TARGET

--- a/LFS/8openssl.sh
+++ b/LFS/8openssl.sh
@@ -2,7 +2,7 @@
 
 CHAP=8
 APPNAME=openssl
-VER=3.2.1
+VER=3.3.0
 TARGET=$APPNAME-$VER
 TARGETBALL=$APPNAME-$VER.tar.gz
 TARGETDIR=$APPNAME-$VER

--- a/LFS/8python.sh
+++ b/LFS/8python.sh
@@ -2,7 +2,7 @@
 
 CHAP=8
 APPNAME=python
-VER=3.12.2
+VER=3.12.3
 TARGET=$APPNAME-$VER
 TARGETBALL=Python-$VER.tar.xz
 TARGETDIR=Python-$VER

--- a/LFS/8readline.sh
+++ b/LFS/8readline.sh
@@ -25,6 +25,8 @@ cd $TARGETDIR
 sed -i '/MV.*old/d' Makefile.in
 sed -i '/{OLDSUFF}/c:' support/shlib-install
 
+sed -i 's/-Wl,-rpath,[^ ]*//' support/shobj-conf
+
 echo \ \ Patching...
 patch -Np1 -i $DLD/readline-$VER-upstream_fixes-3.patch \
 	1> $LOG/$CHAP.$TARGET.0_patch.log 2>&1 || exit 1

--- a/LFS/8setuptools.sh
+++ b/LFS/8setuptools.sh
@@ -2,7 +2,7 @@
 
 CHAP=8
 APPNAME=setuptools
-VER=69.2.0
+VER=69.5.1
 TARGET=$APPNAME-$VER
 TARGETBALL=$TARGET.tar.gz
 TARGETDIR=$TARGET

--- a/LFS/8stripping.sh
+++ b/LFS/8stripping.sh
@@ -27,7 +27,7 @@ online_usrbin="bash find strip"
 online_usrlib="libbfd-2.42.so
                libsframe.so.1.0.0
                libhistory.so.8.2
-               libncursesw.so.6.4-20230520
+               libncursesw.so.6.5
                libm.so.6
                libreadline.so.8.2
                libz.so.1.3.1

--- a/LFS/8systemd.sh
+++ b/LFS/8systemd.sh
@@ -26,6 +26,16 @@ cd $TARGETDIR
 sed -i -e 's/GROUP="render"/GROUP="video"/' \
        -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in
 
+sed -i '/DEVMEM_MAGIC 0/{n;n;a \
+/* cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b (6.8) */ \
+#ifndef PID_FS_MAGIC \
+#define PID_FS_MAGIC 0x50494446 \
+#endif
+}' src/basic/missing_magic.h
+
+sed -i '/OVERLAYFS_SUPER_MAGIC/a \
+pidfs,           {PID_FS_MAGIC}' src/basic/filesystems-gperf.gperf
+
 mkdir -p build
 cd       build
 

--- a/LFS/8tcl.sh
+++ b/LFS/8tcl.sh
@@ -30,6 +30,7 @@ SRCDIR=$(pwd)
 cd unix
 ./configure --prefix=/usr           \
             --mandir=/usr/share/man \
+            --disable-rpath         \
 	1> $LOG/$CHAP.$TARGET.1_conf.log 2>&1 || exit 1
 
 echo \ \ Making...

--- a/LFS/8util-linux.sh
+++ b/LFS/8util-linux.sh
@@ -2,7 +2,7 @@
 
 CHAP=8
 APPNAME=util-linux
-VER=2.40
+VER=2.40.1
 TARGET=$APPNAME-$VER
 TARGETBALL=$TARGET.tar.xz
 TARGETDIR=$TARGET
@@ -23,7 +23,8 @@ TimeStart
 cd $TARGETDIR
 
 echo \ \ Configuring...
-./configure --libdir=/usr/lib     \
+./configure --bindir=/usr/bin     \
+            --libdir=/usr/lib     \
             --runstatedir=/run    \
             --disable-chfn-chsh   \
             --disable-login       \
@@ -32,8 +33,8 @@ echo \ \ Configuring...
             --disable-setpriv     \
             --disable-runuser     \
             --disable-pylibmount  \
-            --disable-static      \
             --disable-liblastlog2 \
+            --disable-static      \
             --without-python      \
             ADJTIME_PATH=/var/lib/hwclock/adjtime \
             --docdir=/usr/share/doc/util-linux-$VER \

--- a/LFS/8vim.sh
+++ b/LFS/8vim.sh
@@ -2,7 +2,7 @@
 
 CHAP=8
 APPNAME=vim
-VER=9.1.0161
+VER=9.1.0405
 TARGET=$APPNAME-$VER
 TARGETBALL=$TARGET.tar.gz
 TARGETDIR=$TARGET