Use bash variable add operator

diff --git a/stage1/pkg/e2fsprogs b/stage1/pkg/e2fsprogs
index 94c9f1d..a864793 100644 (file)
--- a/stage1/pkg/e2fsprogs
+++ b/stage1/pkg/e2fsprogs
@@ -4,8 +4,7 @@ hvconfig_pre()
 {
     export PKG_CONFIG=true
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --enable-elf-shlibs \
         --disable-libblkid \
         --disable-libuuid \

diff --git a/stage1/pkg/gettext b/stage1/pkg/gettext
index afe372d..902439f 100644 (file)
--- a/stage1/pkg/gettext
+++ b/stage1/pkg/gettext
@@ -2,9 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --disable-shared"
+    CONFIGURE_OPTS+=" --disable-shared"
 }
 
 # When cross-compiling the Gettext configure script assumes we don't have a

diff --git a/stage3/pkg/Linux-PAM b/stage3/pkg/Linux-PAM
index 94138e8..237b0b3 100644 (file)
--- a/stage3/pkg/Linux-PAM
+++ b/stage3/pkg/Linux-PAM
@@ -4,8 +4,7 @@ hvconfig_pre()
 {
     # --libdir=/lib
     #   Necessary to prevent PAM from instaling into /lib64
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --libdir=/lib \
         --sbindir=/lib/security \
         --docdir=/usr/share/doc/${PACKAGE} \

diff --git a/stage3/pkg/OpenSP b/stage3/pkg/OpenSP
index 9ee4aef..8f899f2 100644 (file)
--- a/stage3/pkg/OpenSP
+++ b/stage3/pkg/OpenSP
@@ -25,8 +25,7 @@ hvconfig_pre()
     sed -i 's:LITLEN          240 :LITLEN          8092:' \
         unicode/{gensyntax.pl,unicode.syn}
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --disable-static \
         --disable-doc-build \
         --enable-default-catalog=/etc/sgml/catalog \

diff --git a/stage3/pkg/cyrus-sasl b/stage3/pkg/cyrus-sasl
index e7b84ff..0f6f5bf 100644 (file)
--- a/stage3/pkg/cyrus-sasl
+++ b/stage3/pkg/cyrus-sasl
@@ -5,15 +5,13 @@ hvconfig_pre()
     sed -i 's/#elif WITH_DES/#elif defined(WITH_DES)/' \
         ${LFS_TMP}/${PACKAGE}/plugins/digestmd5.c
 
-    CONFIGURE_OPTS=" \
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --with-dbpath=/var/lib/sasl/sasldb2 \
         --with-saslauthd=/var/run/saslauthd \
         --with-dblib=gdbm"
 
     if [ "x${HVLABEL}" = "x${PACKAGE}-pass2" ]; then
-        CONFIGURE_OPTS=" \
-            ${CONFIGURE_OPTS} \
+        CONFIGURE_OPTS+=" \
             --with-ldap \
             --enable-ldapdb"
     fi

diff --git a/stage3/pkg/fcron b/stage3/pkg/fcron
index ca3fa88..6ecb6d5 100644 (file)
--- a/stage3/pkg/fcron
+++ b/stage3/pkg/fcron
@@ -13,7 +13,7 @@ hvconfig_pre()
         chmod 755 ${DUMMY_SM_PATH}
     fi
 
-    CONFIGURE_OPTS="${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --with-editor=/usr/bin/nano \
         --with-boot-install=no \
         --with-answer-all=no"

diff --git a/stage3/pkg/flac b/stage3/pkg/flac
index 7fbde67..9b07f46 100644 (file)
--- a/stage3/pkg/flac
+++ b/stage3/pkg/flac
@@ -5,7 +5,6 @@ hvconfig_pre()
     sed -e "s!#include <stdio.h>!&\n#include <string.h>!" -i \
         ${LFS_TMP}/${PACKAGE}/examples/cpp/encode/file/main.cpp
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --disable-thorough-test"
 }

diff --git a/stage3/pkg/fontconfig b/stage3/pkg/fontconfig
index d7bd771..44efe34 100644 (file)
--- a/stage3/pkg/fontconfig
+++ b/stage3/pkg/fontconfig
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --localstatedir=/var \
         --disable-docs \
         --without-add-fonts \

diff --git a/stage3/pkg/iptables b/stage3/pkg/iptables
index 38b8ea7..94bd6f1 100644 (file)
--- a/stage3/pkg/iptables
+++ b/stage3/pkg/iptables
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --bindir=/sbin \
         --sbindir=/sbin \
         --libdir=/lib \

diff --git a/stage3/pkg/openjade b/stage3/pkg/openjade
index b2cf594..4c46bf2 100644 (file)
--- a/stage3/pkg/openjade
+++ b/stage3/pkg/openjade
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --enable-http \
         --disable-static \
         --enable-default-catalog=/etc/sgml/catalog \

diff --git a/stage3/pkg/openldap b/stage3/pkg/openldap
index b233e6c..fab7e29 100644 (file)
--- a/stage3/pkg/openldap
+++ b/stage3/pkg/openldap
@@ -5,8 +5,7 @@ hvconfig_pre()
     # --enable-spasswd: for SASL2 plugin
     # --disable-bdb --disable-hdb --with-ldbm-api=gdbm: To use GBDM
     # --disable-sql --disable-ndb: If MySQL is NOT installed
