configure_args is now an array

Note that the of use += requires bash 3.1 or later.
This commit is contained in:
Tom G. Christensen 2013-08-11 16:51:05 +02:00
parent ade56c0c17
commit aba50c28ad
30 changed files with 48 additions and 54 deletions

View File

@ -18,7 +18,7 @@ source[0]=$topdir-$version.tar.bz2
# Global settings
export CPPFLAGS="-I$prefix/include"
export LDFLAGS="-L$prefix/lib -R$prefix/lib"
configure_args="$configure_args --disable-nls --program-prefix=g"
configure_args+=(--disable-nls --program-prefix=g)
reg prep
prep()

View File

@ -19,7 +19,7 @@ source[0]=http://curl.haxx.se/download/$topdir-$version.tar.bz2
export CPPFLAGS="-I$prefix/include"
export LDFLAGS="-L$prefix/lib -R$prefix/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)
reg prep
prep()

View File

@ -19,7 +19,7 @@ patch[0]=expect-5.43-no-rpath.patch
export CPPFLAGS="-I$prefix/include"
export LDFLAGS="-L$prefix/lib -R$prefix/lib"
configure_args="--prefix=$prefix --mandir=$prefix/$_mandir --with-tcl=${prefix}/${_libdir} --with-tclinclude=${prefix}/${_includedir}/tcl-private --with-tkinclude=${prefix}/${_includedir}/tk-private --with-tk=${prefix}/${_libdir} --enable-shared"
configure_args=(--prefix=$prefix --mandir=$prefix/$_mandir --with-tcl=${prefix}/${_libdir} --with-tclinclude=${prefix}/${_includedir}/tcl-private --with-tkinclude=${prefix}/${_includedir}/tk-private --with-tk=${prefix}/${_libdir} --enable-shared)
topsrcdir=$topdir-${version%.*}
majorver=5.43

View File

@ -31,9 +31,8 @@ make_build_target=bootstrap
# Define abbreviated version number (for pkgdef)
abbrev_ver=$(echo $version | ${__tr} -d '.')
global_config_args="--prefix=$prefix --with-local-prefix=$prefix --disable-nls --enable-shared"
langs="--enable-languages=c,c++,f77,objc,ada"
configure_args="$global_config_args $langs $platform_configure_args"
configure_args=(--prefix=$prefix --with-local-prefix=$prefix --disable-nls --enable-shared)
configure_args+=(--enable-languages=c,c++,f77,objc,ada)
objdir=cccgoa_native
export CC=/export/home/tgc/gnat/bin/gcc
export GNATROOT=/export/home/tgc/gnat

View File

