configure_args is now an array

Note that the of use += requires bash 3.1 or later.
tgc · Aug 12, 2013 · b63b516 · b63b516
1 parent 077fca9
commit b63b516
Show file tree

Hide file tree

Showing 127 changed files with 192 additions and 193 deletions.
diff --git a/apr-util/build.sh b/apr-util/build.sh
@@ -19,7 +19,7 @@ patch[0]=apr-util-1.3.7-no-nested-mutexes.patch
 apuver=1
 export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
-configure_args="$configure_args --disable-static --with-apr=${prefix} --includedir=${prefix}/${_includedir}/apr-${apuver} --with-expat=${prefix} --with-berkeley-db=${prefix} --with-iconv=${prefix} --with-ldap --with-ldap-include=${prefix}/${_includedir} --with-ldap-lib=${prefix}/${_libdir}"
+configure_args+=(--disable-static --with-apr=${prefix} --includedir=${prefix}/${_includedir}/apr-${apuver} --with-expat=${prefix} --with-berkeley-db=${prefix} --with-iconv=${prefix} --with-ldap --with-ldap-include=${prefix}/${_includedir} --with-ldap-lib=${prefix}/${_libdir})
 
 reg prep
 prep()

diff --git a/apr/build.sh b/apr/build.sh
@@ -19,8 +19,8 @@ patch[0]=apr-1.3.5-fix-testsuite.patch
 aprver=1
 export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
-configure_args="$configure_args --disable-static --includedir=${prefix}/${_includedir}/apr-${aprver} --with-installbuilddir=${prefix}/${_libdir}/apr-${aprver}/build --with-egd=/var/run/egd-pool"
-irix53 && configure_args="$configure_args --disable-threads"
+configure_args+=(--disable-static --includedir=${prefix}/${_includedir}/apr-${aprver} --with-installbuilddir=${prefix}/${_libdir}/apr-${aprver}/build --with-egd=/var/run/egd-pool)
+irix53 && configure_args+=(--disable-threads)
 
 reg prep
 prep()

diff --git a/arts/build.sh b/arts/build.sh
@@ -27,7 +27,7 @@ patch[6]=arts-1.5.0-assert.patch
 # Global settings
 export CPPFLAGS="-I/usr/tgcware/include -I/usr/tgcware/qt-3.3/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib -L/usr/tgcware/qt-3.3/lib -Wl,-rpath,/usr/tgcware/qt-3.3/lib"
-configure_args='--prefix=$prefix --enable-libsuffix= --disable-rpath --disable-pie --with-extra-includes=/usr/tgcware/include --with-extra-libs=/usr/tgcware/lib'
+configure_args=(--prefix=$prefix --enable-libsuffix= --disable-rpath --disable-pie --with-extra-includes=/usr/tgcware/include --with-extra-libs=/usr/tgcware/lib)
 
 autonuke=0
 

diff --git a/aspell/build.sh b/aspell/build.sh
@@ -22,7 +22,7 @@ patch[1]=aspell-0.60.2-includes.patch
 # Global settings
 export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
-configure_args='--prefix=$prefix --mandir=${prefix}/${_mandir} --infodir=${prefix}/${_infodir} --enable-docdir=$prefix/${_vdocdir}'
+configure_args=(--prefix=$prefix --mandir=${prefix}/${_mandir} --infodir=${prefix}/${_infodir} --enable-docdir=$prefix/${_vdocdir})
 
 reg prep
 prep()

diff --git a/autoconf213/build.sh b/autoconf213/build.sh
@@ -30,7 +30,7 @@ patch[9]=autoconf-2.13-versioning.patch
 # Global settings
 export PERL=/usr/tgcware/bin/perl
 shortroot=1
-configure_args='--prefix=$prefix --program-suffix=-$version'
+configure_args=(--prefix=$prefix --program-suffix=-$version)
 
 reg prep
 prep()

diff --git a/autoconf259/build.sh b/autoconf259/build.sh
@@ -19,7 +19,7 @@ source[0]=$topdir-$version.tar.bz2
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
 
 # Global settings
-configure_args="$configure_args --program-suffix=-$version"
+configure_args+=(--program-suffix=-$version)
 
 reg prep
 prep()

