[PC-BSD Commits] r19615 - in pcbsd/current/src-sh/pbi-manager: . man8

[svn at pcbsd.org]

Author: kris
Date: 2012-10-08 20:21:22 +0000 (Mon, 08 Oct 2012)
New Revision: 19615

Modified:
   pcbsd/current/src-sh/pbi-manager/man8/pbi_autobuild.8
   pcbsd/current/src-sh/pbi-manager/man8/pbi_makeport.8
   pcbsd/current/src-sh/pbi-manager/pbi-manager
Log:

Add -32 option to pbi_autobuild as well, should be possible to build PBIs
from a amd64 host now for i386



Modified: pcbsd/current/src-sh/pbi-manager/man8/pbi_autobuild.8
===================================================================
--- pcbsd/current/src-sh/pbi-manager/man8/pbi_autobuild.8	2012-10-08 20:09:16 UTC (rev 19614)
+++ pcbsd/current/src-sh/pbi-manager/man8/pbi_autobuild.8	2012-10-08 20:21:22 UTC (rev 19615)
@@ -10,6 +10,7 @@
 .Op Fl d Ar portdir
 .Op Fl o Ar outdir
 .Op Fl h Ar script
+.Op Fl 32
 .Op Fl -genpatch
 .Op Fl -keep Ar num
 .Op Fl -pkgcache
@@ -40,6 +41,8 @@
 .It Fl o Ar outdir
 The directory to place the finished PBI files, will also be used to determine
 which apps are in need of a rebuild if the associated FreeBSD port has been updated.
+.It Fl 32
+Use to specify to build i386 PBIs on an amd64 host system
 .It Fl -genpatch
 When building a new PBI, check for archived copies, and generate smaller patch
 updates to the new version. (*.pbp files)

Modified: pcbsd/current/src-sh/pbi-manager/man8/pbi_makeport.8
===================================================================
--- pcbsd/current/src-sh/pbi-manager/man8/pbi_makeport.8	2012-10-08 20:09:16 UTC (rev 19614)
+++ pcbsd/current/src-sh/pbi-manager/man8/pbi_makeport.8	2012-10-08 20:21:22 UTC (rev 19615)
@@ -12,7 +12,7 @@
 .Op Fl d Ar portsdir
 .Op Fl o Ar outdir
 .Op Fl p Ar prefix
-.Op Fl -32
+.Op Fl 32
 .Op Fl -delbuild
 .Op Fl -mkdebug
 .Op Fl -no-prune
@@ -49,7 +49,7 @@
 .It Fl p Ar prefix
 Manually provide a PREFIX, which determines the location where the
 PBI will end up being installed on the end-users system. 
-.It Fl -32
+.It Fl 32
 Specify to create a i386 PBI from a amd64 host system
 .It Fl -delbuild
 Remove any existing build dirs before starting this build.

Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-10-08 20:09:16 UTC (rev 19614)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-10-08 20:21:22 UTC (rev 19615)
@@ -60,6 +60,7 @@
   -d portdir   -- Use different ports dir (Default: /usr/ports)
   -h script    -- Call the following helper script after each build
   -o outdir    -- Where to place the finished PBI file(s) <required>
+  -32          -- Build i386 PBIs on amd64 host
   --genpatch   -- Generate patch files (*.pbp) from archived PBIs to current
   --keep <num> -- Keep <num> old versions in archive folder for each built PBI
   --prune      -- Remove files from 'outdir' that no longer have a module
@@ -990,6 +991,12 @@
                         get_abspath "$1"
                         PBI_AB_HELPS="$_ABSPATH"
                         ;;
+                -32)    if [ "$REALARCH" != "amd64" ] ; then 
+				exit_err "-32 can only be used on amd64 host"
+			fi	
+			PBI_AB32="YES"
+			ARCH=i386
+                        ;;
 
         --genpatch)     PBI_AB_GENPATCH="YES" 
                         ;;
@@ -5485,9 +5492,7 @@
 
 	for cArch in $cValues
 	do
-		if [ "$cArch" = "`uname -m`" ] ; then
-			return 0
-		fi
+		if [ "$cArch" = "$ARCH" ] ; then return 0; fi
 	done
 	
 	return 1
@@ -5500,7 +5505,6 @@
 
         parse_autob_pbi_cmdline "$@"
 
-
         do_pbi_autob
 }
 
@@ -5676,6 +5680,10 @@
 		fi
 		_flags="${_flags} --pkgdir ${_od}/pkgcache"
 	fi
+
+	# Are we doing 32bit builds?
+ 	if [ "$PBI_AB32" = "YES" ] ; then _flags="${_flags} -32"; fi
+
 	get_pbi_progversion
 
 	#echo "Starting build of ${_mp} - ${_pv}"