Changeset 7b7b5e9

Timestamp:

04/02/2020 09:56:51 AM (4 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

dd7e0f67

Parents:

0a577f5

Message:

Various fixes for ICA

Files:

• LFS/master.sh (modified) (2 diffs)
• common/libs/func_compare.sh (modified) (1 diff)
• extras/do_ica_prep (modified) (1 diff)

LFS/master.sh

@@ -226 +226 @@
 # but we do it to have a similar structure to chapter 5 (we may merge all
 # those functions at some point).
-  Makefile_target=runasroot
+  case "$N" in
+     -build*) Makefile_target=chapter6   ;;
+           *) Makefile_target=runasroot  ;;
+  esac
 
 # Start loop
@@ -318 +321 @@
     PREV=${this_script}
     # Set system_build envar for iteration targets
-    system_build=$chapter6
+    if [ -z "$N" ]; then
+      system_build="$system_build $this_script"
+    fi
   done # end for file in chapter06/*
+  if [ -n "$N" ]; then
+    system_build="$chapter6"
+  fi
 }
 

common/libs/func_compare.sh

@@ -97 +97 @@
             mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\
           done ; \\
-        fi ;
+        fi
         @cd /\$(SCRIPT_ROOT)
         @if [ -d test-logs ] ; then \\

extras/do_ica_prep

@@ -44 +44 @@
   # archive with a dir of the same name and extract the object
   # files from the archive into this dir. Despite their names,
-  # libieee.a & libmcheck.a are not actual ar archives.
+  # libm.a & libmcheck.a are not actual ar archives.
   echo -n "Extracting object files from \".a\" files in ${CMP_DIR}... "
-  L=$(find $CMP_DIR -name '*.a' ! -name 'libieee.a' ! -name 'libmcheck.a')
+  L=$(find $CMP_DIR -name '*.a' ! -name 'libm.a' ! -name 'libmcheck.a')
   for F in $L; do
     mv $F ${F}.XX