diff --git a/automake15/build.sh b/automake15/build.sh
@@ -23,7 +23,7 @@ patch[3]=automake-1.5-subdirs-89619.patch
 
 # Global settings
 export PERL=/usr/tgcware/bin/perl
-configure_args="--prefix=$prefix --program-suffix=-$version"
+configure_args=(--prefix=$prefix --program-suffix=-$version)
 
 reg prep
 prep()

diff --git a/automake19/build.sh b/automake19/build.sh
@@ -20,7 +20,7 @@ source[0]=$topdir-$version.tar.bz2
 
 # Global settings
 export PERL=/usr/tgcware/bin/perl
-configure_args='--prefix=$prefix --program-suffix=-1.9'
+configure_args=(--prefix=$prefix --program-suffix=-1.9)
 
 reg prep
 prep()

diff --git a/bash3/build.sh b/bash3/build.sh
@@ -68,7 +68,7 @@ patch[49]=bash32-050
 patchdir=$srcfiles
 export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
-configure_args="$configure_args --disable-rpath"
+configure_args+=(--disable-rpath)
 export CC=cc
 mipspro=1
 if [ "$_os" = "irix53" ]; then

diff --git a/bdb43/build.sh b/bdb43/build.sh
@@ -22,7 +22,7 @@ patch[0]=patch.4.3.29.1
 export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
 export CC=gcc
-configure_args="$configure_args --enable-compat185"
+configure_args+=(--enable-compat185)
 __configure="../dist/configure"
 [ "$_os" = "irix62" ] && ac_overrides="ac_cv_lib_socket=no ac_cv_lib_socket_main=no"
 patch_prefix=-p0

diff --git a/bdb44/build.sh b/bdb44/build.sh
@@ -25,7 +25,7 @@ patch[3]=patch.4.4.20.4
 export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
 export CC=gcc
-configure_args="$configure_args --enable-compat185"
+configure_args+=(--enable-compat185)
 __configure="../dist/configure"
 [ "$_os" = "irix62" ] && ac_overrides="ac_cv_lib_socket=no ac_cv_lib_socket_main=no"
 

diff --git a/binutils/build.sh b/binutils/build.sh
@@ -19,7 +19,7 @@ source[0]=ftp://ftp.sunet.se/pub/gnu/binutils/$topdir-$version.tar.bz2
 export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
 export CONFIG_SHELL=/bin/ksh
-configure_args="$configure_args --disable-nls --disable-werror"
+configure_args+=(--disable-nls --disable-werror)
 
 irix53 && PATH=/usr/tgcware/gcc45/bin:$PATH
 

diff --git a/c-ares/build.sh b/c-ares/build.sh
@@ -19,7 +19,7 @@ source[0]=$topdir-$version.tar.gz
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
 
 # Global settings
-configure_args="$configure_args --mandir=${prefix}/${_mandir} --disable-static --enable-shared"
+configure_args+=(--mandir=${prefix}/${_mandir} --disable-static --enable-shared)
 ac_overrides="ac_cv_func_inet_pton=no ac_cv_func_inet_ntop=no"
 
 reg prep

diff --git a/cairo/build.sh b/cairo/build.sh
@@ -18,7 +18,7 @@ patch[0]=cairo-1.8.4-trio.patch
 # Global settings
 export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
-configure_args="$configure_args --enable-xlib-xrender=no --disable-static"
+configure_args+=(--enable-xlib-xrender=no --disable-static)
 
 reg prep
 prep()

diff --git a/clawsmail/build.sh b/clawsmail/build.sh
@@ -24,7 +24,7 @@ patch[3]=sylpheed-claws-2.2.0-setenv.patch
 # Global settings
 export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
-configure_args="$configure_args --disable-gnomeprint --enable-ldap"
+configure_args+=(--disable-gnomeprint --enable-ldap)
 ac_overrides="ac_cv_lib_socket_bind=no"
 
 reg prep

diff --git a/cmus/build.sh b/cmus/build.sh
@@ -21,7 +21,7 @@ patch[0]=cmus-2.0.2-irix.patch
 # Global settings
 export CFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
-configure_args="--prefix=$prefix --disable-arts"
+configure_args+=(--disable-arts)
 __configure="bash configure"
 check_ac=0
 
