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

Make it possible to adjust the command used in the configure step

Browse Source 
Fix up rel_conf_sub to match auto_rel wrt. configure info and relnotes
Add flag to indicat to auto_rel if the compiler was mipspro so it can
act accordingly when filling out the COMPILER field
This commit is contained in:
Tom G. Christensen 2005-10-16 15:58:41 +00:00
parent 311bbb03f0
commit 6513e7b2cc
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
buildpkg.packaging.irix
View File

@ -7,8 +7,8 @@
# generic tools go in buildpkg.functions # generic tools go in buildpkg.functions
GENDIST="/usr/sbin/gendist" GENDIST="/usr/sbin/gendist"
GENDIST_OPTS="-nostrip" GENDIST_OPTS="-nostrip"
SHOWPRODS="/usr/bin/showprods" SHOWPRODS="/usr/sbin/showprods"
SHOWFILES="/usr/bin/showfiles" SHOWFILES="/usr/sbin/showfiles"
GZIP=/usr/people/tgc/bin/gzip GZIP=/usr/people/tgc/bin/gzip
BZIP2=/usr/local/bin/bzip2 BZIP2=/usr/local/bin/bzip2
@ -74,6 +74,8 @@ check_ac=1
# If you need to override any autoconf values put them in this string # If you need to override any autoconf values put them in this string
# ie. ac_cv_lib_sun_mntent=no etc. # ie. ac_cv_lib_sun_mntent=no etc.
ac_overrides="" ac_overrides=""
# Run this command for the configure stage
__configure="./configure"
# Comment these declarations to get it to run with ksh # Comment these declarations to get it to run with ksh
declare -a pc # Array of product categories (image.subsys) declare -a pc # Array of product categories (image.subsys)
@ -844,14 +846,23 @@ auto_src()
# time of expansion. # time of expansion.
rel_conf_sub() rel_conf_sub()
{ {
local rn
local i
for i in relnotes relnotes.${_os} for i in relnotes relnotes.${_os}
do do
[ -r ${metadir}/${i} ] && rn=$i [ -r ${metadir}/${i} ] && rn=$i
done done
cf="$(_upls $configure_args)" # Duplicated code from auto_rel :(
full_cf="./configure $cf" # compute configure info for relnotes
local cf="$(_upls $configure_args)"
[ -n "$ac_overrides" ] && local aco="$(echo $ac_overrides | $TR ' ' '\n' | $AWK '{ printf "%s \\\\ \\n",$0 }')"
local temp_fullcf="$(echo "$__configure $cf" | $AWK '{ printf "%s\\n",$0 }')"
temp_fullcf="$(echo "${aco}${temp_fullcf}")"
# Remove trailing whitespace and \n
local fullcf="${temp_fullcf%\\*}"
# end
if [ -r ${metadir}/${rn} ]; then if [ -r ${metadir}/${rn} ]; then
$SED -e "s;%%CONFIGURE%%;$full_cf;g" \ $SED -e "s;%%CONFIGURE%%;$fullcf;g" \
${metadir}/${rn} > ${metadir}/${rn}.txt ${metadir}/${rn} > ${metadir}/${rn}.txt
fi fi
} }
@ -885,13 +896,17 @@ auto_rel()
# 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="$(echo $ac_overrides | $TR ' ' '\n' | $AWK '{ printf "%s \\\\ \\n",$0 }')" [ -n "$ac_overrides" ] && local aco="$(echo $ac_overrides | $TR ' ' '\n' | $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
local fullcf="${temp_fullcf%\\*}" local fullcf="${temp_fullcf%\\*}"
# end # end
if [ "$mipspro" -gt 0 ]; then
local compiler="$(cc -version)"
else
local compiler_temp="$(gcc --version 2>&1 | $SED -n '1,1p')" local compiler_temp="$(gcc --version 2>&1 | $SED -n '1,1p')"
local compiler="gcc ${compiler_temp##* }" local compiler="gcc ${compiler_temp##* }"
fi
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=*})
local vendor_temp=$($GREP 'pkgvendor=' $metadir/pkgdef) local vendor_temp=$($GREP 'pkgvendor=' $metadir/pkgdef)
@ -1028,7 +1043,7 @@ run_configure()
do do
export $acvar export $acvar
done done
./configure $(_upls $configure_args) $__configure $(_upls $configure_args)
if [ $check_ac -gt 0 ]; then if [ $check_ac -gt 0 ]; then
local out="$(check_ac warn)" local out="$(check_ac warn)"
if [ -n "$out" ]; then if [ -n "$out" ]; then