Changeset 93fd2d0 for LFS/master.sh

Timestamp:

02/07/2012 10:30:26 PM (12 years ago)

Author:

Matthew Burgess <matthew@…>

Branches:

2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

e47edcf

Parents:

b515be7

Message:

Fix ICA build and a couple of other miscellaneous issues. Patch courtesy of Pierre Labastie.

File:

• LFS/master.sh (modified) (2 diffs)

LFS/master.sh

@@ -173 +173 @@
     for script in chapter06$N/* ; do
       # Overwrite existing symlinks, files, and dirs
-      sed -e 's/ln -sv/&f/g' \
-          -e 's/mv -v/&f/g' \
-          -e 's/mkdir -v/&p/g' -i ${script}
+      sed -e 's/ln *-sv/&f/g' \
+          -e 's/mv *-v/&f/g' \
+          -e 's/mkdir *-v/&p/g' -i ${script}
+      # Suppress the mod of "test-installation.pl" because now
+      # the library path points to /usr/lib
+      if [[ ${script} =~ glibc ]]; then
+          sed '/DL=/,/unset DL/d' -i ${script}
+      fi
       # Rename the scripts
       mv ${script} ${script}$N
@@ -338 +343 @@
             fi
             CHROOT_Unpack "$pkg_tarball"
+            # If using optimizations, use MAKEFLAGS (unless blacklisted)
+            # no setting of CFLAGS and friends.
+            [[ "$OPTIMIZE" != "0" ]] &&  wrt_makeflags "$name"
        ;;
     esac