@@ -36,7 +36,7 @@ build()
 {
 #    generic_build
     setdir source
-    $__configure $configure_args
+    $__configure "${configure_args[@]}"
     $MAKE_PROG V=2
 }
 

diff --git a/compface/build.sh b/compface/build.sh
@@ -21,7 +21,7 @@ source[0]=$topdir-$version.tar.gz
 # Global settings
 export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
-configure_args="--prefix=$prefix"
+configure_args=(--prefix=$prefix)
 shortroot=1
 
 reg prep

diff --git a/curl/build.sh b/curl/build.sh
@@ -24,7 +24,7 @@ if irix53; then
 fi
 export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="$NO_RQS -L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
-configure_args="$configure_args --enable-static=no --enable-http --enable-ftp --enable-file --disable-ldap --enable-manual --disable-ipv6 --enable-cookies --enable-crypto --with-egd-socket=/var/run/egd-pool --with-libidn"
+configure_args+=(--enable-static=no --enable-http --enable-ftp --enable-file --disable-ldap --enable-manual --disable-ipv6 --enable-cookies --enable-crypto --with-egd-socket=/var/run/egd-pool --with-libidn)
 make_check_target="test"
 
 reg prep

diff --git a/dhcp/build.sh b/dhcp/build.sh
@@ -19,7 +19,7 @@ patch[0]=dhcp-3.0.5-irix.patch
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
 
 # Global settings
-configure_args=""
+configure_args=
 check_ac=0
 # No good way around this
 PATH=$(echo $PATH | sed -e 's/gcc//g')

diff --git a/dillo/build.sh b/dillo/build.sh
@@ -21,8 +21,8 @@ patch[0]=dillo-0.8.6-linkorder.patch
 # Global settings
 export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
-configure_args="$configure_args --disable-dlgui"
-[ "$_os" = "irix53" ] && configure_args="$configure_args --disable-threaded-dns"
+configure_args+=(--disable-dlgui)
+[ "$_os" = "irix53" ] && configure_args+=(--disable-threaded-dns)
 
 reg prep
 prep()

diff --git a/doxygen/build.sh b/doxygen/build.sh
@@ -21,8 +21,8 @@ patch[0]=doxygen-1.4.5-rpath.patch
 # Global settings
 export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
-configure_args="--prefix $prefix --perl /usr/tgcware/bin/perl --docdir ${prefix}${_sharedir}/doc --platform irix-g++ --shared --release"
-[ "$_os" != "irix53" ] && configure_args="$configure_args --dot /usr/tgcware/bin/dot"
+configure_args=(--prefix $prefix --perl /usr/tgcware/bin/perl --docdir ${prefix}${_sharedir}/doc --platform irix-g++ --shared --release)
+[ "$_os" != "irix53" ] && configure_args+=(--dot /usr/tgcware/bin/dot)
 check_ac=0
 shortroot=1
 

diff --git a/expat1/build.sh b/expat1/build.sh
@@ -20,7 +20,7 @@ source[0]=$topdir-$version.tar.gz
 
 # Global settings
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
-configure_args="--prefix=$prefix"
+configure_args=(--prefix=$prefix)
 
 shortroot=1
 

diff --git a/expect/build.sh b/expect/build.sh
@@ -31,7 +31,7 @@ fi
 export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="$NO_RQS -L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
 
-configure_args="--prefix=$prefix --with-tcl=${prefix}/${_libdir} --with-tclinclude=${prefix}/${_includedir}/tcl-private --with-tkinclude=${prefix}/${_includedir}/tk-private --with-tk=${prefix}/${_libdir} --enable-shared $with_gcc"
+configure_args=(--prefix=$prefix --with-tcl=${prefix}/${_libdir} --with-tclinclude=${prefix}/${_includedir}/tcl-private --with-tkinclude=${prefix}/${_includedir}/tk-private --with-tk=${prefix}/${_libdir} --enable-shared $with_gcc)
 
 shortroot=1
 topsrcdir=$topdir-${version%.*}

diff --git a/findutils/build.sh b/findutils/build.sh
@@ -19,7 +19,7 @@ patch[0]=findutils-4.2.33-assert.patch
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
 
 # Global settings