-    CONFIGURE_OPTS=" \
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --libexecdir=/usr/sbin \
         --localstatedir=/srv/ldap \
         --disable-debug \

diff --git a/stage3/pkg/openssh b/stage3/pkg/openssh
index 23f1738..d2e9cd4 100644 (file)
--- a/stage3/pkg/openssh
+++ b/stage3/pkg/openssh
@@ -9,8 +9,7 @@ hvconfig_pre()
     hv_useradd --system -c sshd-privsep -d /var/lib/sshd -g sshd \
         -s /bin/false sshd
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --sysconfdir=/etc/ssh \
         --datadir=/usr/share/sshd \
         --with-pam \

diff --git a/stage3/pkg/reiserfsprogs b/stage3/pkg/reiserfsprogs
index 36c50d2..489c975 100644 (file)
--- a/stage3/pkg/reiserfsprogs
+++ b/stage3/pkg/reiserfsprogs
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --sbindir=/sbin"
 }
 

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

diff --git a/stage3/pkg/xinetd b/stage3/pkg/xinetd
index 6267066..f871392 100644 (file)
--- a/stage3/pkg/xinetd
+++ b/stage3/pkg/xinetd
@@ -2,9 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --with-loadavg"
+    CONFIGURE_OPTS+=" --with-loadavg"
 }
 
 hvbuild_post()

diff --git a/stage4/pkg/MesaLib b/stage4/pkg/MesaLib
index ed54cb7..95e4634 100644 (file)
--- a/stage4/pkg/MesaLib
+++ b/stage4/pkg/MesaLib
@@ -8,18 +8,17 @@ hvconfig_pre()
     if [ -n "${XORG_VIDEO_DRIVER}" ]; then
         case "${XORG_VIDEO_DRIVER}" in
            nouveau)
-               DRI_OPTS="${DRI_OPTS},nouveau"
-               GAL_OPTS="${GAL_OPTS},nouveau"
+               DRI_OPTS+=",nouveau"
+               GAL_OPTS+=",nouveau"
                ;;
            intel)
-               DRI_OPTS="${DRI_OPTS},i915,i965"
-               GAL_OPTS="${GAL_OPTS},i915"
+                DRI_OPTS+=",i915,i965"
+                GAL_OPTS+=",i915"
                ;;
        esac
     fi
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --enable-texture-float \
         --enable-gles1 \
         --enable-gles2 \

diff --git a/stage4/pkg/dbus b/stage4/pkg/dbus
index 58f7e56..1da1f86 100644 (file)
--- a/stage4/pkg/dbus
+++ b/stage4/pkg/dbus
@@ -6,8 +6,7 @@ hvconfig_pre()
     hv_useradd --system -c D-BUS-Message-Daemon-User -d /dev/null \
         -g messagebus -s /bin/false messagebus
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --libexecdir=/usr/lib/dbus-1.0 \
         --localstatedir=/var"
 }

diff --git a/stage4/pkg/glib b/stage4/pkg/glib
index 4d0b925..4849c91 100644 (file)
--- a/stage4/pkg/glib
+++ b/stage4/pkg/glib
@@ -2,9 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --with-pcre=system"
+    CONFIGURE_OPTS+=" --with-pcre=system"
 }
 
 hvbuild_post()

diff --git a/stage4/pkg/lesstif b/stage4/pkg/lesstif
index 7fbe368..2c9db5b 100644 (file)
--- a/stage4/pkg/lesstif
+++ b/stage4/pkg/lesstif
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --prefix=/usr \
         --sysconfdir=/etc/X11 \
         --disable-debug \

diff --git a/stage4/pkg/libXfont b/stage4/pkg/libXfont
index ab23d47..eff77f9 100644 (file)
--- a/stage4/pkg/libXfont
+++ b/stage4/pkg/libXfont
@@ -2,7 +2,5 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --disable-devel-docs"
+    CONFIGURE_OPTS+=" --disable-devel-docs"
 }

diff --git a/stage4/pkg/libXt b/stage4/pkg/libXt
index 8a884e6..6e9e863 100644 (file)
--- a/stage4/pkg/libXt
+++ b/stage4/pkg/libXt
@@ -2,7 +2,5 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --with-appdefaultdir=/etc/X11/app-defaults"
+    CONFIGURE_OPTS+=" --with-appdefaultdir=/etc/X11/app-defaults"
 }

diff --git a/stage4/pkg/xinit b/stage4/pkg/xinit
index 78bd1e4..91b79f0 100644 (file)
--- a/stage4/pkg/xinit
+++ b/stage4/pkg/xinit
@@ -2,7 +2,5 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --with-xinitdir=/etc/X11/app-defaults"
+    CONFIGURE_OPTS+=" --with-xinitdir=/etc/X11/app-defaults"
 }

