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

Make it possible to add global configure overrides

Browse Source
This commit is contained in:
Tom G. Christensen 2009-08-12 08:53:14 +00:00
parent 6fe8c2e5b1
commit 7664df5bbe
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buildpkg.functions
View File

@ -734,12 +734,13 @@ generic_prep()
# params: $1 = dir to descend to *inside* "source" - optional # params: $1 = dir to descend to *inside* "source" - optional
generic_build() generic_build()
{ {
local my_ac_overrides="$platform_ac_overrides $ac_overrides"
setdir ${srcdir}/${topsrcdir}/$1 setdir ${srcdir}/${topsrcdir}/$1
if [ $no_configure -eq 0 ]; then if [ $no_configure -eq 0 ]; then
if [ $generic_configure -eq 1 ]; then if [ $generic_configure -eq 1 ]; then
local acvar local acvar
for acvar in $ac_overrides for acvar in $my_ac_overrides
do do
export $acvar export $acvar
done done

8
buildpkg.packaging.irix
View File

@ -1040,6 +1040,7 @@ auto_rel()
{ {
local i local i
local rn local rn
local my_ac_overrides="$platform_ac_overrides $ac_overrides"
for i in relnotes relnotes.${_os} relnotes.txt relnotes.${_os}.txt; for i in relnotes relnotes.${_os} relnotes.txt relnotes.${_os}.txt;
do do
@ -1052,7 +1053,7 @@ auto_rel()
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)" 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 "$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 temp_fullcf="$(echo "$__configure $cf" | ${__awk} '{ printf "%s\\n",$0 }')"
temp_fullcf="$(echo "${aco}${temp_fullcf}")" temp_fullcf="$(echo "${aco}${temp_fullcf}")"
# Remove trailing whitespace and \n # Remove trailing whitespace and \n
@ -1293,9 +1294,10 @@ auto_deps()
# #
run_configure() run_configure()
{ {
#eval "$ac_overrides ./configure $(_upls $configure_args)" local my_ac_overrides="$platform_ac_overrides $ac_overrides"
#eval "$my_ac_overrides ./configure $(_upls $configure_args)"
local acvar local acvar
for acvar in $ac_overrides for acvar in $my_ac_overrides
do do
export $acvar export $acvar
done done