Use bash variable add operator

diff --git a/stage0/pkg/binutils b/stage0/pkg/binutils
index 443714d52ec1b4ed7388a24b51b83d128e85e4ab..5c8036437946e410b66a02fc7fbff422ac158a8e 100644 (file)
--- a/stage0/pkg/binutils
+++ b/stage0/pkg/binutils
@@ -5,8 +5,7 @@ hvconfig_pre()
     export AR=ar
     export AS=as
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --host=${CLFS_HOST} \
         --target=${CLFS_TARGET} \
         --with-sysroot=${CLFS} \
@@ -16,10 +15,9 @@ hvconfig_pre()
         --disable-multilib"
 
     case "${HVL_TARGET}" in
-        "x86_64")
-            # This adds 64 bit support to Binutils.
-           CONFIGURE_OPTS="${CONFIGURE_OPTS} --enable-64-bit-bfd"
-           ;;
+        x86_64*)
+            CONFIGURE_OPTS+=" --enable-64-bit-bfd"
+            ;;
     esac
 }
 

diff --git a/stage0/pkg/gcc b/stage0/pkg/gcc
index d0d37e4fdf2355684d53ba4f67f673d827d1dafe..1877e7c2641559e4bd8fb59e30931ae39ae97901 100644 (file)
--- a/stage0/pkg/gcc
+++ b/stage0/pkg/gcc
@@ -6,8 +6,7 @@ hvconfig_pre()
     export LDFLAGS="-Wl,-rpath,/cross-tools/lib"
 
     # Common options for passes 1 & 2
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --build=${CLFS_HOST} \
         --host=${CLFS_HOST} \
         --target=${CLFS_TARGET} \
@@ -22,7 +21,7 @@ hvconfig_pre()
         --disable-multilib"
 
     if [ "x${HVLABEL}" = "x${GCC}-pass1" ]; then
-        CONFIGURE_OPTS="${CONFIGURE_OPTS} \
+        CONFIGURE_OPTS+=" \
             --disable-shared \
             --without-headers \
             --with-newlib \
@@ -33,7 +32,7 @@ hvconfig_pre()
             --disable-threads \
             --enable-languages=c"
     else
-        CONFIGURE_OPTS="${CONFIGURE_OPTS} \
+        CONFIGURE_OPTS+=" \
             --enable-shared \
             --enable-languages=c,c++ \
             --enable-__cxa_atexit \

diff --git a/stage0/pkg/ncurses b/stage0/pkg/ncurses
index 7d4a68073e54d94779b118dad3d54df9eddc1396..b2126bcfe24f8f20ea316ebe44c3edb598f4abc9 100644 (file)
--- a/stage0/pkg/ncurses
+++ b/stage0/pkg/ncurses
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --without-debug \
         --without-shared"
 }

diff --git a/stage1/pkg/binutils b/stage1/pkg/binutils
index 9ea2aad547fb6dc4cf514ebd99671e6177813a0a..83113c3f659e63a8f76e1a73cc1f85db1116a5f3 100644 (file)
--- a/stage1/pkg/binutils
+++ b/stage1/pkg/binutils
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --target=${CLFS_TARGET} \
         --with-lib-path=/tools/lib \
         --disable-nls \
@@ -13,7 +12,7 @@ hvconfig_pre()
     case "${HVL_TARGET}" in
         "x86_64")
             # This adds 64 bit support to Binutils.
-           CONFIGURE_OPTS="${CONFIGURE_OPTS} --enable-64-bit-bfd"
+           CONFIGURE_OPTS+=" --enable-64-bit-bfd"
            ;;
     esac
 }

diff --git a/stage1/pkg/gcc b/stage1/pkg/gcc
index ebca3feb14b6c27341486e81c7e8540d16a49a4b..57af140556b88f5b13f32e13bd33d06e527db917 100644 (file)
--- a/stage1/pkg/gcc
+++ b/stage1/pkg/gcc
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --target=${CLFS_TARGET} \
         --disable-multilib \
         --with-local-prefix=/tools \

