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

buildpkg.packaging.solaris: distinguish between arch and build_arch

Browse Source 
This allows building for targets like sparc64-sun-solaris2.9 by
defining build_arch as sparc64.
This commit is contained in:
Tom G. Christensen 2013-09-20 16:49:37 +02:00
parent 72de05b968
commit 6d8afb783d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildpkg.packaging.solaris
View File

@ -55,6 +55,10 @@ arch=`uname -p`
os=sunos`${__uname} -r` os=sunos`${__uname} -r`
gnu_os_ver=$(${__uname} -r | ${__sed} -e 's/^5/2/') gnu_os_ver=$(${__uname} -r | ${__sed} -e 's/^5/2/')
# By default, the build_arch is the same as arch, alternatives are sparc64 and
# x86_64. It should be set to either when building for tgcware64.
build_arch=$arch
# Default pkginfo.in file # Default pkginfo.in file
pkginfo=$buildpkgscripts/pkginfo.in pkginfo=$buildpkgscripts/pkginfo.in
@ -102,7 +106,7 @@ configure_args=(${gnu_link_progs:+--program-prefix=$gnu_prefix} --prefix=$prefix
# ie: libmad-0.14.2b-1.sb-sol5.8-sparc-local # ie: libmad-0.14.2b-1.sb-sol5.8-sparc-local
# We hardquote it so that we can control when we want it # We hardquote it so that we can control when we want it
# evaluated (using _upls) # evaluated (using _upls)
distfile='$secname-$version-$secver.tgc-$os-$arch-$pkgdirdesig' distfile='$secname-$version-$secver.tgc-$os-$build_arch-$pkgdirdesig'
##################################################### #####################################################
# "external" functions # "external" functions
@ -582,6 +586,7 @@ auto_deps()
# Check and see if there is an arch specific depend file # Check and see if there is an arch specific depend file
[ -r $metadir/depend.$arch ] && depend_file=depend.$arch [ -r $metadir/depend.$arch ] && depend_file=depend.$arch
[ -r $metadir/depend.$build_arch ] && depend_file=depend.$build_arch
deps="$(extract_deps $secname | ${__sort} -u)" deps="$(extract_deps $secname | ${__sort} -u)"
# We need to sort out any packages created from the same build # We need to sort out any packages created from the same build
@ -672,6 +677,7 @@ parse_def()
# Check and see if there is an arch specific pkgdef file # Check and see if there is an arch specific pkgdef file
[ -r $metadir/pkgdef.$arch ] && pkgdef_file=pkgdef.$arch [ -r $metadir/pkgdef.$arch ] && pkgdef_file=pkgdef.$arch
[ -r $metadir/pkgdef.$build_arch ] && pkgdef_file=pkgdef.$build_arch
while read line while read line
do do