diff --git a/stage4/pkg/xterm b/stage4/pkg/xterm
index 5e7aed8..aaa8051 100644 (file)
--- a/stage4/pkg/xterm
+++ b/stage4/pkg/xterm
@@ -6,8 +6,7 @@ hvconfig_pre()
     echo -e '\tkbs=\\177,' >> ${LFS_TMP}/${PACKAGE}/terminfo
 
     export TERMINFO=/usr/share/terminfo
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --enable-luit \
         --enable-wide-chars \
         --with-app-defaults=/usr/share/X11/app-defaults \

diff --git a/stage5/pkg/GConf b/stage5/pkg/GConf
index 8e4e022..0e16848 100644 (file)
--- a/stage5/pkg/GConf
+++ b/stage5/pkg/GConf
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS=" \
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --disable-orbit \
         --disable-static"
 }

diff --git a/stage5/pkg/clamav b/stage5/pkg/clamav
index be12b2d..311c6e8 100644 (file)
--- a/stage5/pkg/clamav
+++ b/stage5/pkg/clamav
@@ -8,8 +8,7 @@ hvconfig_pre()
     # Is this really necessary?
     export SENDMAIL="/usr/sbin/sendmail"
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --with-dbdir=/srv/clamav \
         --enable-milter"
 }

diff --git a/stage5/pkg/emacs b/stage5/pkg/emacs
index fd4e956..265ba66 100644 (file)
--- a/stage5/pkg/emacs
+++ b/stage5/pkg/emacs
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS=" \
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --libexecdir=/usr/sbin \
         --with-x-toolkit=gtk"
 }

diff --git a/stage5/pkg/ghostscript b/stage5/pkg/ghostscript
index 6b4adaf..a501228 100644 (file)
--- a/stage5/pkg/ghostscript
+++ b/stage5/pkg/ghostscript
@@ -16,8 +16,7 @@ hvconfig_pre()
     # To use the system-installed copy of libtiff:
     rm -rf tiff
 
-    CONFIGURE_OPTS=" \
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --enable-dynamic \
         --with-system-libtiff \
         --with-fontpath=${GS_FONTS_PATH}"

diff --git a/stage5/pkg/gnash b/stage5/pkg/gnash
index b71ca0d..c3d8294 100644 (file)
--- a/stage5/pkg/gnash
+++ b/stage5/pkg/gnash
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS=" \
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --enable-gui=gtk \
         --enable-media=gst \
         --enable-renderer=cairo,agg \

diff --git a/stage5/pkg/milter-greylist b/stage5/pkg/milter-greylist
index 3e679ce..89561cb 100644 (file)
--- a/stage5/pkg/milter-greylist
+++ b/stage5/pkg/milter-greylist
@@ -2,9 +2,7 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS=" \
-        ${CONFIGURE_OPTS} \
-        --localstatedir=/var/run"
+    CONFIGURE_OPTS+=" --localstatedir=/var/run"
 }
 
 hvbuild_post()

diff --git a/stage5/pkg/php b/stage5/pkg/php
index 0c0fed3..9944ca0 100644 (file)
--- a/stage5/pkg/php
+++ b/stage5/pkg/php
@@ -11,8 +11,7 @@ hvconfig_pre()
     # --mandir:
     #   If not specified, php installs some man pages under /usr/php
     #   (phpize.1, php.1 and php-config.1)
-    CONFIGURE_OPTS=" \
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --with-apxs2 \
         --with-config-file-path=/etc \
         --mandir=/usr/share/man \

diff --git a/stage5/pkg/sane-backends b/stage5/pkg/sane-backends
index 689970b..639fc43 100644 (file)
--- a/stage5/pkg/sane-backends
+++ b/stage5/pkg/sane-backends
@@ -19,9 +19,7 @@ hvconfig_pre()
     # Fixes an obsolete udev parameter:
     sed -i 's/SYSFS/ATTRS/g' ${LFS_TMP}/${PACKAGE}/tools/sane-desc.c
 
-    CONFIGURE_OPTS=" \
-        ${CONFIGURE_OPTS} \
-        --with-x=${USE_X_OPTION}"
+    CONFIGURE_OPTS+=" --with-x=${USE_X_OPTION}"
 }
 
 hvbuild_post()

diff --git a/stage5/pkg/texlive b/stage5/pkg/texlive
index 6da9240..17b83e8 100644 (file)
--- a/stage5/pkg/texlive
+++ b/stage5/pkg/texlive
@@ -17,8 +17,7 @@ hvconfig_pre()
         -e 's|\$TEXMFVAR/fonts|/var/lib/livetex/fonts|'    \
         ${LFS_TMP}/${PACKAGE}/texk/kpathsea/texmf.cnf
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --disable-native-texlive-build \
         --enable-build-in-source-tree  \
         --without-luatex               \

diff --git a/stage5/pkg/tftp-hpa b/stage5/pkg/tftp-hpa
index 5e31df3..351c429 100644 (file)
--- a/stage5/pkg/tftp-hpa
+++ b/stage5/pkg/tftp-hpa
@@ -3,8 +3,7 @@
 hvconfig_pre()
 {
     # Need to specify mandir manually because of a stupid programming error.
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --mandir=/usr/man \
         --without-tcpwrappers"
 }