diff --git a/stage2/pkg/binutils b/stage2/pkg/binutils
index c9522c16207d8b57bbab482146c8ccfa1745ae12..e8d8c092b2455d04c121504acea4b8f77e494327 100644 (file)
--- a/stage2/pkg/binutils
+++ b/stage2/pkg/binutils
@@ -5,8 +5,7 @@ hvconfig_pre()
     export CC="gcc -isystem /usr/include"
     export LDFLAGS="-Wl,-rpath-link,/lib"
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --libdir=/usr/lib \
         --enable-shared \
         --disable-multilib"
@@ -21,7 +20,7 @@ hvconfig_pre()
                 ${LFS_TMP}/${PACKAGE}/libiberty/Makefile.in
 
             # This adds 64 bit support to Binutils.
-           CONFIGURE_OPTS="${CONFIGURE_OPTS} --enable-64-bit-bfd"
+           CONFIGURE_OPTS+=" --enable-64-bit-bfd"
            ;;
     esac
 }

diff --git a/stage2/pkg/coreutils b/stage2/pkg/coreutils
index 53b8f5c450c3dc83523fa4708f4d8945c92cbe1a..89927160dc28b76a585a2e3b1fb2a776631640f1 100644 (file)
--- a/stage2/pkg/coreutils
+++ b/stage2/pkg/coreutils
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --libexecdir=/usr/lib \
         --enable-no-install-program=kill,uptime"
 }

diff --git a/stage2/pkg/dhcp b/stage2/pkg/dhcp
index beb7ee6345f59d1363cfff3c19795b3a66223920..c4be30c40a79a8a1598711ee940b6f70f49c30ac 100644 (file)
--- a/stage2/pkg/dhcp
+++ b/stage2/pkg/dhcp
@@ -5,8 +5,7 @@ hvconfig_pre()
     cd ${LFS_TMP}/${PACKAGE}
     sed -i 's%\(^sbindir =\).*%\1 @prefix@@sbindir@%' server/Makefile.in
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --localstatedir=/var \
         --sbindir=/sbin \
         --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \

diff --git a/stage2/pkg/e2fsprogs b/stage2/pkg/e2fsprogs
index 1098c95e3afbb3149c990f47e2e912da3f1b2124..ed00a35e738dda8ca98f9d7173a8924a4abc74ff 100644 (file)
--- a/stage2/pkg/e2fsprogs
+++ b/stage2/pkg/e2fsprogs
@@ -4,8 +4,7 @@ hvconfig_pre()
 {
     export PKG_CONFIG=true
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --with-root-prefix=\"\" \
         --enable-elf-shlibs \
         --disable-libblkid \

diff --git a/stage2/pkg/eglibc b/stage2/pkg/eglibc
index d85577e3ca87f4a249a7c8fbbb4775549f14fcc4..0d07767bb9d8c4c0701c46be4ecf89486fb639c3 100644 (file)
--- a/stage2/pkg/eglibc
+++ b/stage2/pkg/eglibc
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --disable-profile \
         --enable-add-ons \
         --enable-kernel=$(get_pkg_ver ${KERNEL}) \
@@ -33,7 +32,7 @@ hvconfig_pre()
         "x86_64")
             # Tell EGLIBC to install its libraries into /lib:
             echo "slibdir=/lib" >> configparms
-            CONFIGURE_OPTS="${CONFIGURE_OPTS} --libdir=/usr/lib"
+            CONFIGURE_OPTS+=" --libdir=/usr/lib"
            ;;
     esac
 }

diff --git a/stage2/pkg/findutils b/stage2/pkg/findutils
index fcb4b36b283149f3341db1b7bf51ff180b64ad49..715d4d4c31724e8ca683171ed551592fb2ee66ac 100644 (file)
--- a/stage2/pkg/findutils
+++ b/stage2/pkg/findutils
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --libexecdir=/usr/lib/findutils \
         --localstatedir=/var/lib/locate"
 }

diff --git a/stage2/pkg/gcc b/stage2/pkg/gcc
index c1c28c32b22541246f9c82bc3192dfbd456ba245..edcfe463d0564214167c33a42cbb5ea7202ca30a 100644 (file)
--- a/stage2/pkg/gcc
+++ b/stage2/pkg/gcc
@@ -5,8 +5,7 @@ hvconfig_pre()
     export CC="gcc -Wl,-rpath-link,/lib -isystem /usr/include"
     export CXX="g++ -Wl,-rpath-link,/lib -isystem /usr/include"
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --libexecdir=/usr/lib \
         --enable-shared \
         --enable-threads=posix \