@ -28,16 +28,14 @@ make_build_target=bootstrap
abbrev_ver=$(echo $version | ${__tr} -d '.')
# Configure args
global_config_args="--prefix=$prefix --with-local-prefix=$prefix --with-libiconv-prefix=$lprefix --with-gmp=$lprefix --with-mpfr=$lprefix --disable-nls --enable-shared --enable-threads=posix95"
langs="--enable-languages=c,ada,c++,f95,objc"
configure_args=(--prefix=$prefix --with-local-prefix=$prefix --with-libiconv-prefix=$lprefix --with-gmp=$lprefix --with-mpfr=$lprefix --disable-nls --enable-shared --enable-threads=posix95)
configure_args+=(--enable-languages=c,ada,c++,f95,objc)
objdir=all_native
# platform/arch specific options
[ "$_os" = "sunos56" -a "$arch" = "i386" ] && platform_configure_args="--with-gnu-as --with-as=$lprefix/bin/gas"
[ "$_os" = "sunos56" -a "$arch" = "i386" ] && platform_configure_args="$platform_configure_args --with-gnu-ld --with-ld=$lprefix/bin/gld"
[ "$_os" = "sunos56" -a "$arch" = "i386" ] && configure_args+=(--with-gnu-as --with-as=$lprefix/bin/gas)
[ "$_os" = "sunos56" -a "$arch" = "i386" ] && configure_args+=(--with-gnu-ld --with-ld=$lprefix/bin/gld)
[ "$arch" = "sparc" ] && vendor="sun" || vendor="pc"
configure_args="$global_config_args $langs $platform_configure_args"
reg prep
prep()
{

View File

@ -28,15 +28,13 @@ make_build_target=bootstrap
abbrev_ver=$(echo $version | ${__tr} -d '.')
# Configure args
global_config_args="--prefix=$prefix --with-local-prefix=$prefix --with-libiconv-prefix=$lprefix --with-gmp=$lprefix --with-mpfr=$lprefix --disable-nls --enable-shared --enable-threads=posix95"
langs="--enable-languages=c,ada,c++,fortran,objc,obj-c++"
configure_args+=(--prefix=$prefix --with-local-prefix=$prefix --with-libiconv-prefix=$lprefix --with-gmp=$lprefix --with-mpfr=$lprefix --disable-nls --enable-shared --enable-threads=posix95)
configure_args+=(--enable-languages=c,ada,c++,fortran,objc,obj-c++)
objdir=all_native
# platform/arch specific options
[ "$_os" = "sunos56" -a "$arch" = "i386" ] && platform_configure_args="--with-gnu-as --with-as=$lprefix/bin/gas"
[ "$_os" = "sunos56" -a "$arch" = "i386" ] && configure_args+=(--with-gnu-as --with-as=$lprefix/bin/gas)
[ "$arch" = "sparc" ] && vendor="sun" || vendor="pc"
configure_args="$global_config_args $langs $platform_configure_args"
reg prep
prep()
{

View File

@ -28,15 +28,13 @@ make_build_target=bootstrap
abbrev_ver=$(echo $version | ${__tr} -d '.')
# Configure args
global_config_args="--prefix=$prefix --with-local-prefix=$prefix --with-libiconv-prefix=$lprefix --with-gmp=$lprefix --with-mpfr=$lprefix --disable-nls --enable-shared --enable-threads=posix95"
langs="--enable-languages=c,ada,c++,fortran,objc,obj-c++"
configure_args=(--prefix=$prefix --with-local-prefix=$prefix --with-libiconv-prefix=$lprefix --with-gmp=$lprefix --with-mpfr=$lprefix --disable-nls --enable-shared --enable-threads=posix95)
configure_args+=(--enable-languages=c,ada,c++,fortran,objc,obj-c++)
objdir=all_native
# platform/arch specific options
[ "$_os" = "sunos56" -a "$arch" = "i386" ] && platform_configure_args="--with-gnu-as --with-as=$lprefix/bin/gas"
[ "$_os" = "sunos56" -a "$arch" = "i386" ] && configure_args+=(--with-gnu-as --with-as=$lprefix/bin/gas)
[ "$arch" = "sparc" ] && vendor="sun" || vendor="pc"
configure_args="$global_config_args $langs $platform_configure_args"
export CONFIG_SHELL=/bin/ksh
reg prep

View File

@ -29,7 +29,7 @@ abbrev_ver=$(echo $version | ${__tr} -d '.')
# Just major.minor, no subminors
majorminor=$(echo $version | cut -d. -f1-2)
global_config_args="--prefix=$prefix --with-local-prefix=$prefix --with-gmp=$lprefix --with-mpfr=$lprefix --disable-nls --enable-shared"
configure_args=(--prefix=$prefix --with-local-prefix=$prefix --with-gmp=$lprefix --with-mpfr=$lprefix --disable-nls --enable-shared)
langs="--enable-languages=c,ada,c++,fortran,objc,obj-c++"
linker="--without-gnu-ld --with-ld=/usr/ccs/bin/ld"
assembler="--without-gnu-as --with-as=/usr/ccs/bin/as"
@ -40,9 +40,9 @@ objdir=all_native
[ "$_os" = "sunos57" ] && { langs="$langs,java --with-java-awt=xlib"; sol27=1; }
[ "$arch" = "sparc" ] && { vendor="sun"; sparc=1; } || { vendor="pc"; intel=1; }
[ "$arch" = "sparc" -a -n "$(isalist | grep sparcv9)" ] && { sparcv9=1; m64run=1; } || m64run=0
[ "$arch" = "sparc" ] && global_config_args="$global_config_args --with-cpu=v7"
[ "$arch" = "sparc" ] && configure_args+=(--with-cpu=v7)
configure_args="$global_config_args $linker $assembler $langs $platform_configure_args"
configure_args+=($linker $assembler $langs $platform_configure_args)
LDFLAGS="-Wl,-R,$prefix/lib -Wl,-R,$lprefix/lib"

View File

@ -30,7 +30,7 @@ __configure="../$topsrcdir/configure"
make_build_target=bootstrap
global_config_args="--prefix=$prefix --with-local-prefix=$prefix --with-gmp=$lprefix --with-mpfr=$lprefix --disable-nls --enable-shared"
configure_args=(--prefix=$prefix --with-local-prefix=$prefix --with-gmp=$lprefix --with-mpfr=$lprefix --disable-nls --enable-shared)
langs="--enable-languages=c,ada,c++,fortran,objc,obj-c++"
linker="--without-gnu-ld --with-ld=/usr/ccs/bin/ld"
assembler="--without-gnu-as --with-as=/usr/ccs/bin/as"
@ -39,9 +39,9 @@ objdir=all_native
[ "$_os" = "sunos57" ] && { langs="$langs,java --with-java-awt=xlib"; sol27=1; }
[ "$arch" = "sparc" ] && { vendor="sun"; sparc=1; } || { vendor="pc"; intel=1; }
[ "$arch" = "sparc" -a -n "$(isalist | grep sparcv9)" ] && { sparcv9=1; m64run=1; } || m64run=0
[ "$arch" = "sparc" ] && global_config_args="$global_config_args --with-cpu=v7"
[ "$arch" = "sparc" ] && configure_args+=(--with-cpu=v7)
configure_args="$global_config_args $linker $assembler $langs $platform_configure_args"
configure_args+=($linker $assembler $langs $platform_configure_args)
LDFLAGS="-Wl,-R,$prefix/lib -Wl,-R,$lprefix/lib"

View File

@ -18,7 +18,7 @@ source[0]=$topdir-$version.tar.gz
# Global settings
export CPPFLAGS="-I$prefix/include"
export LDFLAGS="-L$prefix/lib -R$prefix/lib"
configure_args="$configure_args --with-libiconv-prefix=$prefix --disable-java --disable-openmp"
configure_args+=(--with-libiconv-prefix=$prefix --disable-java --disable-openmp)
reg prep
prep()

View File

@ -23,7 +23,7 @@ export PERL_PATH=$prefix/bin/perl
export SHELL_PATH=$prefix/bin/bash
no_configure=1
__configure="make"
configure_args=""
configure_args=
# HACK: -e must be last or echo will think it's an argument
__make="/usr/tgcware/bin/make -e"
make_build_target="V=1"

View File

@ -19,7 +19,7 @@ source[0]=ftp://ftp.sunet.se/pub/gnu/gmp/$topdir-$version.tar.bz2
export LDFLAGS="-L$prefix/lib -R$prefix/lib"
[ "$_os" = "sunos56" ] && triplet="${arch}-sun-solaris2.6"
[ "$_os" = "sunos57" ] && triplet="${arch}-sun-solaris2.7"
configure_args="--host=$triplet --build=$triplet $configure_args --enable-cxx"
configure_args=(--host=$triplet --build=$triplet "${configure_args[@]}" --enable-cxx)
# otherwise configure tests will fail since they don't respect LDFLAGS :(
export LD_LIBRARY_PATH="$prefix/lib"

View File

@ -16,7 +16,7 @@ source[0]=$topdir-$version.tar.gz
. ${BUILDPKG_SCRIPTS}/buildpkg.functions
# Global settings
configure_args="$configure_args --with-editor=/bin/vi"
configure_args+=(--with-editor=/bin/vi)
reg prep
prep()

View File

@ -18,7 +18,7 @@ source[0]=ftp://ftp.gnupg.org/gcrypt/libgpg-error/$topdir-$version.tar.bz2
# Global settings
export CPPFLAGS="-I$prefix/include"
export LDFLAGS="-L$prefix/lib -R$prefix/lib"
configure_args="$configure_args --disable-static --disable-languages"
configure_args+=(--disable-static --disable-languages)
reg prep
prep()

View File

@ -17,7 +17,7 @@ source[0]=$topdir-$version.tar.gz
# Global settings
export LDFLAGS="-L$prefix/lib -R$prefix/lib"
configure_args="$configure_args --enable-extra-encodings"
configure_args+=(--enable-extra-encodings)
reg prep
prep()

View File

@ -18,7 +18,7 @@ source[0]=ftp://ftp.sunet.se/pub/gnu/libidn/$topdir-$version.tar.gz
# Global settings
export CPPFLAGS="-I$prefix/include"
export LDFLAGS="-L$prefix/lib -R$prefix/lib"
configure_args="$configure_args --disable-static --with-libiconv-prefix=$prefix --with-libintl-prefix=$prefix"
configure_args+=(--disable-static --with-libiconv-prefix=$prefix --with-libintl-prefix=$prefix)
reg prep
prep()

View File

@ -18,7 +18,7 @@ source[0]=$topdir-$version.tar.gz
# Global settings
export CPPFLAGS="-I$prefix/include"
export LDFLAGS="-L$prefix/lib -R$prefix/lib"
configure_args="$configure_args --with-shared --without-debug --with-install-prefix=${stagedir} --disable-rpath --enable-symlinks --with-manpage-format=normal --without-ada"
configure_args+=(--with-shared --without-debug --with-install-prefix=${stagedir} --disable-rpath --enable-symlinks --with-manpage-format=normal --without-ada)
reg prep
prep()

View File

@ -20,7 +20,7 @@ export LDFLAGS="-R$prefix/lib -L$prefix/lib"
export CPPFLAGS="-I$prefix/include"
make_check_target="tests"
configure_args="--prefix=$prefix --mandir=$prefix/$_mandir --sysconfdir=$prefix/${_sysconfdir}/ssh --datadir=$prefix/${_sharedir}/openssh --with-default-path=/usr/bin:$prefix/${_bindir} --with-mantype=cat --with-pam --with-privsep-user=sshd --with-privsep-path=/var/empty/sshd --with-superuser-path=/usr/bin:/usr/sbin:$prefix/$_bindir:$prefix/$_sbindir --with-lastlog=/var/adm/lastlog --without-zlib-version-check"
configure_args=(--prefix=$prefix --mandir=$prefix/$_mandir --sysconfdir=$prefix/${_sysconfdir}/ssh --datadir=$prefix/${_sharedir}/openssh --with-default-path=/usr/bin:$prefix/${_bindir} --with-mantype=cat --with-pam --with-privsep-user=sshd --with-privsep-path=/var/empty/sshd --with-superuser-path=/usr/bin:/usr/sbin:$prefix/$_bindir:$prefix/$_sbindir --with-lastlog=/var/adm/lastlog --without-zlib-version-check)
reg prep
prep()

View File

@ -20,14 +20,14 @@ abbrev_ver=$(echo $version|${__sed} -e 's/\.//g')
baseversion=$(echo $version|${__sed} -e 's/[a-zA-Z]//g')
make_check_target="test"
__configure="./Configure"
shared_args="--prefix=$prefix --openssldir=${prefix}/${_sharedir}/ssl zlib shared"
configure_args=(--prefix=$prefix --openssldir=${prefix}/${_sharedir}/ssl zlib shared)
if [ "$arch" = "sparc" ]; then
# For Solaris > 7 we default to sparcv8 ISA
configure_args="solaris-sparcv8-gcc $shared_args"
configure_args+=(solaris-sparcv8-gcc)
# Solaris < 8 supports sparcv7 hardware
[ "$_os" = "sunos56" -o "$_os" = "sunos57" ] && configure_args="$shared_args solaris-sparcv7-gcc"
[ "$_os" = "sunos56" -o "$_os" = "sunos57" ] && configure_args+=(solaris-sparcv7-gcc)
else
configure_args="$shared_args 386 solaris-x86-gcc"
configure_args+=(386 solaris-x86-gcc)
fi
ignore_deps="LWperl"

View File

@ -18,7 +18,7 @@ source[0]=$topdir-$version.tar.bz2
# Global settings
export CPPFLAGS="-I$prefix/include"
export LDFLAGS="-L$prefix/lib -R$prefix/lib"
configure_args="$configure_args --enable-utf8"
configure_args+=(--enable-utf8)
reg prep
prep()

View File

@ -19,7 +19,7 @@ source[0]=http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/$topdir-$version.t
maketest=1
perlpkgname="$(echo $pkgdir | ${__tr} '-' '_')"
__configure="perl"
configure_args="Makefile.PL"
configure_args=(Makefile.PL)
reg prep
prep()

View File

@ -20,7 +20,7 @@ make_check_target="test"
__configure="sh Configure"
[ "$arch" = "sparc" ] && arch_name="sun4-solaris"
[ "$arch" = "i386" ] && arch_name="i86pc-solaris"
configure_args="-Dcc='gcc' -Darchname=${arch_name} -Dprefix=$prefix -Dmyhostname=localhost -Dcf_by='Tom G. Christensen' -Dcf_email='swpkg@jupiterrise.com' -Dperladmin=root@localhost -Dinstallprefix=${stagedir}${prefix} -Dman3ext=3pm -Uinstallusrbinperl -Dpager='/usr/bin/more' -Dlocincpth='/usr/tgcware/include' -Dloclibpth='/usr/tgcware/lib' -des"
configure_args=(-Dcc=gcc -Darchname=${arch_name} -Dprefix=$prefix -Dmyhostname=localhost -Dcf_by="Tom G. Christensen" -Dcf_email=swpkg@jupiterrise.com -Dperladmin=root@localhost -Dinstallprefix=${stagedir}${prefix} -Dman3ext=3pm -Uinstallusrbinperl -Dpager=/usr/bin/more -Dlocincpth=/usr/tgcware/include -Dloclibpth=/usr/tgcware/lib -des)
reg prep
prep()
@ -32,7 +32,7 @@ reg build
build()
{
setdir source
$__configure -Dcc='/usr/tgcware/gcc-3.4.6/bin/gcc' -Darchname=${arch_name} -Dprefix=$prefix -Dmyhostname=localhost -Dcf_by='Tom G. Christensen' -Dcf_email='swpkg@jupiterrise.com' -Dperladmin=root@localhost -Dinstallprefix=${stagedir}${prefix} -Dman3ext=3pm -Uinstallusrbinperl -Dpager='/usr/bin/more' -Dlocincpth='/usr/tgcware/include' -Dloclibpth='/usr/tgcware/lib' -des
$__configure "${configure_args[@]}"
${__make} LDDLFLAGS="-shared -L$prefix/lib -R$prefix/lib" CLDFLAGS="-L$prefix/lib -R$prefix/lib"
}

View File

@ -23,7 +23,7 @@ cflags_os="-O2 -DSOLARIS"
[ "$_os" = "sunos56" ] && cflags_os="-O2 -DSOLARIS26 -D__EXTENSIONS__"
__configure="make"
configure_args="CC=$CC CFLAGS=\\\"$cflags_os\\\" SYSLIBS=\\\"$syslibs\\\" DEFS=\\\"-DRANDSAVENAME=\\\"${prefix}/${_sysconfdir}/prngd/prngd-seed\\\" -DCONFIGFILE=\\\"${prefix}/${_sysconfdir}/prngd/prngd.conf\\\"\\\""
configure_args=(CC=$CC CFLAGS="$cflags_os" SYSLIBS="$syslibs" DEFS="-DRANDSAVENAME=\\\"${prefix}/${_sysconfdir}/prngd/prngd-seed\\\" -DCONFIGFILE=\\\"${prefix}/${_sysconfdir}/prngd/prngd.conf\\\"")
reg prep
prep()
@ -35,7 +35,8 @@ reg build
build()
{
setdir source
${__make} CC=$CC CFLAGS="$cflags_os" SYSLIBS="$syslibs" DEFS="-DRANDSAVENAME=\\\"${prefix}/${_sysconfdir}/prngd/prngd-seed\\\" -DCONFIGFILE=\\\"${prefix}/${_sysconfdir}/prngd/prngd.conf\\\""
echo "${configure_args[@]}"
${__make} "${configure_args[@]}"
}
reg check

View File

@ -18,7 +18,7 @@ source[0]=ftp://ftp.sunet.se/pub/gnu/readline/$topdir-$version.tar.gz
# Global settings
export CPPFLAGS="-I$prefix/include"
export LDFLAGS="-L$prefix/lib -R$prefix/lib"
configure_args="$configure_args --disable-static"
configure_args+=(--disable-static)
reg prep
prep()

View File

@ -18,7 +18,7 @@ source[0]=$topdir-$version.tar.gz
# Global settings
export CPPFLAGS="-I$prefix/include"
export LDFLAGS="-L$prefix/lib -R$prefix/lib"
configure_args="$configure_args --with-included-popt"
configure_args+=(--with-included-popt)
reg prep
prep()

View File

@ -17,7 +17,7 @@ source[0]=$topdir$version-src.tar.gz
# Global settings
export LDFLAGS="-L$prefix/lib -R$prefix/lib"
configure_args="--prefix=$prefix --mandir=$prefix/$_mandir --disable-symbols --enable-man-symlinks"
configure_args=(--prefix=$prefix --mandir=$prefix/$_mandir --disable-symbols --enable-man-symlinks)
topsrcdir=$topdir$version
majorver="${version%.*}"

View File

@ -18,7 +18,7 @@ source[0]=${topdir}${version}-src.tar.gz
# Global settings
export CPPFLAGS="-I$prefix/include"
export LDFLAGS="-L$prefix/lib -R$prefix/lib"
configure_args="--prefix=$prefix --mandir=$prefix/$_mandir --disable-symbols --enable-man-symlinks --with-tcl=${prefix}/${_libdir}"
configure_args=(--prefix=$prefix --mandir=$prefix/$_mandir --disable-symbols --enable-man-symlinks --with-tcl=${prefix}/${_libdir})
topsrcdir=$topdir$version
majorver="${version%.*}"

View File

@ -19,7 +19,7 @@ source[0]=${topdir}552.tar.gz
shortroot=1
__configure="make"
make_build_target="CC=gcc -f unix/Makefile solaris"
configure_args="$make_build_target"
configure_args=($make_build_target)
no_configure=1
reg prep

View File

@ -27,7 +27,7 @@ export CPPFLAGS="-I/usr/tgcware/include"
export LDFLAGS="-L$prefix/lib -R$prefix/lib"
# What gui should we build?
gui=motif
configure_args='--prefix=$prefix --without-local-dir --enable-gui=$gui --with-features=huge --enable-multibyte --disable-perlinterp --disable-pythoninterp --disable-tclinterp --with-compiledby="<swpkg@jupiterrise.com>" --disable-netbeans'
configure_args=(--prefix=$prefix --without-local-dir --enable-gui=$gui --with-features=huge --enable-multibyte --disable-perlinterp --disable-pythoninterp --disable-tclinterp --with-compiledby="<swpkg@jupiterrise.com>" --disable-netbeans)
reg prep
prep()

View File

@ -16,7 +16,7 @@ source[0]=http://zlib.net/$topdir-$version.tar.bz2
. ${BUILDPKG_SCRIPTS}/buildpkg.functions
# Global settings
configure_args='--shared --prefix=$prefix'
configure_args=(--shared --prefix=$prefix)
export LDSHARED="gcc -shared -R ${prefix}/${_libdir} -Wl,-h,libz.so.1"
shortroot=1