[jhalfs] 03/03: Make sure the book is multilib, if MULTILIB set

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch trunk
in repository jhalfs.

commit fada1bda13791935da00475f51704b465f255090
Author: Pierre Labastie <[email protected]>
AuthorDate: Fri Mar 7 10:24:48 2025 +0100

    Make sure the book is multilib, if MULTILIB set
    
    Normally, if MULTILIB is set and the book does not contain arch=
    attributes, then the book can be parsed, but of course, there are
    no 32 bit instructions. Warn the user in this case, and allow
    stopping the program before parsing.
---
 common/libs/func_book_parser | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/common/libs/func_book_parser b/common/libs/func_book_parser
index 26eb88f..f2bd3c7 100644
--- a/common/libs/func_book_parser
+++ b/common/libs/func_book_parser
@@ -81,6 +81,14 @@ extract_commands() {         #
            $BOOK/stylesheets/lfs-xsl/profile.xsl        \
            $BOOK/index.xml >> $LOGDIR/$LOG 2>&1
 
+  # Make sure the book contains arch attributes if multilib is asked
+  if [ "$MULTILIB" != default ] && ! grep -q 'arch[="* ]*ml' prbook.xml; then
+    echo You have asked for multilib, but the book is not multilib
+    echo -n "Do you want to continue? yes/no (no) "
+    read -r ANSWER
+    if [ "$ANSWER" != yes ]; then exit; fi
+  fi
+
   # Use the profiled book for generating the scriptlets
   xsltproc --nonet                                      \
            --stringparam luser-lgroup   "$LUSER:$LGROUP"\

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

-- 
http://lists.linuxfromscratch.org/sympa/info/alfs-discuss
Unsubscribe: See the above information page