提交: acedff05fb8d766413626010a00306e30a573134 - LFScripts (git)

Commit MetaInfo

• 修訂: acedff05fb8d766413626010a00306e30a573134 (tree)
• 時間: 2023-05-13 18:39:45
• 作者: matsuand <30614168+matsuand@user...>
• Commiter: matsuand

Log Message

[LFS] Modify.

Change Summary

• modified: LFS/5glibc.sh
• modified: LFS/8binutils.sh
• modified: LFS/8expect.sh
• modified: LFS/8gcc.sh
• modified: LFS/8glibc.sh
• modified: LFS/8gmp.sh
• modified: LFS/8mpc.sh
• modified: LFS/8mpfr.sh
• modified: LFS/8systemd.sh
• modified: LFS/8tcl.sh

差異

--- a/LFS/5glibc.sh
+++ b/LFS/5glibc.sh
@@ -65,8 +65,6 @@ echo 'int main(){}' | $LFS_TGT-gcc -xc -
 readelf -l a.out | grep ld-linux
 rm -v a.out
 
-$LFS/tools/libexec/gcc/$LFS_TGT/$GCCVER/install-tools/mkheaders
-
 TimeEnd chap5
 
 echo \ \ Removing directory...

--- a/LFS/8binutils.sh
+++ b/LFS/8binutils.sh
@@ -45,6 +45,12 @@ echo \ \ Making...
 make tooldir=/usr \
 	1> $LOG/$CHAP.$TARGET.2_make.log 2>&1 || exit 1
 
+echo \ \ Testing...
+make -k check \
+        1> $LOG/$CHAP.$TARGET.3_check.log 2>&1
+grep '^FAIL:' $(find -name '*.log') \
+        1>> $LOG/$CHAP.$TARGET.3_check.log 2>&1
+
 echo \ \ Installing...
 porg -lp $TARGET "make tooldir=/usr install -j1" \
 	1> $LOG/$CHAP.$TARGET.3_install.log 2>&1 || exit 1

--- a/LFS/8expect.sh
+++ b/LFS/8expect.sh
@@ -39,7 +39,7 @@ porg -lp $TARGET "make install" \
 	1> $LOG/$CHAP.$TARGET.3_install.log 2>&1 || exit 1
 
 porg -lp+ $TARGET "\
-ln -svf expect5.45.4/libexpect5.45.4.so /usr/lib" \
+ln -svf $APPNAME$VER/libexpect$VER.so /usr/lib" \
 	1>> $LOG/$CHAP.$TARGET.3_install.log 2>&1 || exit 1
 
 TimeEnd chap8

--- a/LFS/8gcc.sh
+++ b/LFS/8gcc.sh
@@ -47,8 +47,15 @@ echo \ \ Making...
 make \
 	1> $LOG/$CHAP.$TARGET.2_make.log 2>&1 || exit 1
 
+#ulimit -s 32768
+#chown -Rv tester .
+#su tester -c "PATH=$PATH make -k check" \
+#	1> $LOG/$CHAP.$TARGET.3_check.log 2>&1
+#../contrib/test_summary \
+#	1>> $LOG/$CHAP.$TARGET.3_check.log 2>&1
+
 echo \ \ Installing...
-porg -lp $TARGET -E`pwd` "make install" \
+porg -lp $TARGET -E$PWD "make install" \
 	1> $LOG/$CHAP.$TARGET.3_install.log 2>&1 || exit 1
 #porg -lp+ $TARGET "\
 #rm -rf /usr/lib/gcc/$(gcc -dumpmachine)/$VER/include-fixed/bits/" \

--- a/LFS/8glibc.sh
+++ b/LFS/8glibc.sh
@@ -148,6 +148,9 @@ cat > /etc/ld.so.conf << "EOF"
 /usr/local/lib
 /opt/lib
 
+# Add an include directory
+include /etc/ld.so.conf.d/*.conf
+
 EOF
 porg -lp+ $TARGET "touch /etc/ld.so.conf"
 

--- a/LFS/8gmp.sh
+++ b/LFS/8gmp.sh
@@ -36,6 +36,10 @@ make \
 #make html \
 #	1>> $LOG/$CHAP.$TARGET.2_make.log 2>&1 || exit 1
 
+echo \ \ Testing...
+make check \
+        1> $LOG/$CHAP.$TARGET.3_check.log 2>&1
+
 echo \ \ Installing...
 porg -lp $TARGET -E`pwd` "make install" \
 	1> $LOG/$CHAP.$TARGET.3_install.log 2>&1 || exit 1

--- a/LFS/8mpc.sh
+++ b/LFS/8mpc.sh
@@ -34,6 +34,10 @@ make \
 #make html \
 #	1>> $LOG/$CHAP.$TARGET.2_make.log 2>&1 || exit 1
 
+echo \ \ Testing...
+make check \
+        1> $LOG/$CHAP.$TARGET.3_check.log 2>&1
+
 echo \ \ Installing...
 porg -lp $TARGET "make install" \
 	1> $LOG/$CHAP.$TARGET.3_install.log 2>&1 || exit 1

--- a/LFS/8mpfr.sh
+++ b/LFS/8mpfr.sh
@@ -39,6 +39,10 @@ make \
 #make html \
 #	1>> $LOG/$CHAP.$TARGET.2_make.log 2>&1 || exit 1
 
+echo \ \ Testing...
+make check \
+	1> $LOG/$CHAP.$TARGET.3_check.log 2>&1
+
 echo \ \ Installing...
 porg -lp $TARGET "make install" \
 	1> $LOG/$CHAP.$TARGET.3_install.log 2>&1 || exit 1

--- a/LFS/8systemd.sh
+++ b/LFS/8systemd.sh
@@ -47,6 +47,7 @@ meson --prefix=/usr                 \
       -Dman=false                   \
       -Dmode=release                \
       -Dpamconfdir=no               \
+      -Ddev-kvm-mode=0660           \
       -Ddocdir=/usr/share/doc/systemd-$VER \
       ..                            \
 	1> $LOG/$CHAP.$TARGET.1_conf.log 2>&1 || exit 1

--- a/LFS/8tcl.sh
+++ b/LFS/8tcl.sh
@@ -22,7 +22,7 @@ TimeStart
 
 cd $TARGETDIR
 
-tar -xf $DLD/tcl8.6.13-html.tar.gz --strip-components=1 || \
+tar -xf $DLD/$APPNAME$VER-html.tar.gz --strip-components=1 || \
 	(echo Document tarball error && exit 1)
 
 echo \ \ Configuring...