-configure_args="$configure_args --disable-rpath --with-libiconv-prefix=/usr/tgcware --with-libintl-prefix=/usr/tgcware"
+configure_args+=(--disable-rpath --with-libiconv-prefix=/usr/tgcware --with-libintl-prefix=/usr/tgcware)
 if [ "$_os" = "irix62" ]; then
     export CC=cc
     mipspro=1

diff --git a/flac/build.sh b/flac/build.sh
@@ -24,7 +24,7 @@ patch[3]=flac-1.2.1-libtool-xmms-plugin.patch
 # Global settings
 export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
-configure_args='--prefix=$prefix --mandir=${prefix}/${_mandir} --infodir=${prefix}/${_infodir} --disable-rpath --enable-static=no'
+configure_args=(--prefix=$prefix --mandir=${prefix}/${_mandir} --infodir=${prefix}/${_infodir} --disable-rpath --enable-static=no)
 subsysconf=$metadir/subsys.conf
 
 reg prep

diff --git a/fltk/build.sh b/fltk/build.sh
@@ -21,7 +21,7 @@ patch[0]=fltk-1.1.6-fontconfig.patch
 # Global settings
 export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
-configure_args='--prefix=$prefix --enable-shared --enable-thread --enable-xft'
+configure_args=(--prefix=$prefix --enable-shared --enable-thread --enable-xft)
 
 reg prep
 prep()

diff --git a/fontconfig/build.sh b/fontconfig/build.sh
@@ -24,7 +24,7 @@ export CPPFLAGS="-I/usr/tgcware/include"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
 export CC=cc
 mipspro=1
-configure_args="$configure_args --with-confdir=$prefix/${_sysconfdir} --with-docdir=${prefix}/${_docdir}/${topdir}-${version} --with-cache-dir=$prefix/var/cache/fontconfig"
+configure_args+=(--with-confdir=$prefix/${_sysconfdir} --with-docdir=${prefix}/${_docdir}/${topdir}-${version} --with-cache-dir=$prefix/var/cache/fontconfig)
 
 reg prep
 prep()

diff --git a/gaim/build.sh b/gaim/build.sh
@@ -27,7 +27,7 @@ patch[6]=gaim-2.0.0-missing-X11.patch
 # Global settings
 export CPPFLAGS="-I/usr/tgcware/include -I/usr/tgcware/include/ncurses"
 export LDFLAGS="-L/usr/tgcware/lib -Wl,-rpath,/usr/tgcware/lib"
-configure_args="$configure_args --enable-gnutls=yes --enable-nss=no --disable-gevolution"
+configure_args+=(--enable-gnutls=yes --enable-nss=no --disable-gevolution)
 ac_overrides="ac_cv_func_inet_ntop=no"
 
 reg prep

diff --git a/gcc3/build.sh b/gcc3/build.sh
@@ -50,11 +50,10 @@ gld=0
 objdir=cccfoa_ntools
 
 # Default configure arguments for all platforms
-global_config_args="--prefix=$prefix --with-local-prefix=$prefix --disable-nls --with-libiconv-prefix=/usr/tgcware --enable-shared"
+configure_args=(--prefix=$prefix --with-local-prefix=$prefix --disable-nls --with-libiconv-prefix=/usr/tgcware --enable-shared)
 # Platform specific settings
 if [ "$_os" = "irix53" ]; then
     export CONFIG_SHELL=/bin/ksh
-    platform_configure_args=""
     withada=0
     objdir=cccfo_ntools_ldflags
     gas=0
@@ -78,16 +77,16 @@ if [ "$_os" = "irix62" ]; then
 	export GNAT_ROOT=/usr/tgcware/gcc-3.4.6/bin
     fi
     export CC=$compiler_path/gcc
-    platform_configure_args="--disable-multilib"
+    configure_args+=(--disable-multilib)
 fi
 # End of platform specific settings now setup the final configure_args
 [ $withcc -eq 1 ] && langs="$langs,c++"
 [ $withfortran -eq 1 ] && langs="$langs,f77"
 [ $withobjc -eq 1 ] && langs="$langs,objc"
 [ $withada -eq 1 ] && langs="$langs,ada"
 [ $withjava -eq 1 ] && langs="$langs,java"
