Solaris/buildpkg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert configure_args to an array

Browse Source 
This makes it possible to avoid difficult or impossible quoting needed
for passing arguments.
This commit is contained in:
Tom G. Christensen 2013-07-30 14:20:34 +02:00
parent 277d9108ac
commit a238b33578
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildpkg.functions
View File

@ -71,8 +71,8 @@ topinstalldir=/usr/tgcware
prefix=$topinstalldir prefix=$topinstalldir
metainstalldir=$topinstalldir metainstalldir=$topinstalldir
# Keep this in hard-quotes to delay expansion # The default configure args
configure_args='--prefix=$prefix --disable-nls' configure_args=(--prefix=$prefix --disable-nls)
__configure="./configure" __configure="./configure"
# Docdir relative to $prefix # Docdir relative to $prefix
@ -835,8 +835,8 @@ generic_build()
do do
export $acvar export $acvar
done done
echo $__configure $(_upls $configure_args) echo $__configure "${configure_args[@]}"
$__configure $(_upls $configure_args) $__configure "${configure_args[@]}"
else else
# Platform specific configure run # Platform specific configure run
run_configure run_configure

10
buildpkg.packaging.irix
View File

@ -135,7 +135,7 @@ os=irix`${__uname} -r`
_os=$(${__uname} -sr|${__sed} -e 's/ //g' -e 's/\.//g' -e 's/IRIX64/IRIX/g'|${__tr} '[A-Z]' '[a-z]') _os=$(${__uname} -sr|${__sed} -e 's/ //g' -e 's/\.//g' -e 's/IRIX64/IRIX/g'|${__tr} '[A-Z]' '[a-z]')
cpu=mips3 cpu=mips3
configure_args='--prefix=$prefix --mandir=${prefix}/${_mandir} --infodir=${prefix}/${_infodir}' configure_args=(--prefix=$prefix --mandir=${prefix}/${_mandir} --infodir=${prefix}/${_infodir})
META_CLEAN="$topdir.spec $topdir.idb files.tmp ${depends##*/}_auto ${depends##*/}_all sums" META_CLEAN="$topdir.spec $topdir.idb files.tmp ${depends##*/}_auto ${depends##*/}_all sums"
@ -1084,12 +1084,8 @@ auto_rel()
fi fi
local relmetadir=${stagedir}${metainstalldir}relnotes/$topdir-$version-$pkgver local relmetadir=${stagedir}${metainstalldir}relnotes/$topdir-$version-$pkgver
# compute configure info for relnotes # compute configure info for relnotes
local cf="$(_upls $configure_args)"
[ -n "$my_ac_overrides" -a $no_configure -eq 0 ] && local aco="$(for ar in $my_ac_overrides; do echo $ar; done | ${__awk} '{ printf "%s \\\\ \\n",$0 }')" [ -n "$my_ac_overrides" -a $no_configure -eq 0 ] && local aco="$(for ar in $my_ac_overrides; do echo $ar; done | ${__awk} '{ printf "%s \\\\ \\n",$0 }')"
local temp_fullcf="$(echo "$__configure $cf" | ${__awk} '{ printf "%s\\n",$0 }')" local fullcf="${aco}${__configure} "${configure_args[@]}""
temp_fullcf="$(echo "${aco}${temp_fullcf}")"
# Remove trailing whitespace and \n
local fullcf="${temp_fullcf%\\*}"
# end # end
local pkgnam_temp=$(${__grep} 'pkgname=' $metadir/pkgdef) local pkgnam_temp=$(${__grep} 'pkgname=' $metadir/pkgdef)
local pkgnam=$(_upls ${pkgnam_temp#pkgname=*}) local pkgnam=$(_upls ${pkgnam_temp#pkgname=*})
@ -1322,7 +1318,7 @@ run_configure()
do do
export $acvar export $acvar
done done
$__configure $(_upls $configure_args) $__configure "${configure_args[@]}"
if [ $check_ac -gt 0 ]; then if [ $check_ac -gt 0 ]; then
local out="$(check_ac warn $configlog)" local out="$(check_ac warn $configlog)"
if [ -n "$out" ]; then if [ -n "$out" ]; then

8
buildpkg.packaging.solaris
View File

@ -89,7 +89,7 @@ _mandir=share/man
_infodir=share/info _infodir=share/info
# Default configure args # Default configure args
configure_args='${gnu_link_progs:+--program-prefix=$gnu_prefix} --prefix=$prefix --mandir=${prefix}/${_mandir} --infodir=${prefix}/${_infodir}' configure_args=(${gnu_link_progs:+--program-prefix=$gnu_prefix} --prefix=$prefix --mandir=${prefix}/${_mandir} --infodir=${prefix}/${_infodir})
# Host specific configuration # Host specific configuration
[ -r $buildpkgscripts/config.`hostname`.solaris ] && . $buildpkgscripts/config.`hostname`.solaris [ -r $buildpkgscripts/config.`hostname`.solaris ] && . $buildpkgscripts/config.`hostname`.solaris
@ -383,12 +383,8 @@ auto_rel()
fi fi
local relmetadir=${stagedir}${metainstalldir}relnotes/$secname-$version-$pkgver local relmetadir=${stagedir}${metainstalldir}relnotes/$secname-$version-$pkgver
### compute configure info for relnotes ### compute configure info for relnotes
local cf="$(_upls $configure_args)"
[ -n "$ac_overrides" ] && local aco="$(for ar in $ac_overrides; do echo $ar; done | ${__awk} '{ printf "%s \\\\ \\n",$0 }')" [ -n "$ac_overrides" ] && local aco="$(for ar in $ac_overrides; do echo $ar; done | ${__awk} '{ printf "%s \\\\ \\n",$0 }')"
local temp_fullcf="$(echo "$__configure $cf" | ${__awk} '{ printf "%s\\n",$0 }')" local fullcf="${aco}${__configure} "${configure_args[@]}""
temp_fullcf="$(echo "${aco}${temp_fullcf}")"
# Remove trailing whitespace and \n
local fullcf="${temp_fullcf%\\*}"
### ###
local pkgnam=$(get_pkgname $secname) local pkgnam=$(get_pkgname $secname)
local vendor=$(get_pkgvendor $secname) local vendor=$(get_pkgvendor $secname)