diff --git a/stage2/pkg/groff b/stage2/pkg/groff
index 2f052fbcd67da45db70526b5fdd299a2db5c677c..4ab82dd4b8d94f36e8bf0eb24b1332ef6afaf646 100644 (file)
--- a/stage2/pkg/groff
+++ b/stage2/pkg/groff
@@ -6,9 +6,7 @@ hvconfig_pre()
 {
     export PAGE=letter
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --enable-multibyte"
+    CONFIGURE_OPTS+=" --enable-multibyte"
 }
 
 hvconfig_post()

diff --git a/stage2/pkg/gzip b/stage2/pkg/gzip
index 341a13f66a847b22b736f3461f3f00228088d0c2..3043737a35413bfc9e6a1ce7e1005bff8cfbb98c 100644 (file)
--- a/stage2/pkg/gzip
+++ b/stage2/pkg/gzip
@@ -2,9 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --bindir=/bin"
+    CONFIGURE_OPTS+=" --bindir=/bin"
 }
 
 hvbuild_post()

diff --git a/stage2/pkg/inetutils b/stage2/pkg/inetutils
index 82d277f450b54eeaf1b19c66275e81bb49f71a17..0fc02e923a531c8e16d5350f873e96e7855c366e 100644 (file)
--- a/stage2/pkg/inetutils
+++ b/stage2/pkg/inetutils
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --libexecdir=/usr/sbin \
         --localstatedir=/var \
         --disable-ifconfig \

diff --git a/stage2/pkg/kbd b/stage2/pkg/kbd
index 9e4dc2297e5e7547e5d4c78d97b73afdc29c0b1a..2df1e1e364c0cc09abeefb832d3af98608424126 100644 (file)
--- a/stage2/pkg/kbd
+++ b/stage2/pkg/kbd
@@ -2,9 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --datadir=/lib/kbd"
+    CONFIGURE_OPTS+=" --datadir=/lib/kbd"
 }
 
 hvbuild_post()

diff --git a/stage2/pkg/ncurses b/stage2/pkg/ncurses
index fe8355d5d2440e9f645dcd5f5706730b17538368..5efb791922c81b013489ffee7a580d13ed1b9b20 100644 (file)
--- a/stage2/pkg/ncurses
+++ b/stage2/pkg/ncurses
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --libdir=/lib \
         --with-shared \
         --without-debug \

diff --git a/stage2/pkg/readline b/stage2/pkg/readline
index f3bd31723ec9590275e0928e59181e95a356d4e0..452be2f8c6417e59364d8ba75c379f8ed9d5a2c5 100644 (file)
--- a/stage2/pkg/readline
+++ b/stage2/pkg/readline
@@ -2,10 +2,8 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --libdir=/lib"
-    
+    CONFIGURE_OPTS+=" --libdir=/lib"
+
     cd ${LFS_TMP}/${PACKAGE}
 
     # Reinstalling Readline will cause the old libraries to be moved to

diff --git a/stage2/pkg/shadow b/stage2/pkg/shadow
index d8181d8aa2ee9be364e0f1ff7f31ceb4b8420937..a8314a901cd9ddb839487b2f70b44bba1814d272 100644 (file)
--- a/stage2/pkg/shadow
+++ b/stage2/pkg/shadow
@@ -2,9 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --without-selinux"
+    CONFIGURE_OPTS+=" --without-selinux"
 
     cd ${LFS_TMP}/${PACKAGE}
 

diff --git a/stage2/pkg/zlib b/stage2/pkg/zlib
index 1b4a57b25ff9e3886a5b34485b028fe3787bfde1..8c40047e0c7efed213ac2d79d6a5da56c9c9d2e5 100644 (file)
--- a/stage2/pkg/zlib
+++ b/stage2/pkg/zlib
@@ -6,9 +6,7 @@ hvconfig_pre()
     export CXX="g++ -isystem /usr/include"
     export LDFLAGS="-Wl,-rpath-link,/lib"
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --shared"
+    CONFIGURE_OPTS+=" --shared"
 }
 
 hvconfig_post()