Changeset 55e82d2 for common/libs/func_book_parser

Timestamp:

06/12/2022 08:54:14 PM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

ff30640

Parents:

84d0d39

Message:

Various updates for pacman PM

• update versions and instructions in packageManager.xml.pacman. Also remove the pages for old books.
• Fix packInstall.sh.pacman, so that restarting after a failure is possible
• Change LFS/lfs.xsl so that destdir install use symlinks for /lib, /sbin, and /bin. Remove also absolete commands for old books
• fix gcc script in book parser

File:

• common/libs/func_book_parser (modified) (1 diff)

common/libs/func_book_parser

@@ -110 +110 @@
   # in the stylesheet...
   sed -i 's/-iv /-v /' "./${COMMANDS}/"chapter??/*kernel*
-
+  # If doing a destdir install (PM without wrap), the gcc instructions
+  # fail for two reasons: a missing dir, and gcc -dumpmachine returns a
+  # wrong string.
+  if [ "$PKGMNGT" = y ] && [ "$WRAP_INSTALL" = n ]; then
+    sed -e 's|(gcc|&/xgcc|' \
+        -e '/lto_plug/imkdir -pv $PKG_DEST/usr/lib/bfd-plugins' \
+        -i ./${COMMANDS}/chapter08/*gcc
+  fi
   echo "done"