-[ $gas -eq 1 ] && global_config_args="$global_config_args $gnuas"
-[ $gld -eq 1 ] && global_config_args="$global_config_args $gnuld"
+[ $gas -eq 1 ] && configure_args+=($gnuas)
+[ $gld -eq 1 ] && configure_args+=($gnuld)
 
 # For GNU tools we need a few extras
 #if [ $gld -eq 1 -o $gas -eq 1 ]; then
@@ -100,7 +99,7 @@ fi
 #fi
 
 # Finally
-configure_args="$global_config_args $langs $platform_configure_args"
+configure_args+=($langs)
 
 # Make sure our desired host compiler is first in the path
 # This mostly matters for the Ada builds where using gnatbind
@@ -125,9 +124,9 @@ build()
 {
     setdir source
     ${__mkdir} -p ../$objdir
-    echo "$__configure $configure_args"
+    echo $__configure "${configure_args[@]}"
     setdir $srcdir/$objdir
-    ${__configure} $configure_args
+    ${__configure} "${configure_args[@]}"
     if [ "$_os" = "irix53" ]; then
 	# Hack it up to add no_rqs and proper rpath.
 	${__sed} -i "/^archive_cmds=/ s;so_locations;so_locations $MY_LDFLAGS;" mips-sgi-${os}/libobjc/libtool

diff --git a/gcc4/build.sh b/gcc4/build.sh
@@ -33,7 +33,7 @@ gas=0
 gld=0
 
 
-global_config_args="--prefix=$prefix --with-local-prefix=$prefix --disable-nls --with-libiconv-prefix=/usr/tgcware"
+configure_args=(--prefix=$prefix --with-local-prefix=$prefix --disable-nls --with-libiconv-prefix=/usr/tgcware)
 
 if [ "$_os" = "irix53" ]; then
     export CONFIG_SHELL=/bin/ksh
@@ -46,20 +46,20 @@ if [ "$_os" = "irix53" ]; then
     withjava=0
     objdir=cccfoo_gtools
     [ $withada -eq 1 ] && export GNAT_ROOT=$HOME/gcc-3.4.0-20040204-mips-sgi-irix5.3 # Location of gnatbind
-    configure_args="$global_config_args --enable-shared=libstdc++"
+    configure_args+=(--enable-shared=libstdc++)
 fi
 if [ "$_os" = "irix62" ]; then
-    #configure_args="$global_config_args --disable-multilib $gnuas --enable-shared=libstdc++"
+    #configure_args+=(--disable-multilib $gnuas --enable-shared=libstdc++)
     #export CC='/usr/people/tgc/bin/cc -n32 -mips3'
-    #configure_args="$global_config_args --disable-shared"
-    configure_args="$global_config_args --enable-shared=libstdc++"
+    #configure_args+=(--disable-shared)
+    configure_args+=(--enable-shared=libstdc++)
     compiler_path=/usr/tgcware/gcc-3.4.6/bin
     export CC=$compiler_path/gcc
     withada=1
     gas=1
     objdir=cccfooa_gas_sh
     [ $withada -eq 1 ] && export GNAT_ROOT=/usr/tgcware/gcc-3.4.6/bin
-    [ $withjava -eq 1 ] && configure_args="$configure_args --with-system-zlib --enable-java-awt=gtk"
+    [ $withjava -eq 1 ] && configure_args+=(--with-system-zlib --enable-java-awt=gtk)
 fi
 
 if [ $gas -eq 1 -o $gld -eq 1 ]; then
@@ -75,11 +75,11 @@ if [ $gas -eq 1 -o $gld -eq 1 ]; then
 fi
 [ $withada -eq 1 ] && langs="$langs,ada"
 [ $withjava -eq 1 ] && langs="$langs,java"
-[ $gas -eq 1 ] && configure_args="$configure_args $gnuas"
-[ $gld -eq 1 ] && configure_args="$configure_args $gnuld"
+[ $gas -eq 1 ] && configure_args+=($gnuas)
+[ $gld -eq 1 ] && configure_args+=($gnuld)
 # Workaround http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24345
 [ $gld -eq 0 ] && ac_overrides="gcc_cv_as_comdat_group=no gcc_cv_as_comdat_group_percent=no"
-configure_args="$configure_args $langs"
+configure_args+=($langs)
 
 # Define abbreviated version number
 abbrev_ver=$(echo $version|$SED -e 's/\.//g')