[jhalfs] branch trunk updated: Multilib: update multilib test

This is a multi-part message in MIME format...

------------=_1776777907-13838-25279
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

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

git pushed a commit to branch trunk
in repository jhalfs.

The following commit(s) were added to refs/heads/trunk by this push:
     new 0f63217  Multilib: update multilib test
0f63217 is described below

commit 0f63217a7b96b495468cffcc761b3e39c50ee0d0
Author: Pierre Labastie <[email protected]>
AuthorDate: Tue Apr 21 15:21:27 2026 +0200

    Multilib: update multilib test
    
    We used to test that the user wanted a multilib book by grep'ing
    arch= in the book. But recently, all arch attributes have been
    removed. We now test by grep'ing libdir=/usr/lib32 (just grep'ing
    lib32 or /usr/lib32 is not enough because of the sanity check
    results in gcc-chapter 8).
---
 common/libs/func_book_parser | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/libs/func_book_parser b/common/libs/func_book_parser
index 9514bc0..f7ec163 100644
--- a/common/libs/func_book_parser
+++ b/common/libs/func_book_parser
@@ -82,7 +82,7 @@ extract_commands() {         #
            $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
+  if [ "$MULTILIB" != default ] && ! grep -q libdir=/usr/lib32 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

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

------------=_1776777907-13838-25279
Content-Type: text/plain; charset="UTF-8"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0

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