From dad780ec111be4b23024a2f156e8e1ea7902514c Mon Sep 17 00:00:00 2001
From: Jess Robinson <castaway@desert-island.me.uk>
Date: Tue, 15 Jan 2013 10:26:22 +0000
Subject: [PATCH] Introduce $targetport to allow running on a non-standard ssh
 port

Such as when using user networking on qemu and redirecting a local port
to the emulator ssh
---
 Configure | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/Configure b/Configure
index 7e8ad6e..c778794 100755
--- a/Configure
+++ b/Configure
@@ -210,6 +210,7 @@ run=''
 targetarch=''
 targetdir=''
 targethost=''
+targetport=''
 to=''
 sysroot=''
 usecrosscompile=''
@@ -2899,6 +2900,11 @@ $define|true|[yY]*)
              echo "Guessing targetuser $targetuser." >&4
              ;;
 	esac
+	case "$targetport" in
+	'')  targetport=22
+             echo "Guessing targetport $targetport." >&4
+             ;;
+	esac
 	case "$targetfrom" in
 	scp)	q=-q ;;
 	*)	q='' ;;
@@ -2919,7 +2925,8 @@ case "\$cwd" in
 esac
 exe=\$1
 shift
-$targetrun -l $targetuser $targethost "cd \$cwd && ./\$exe \$@"
+$to \$exe
+$targetrun -p $targetport -l $targetuser $targethost "cd \$cwd && ./\$exe \$@"
 EOF
 	    ;;
 	*)  echo "Unknown targetrun '$targetrun'" >&4
@@ -2930,7 +2937,7 @@ EOF
 	*/Cross/mkdir)
 	    cat >$targetmkdir <<EOF
 #!/bin/sh
-$targetrun -l $targetuser $targethost "mkdir -p \$@"
+$targetrun -p $targetport -l $targetuser $targethost "mkdir -p \$@"
 EOF
 	    $chmod a+rx $targetmkdir
 	    ;;
@@ -2947,11 +2954,11 @@ do
   case "\$f" in
   /*)
     $targetmkdir \`dirname \$f\`
-    $targetto $q \$f $targetuser@$targethost:\$f            || exit 1
+    $targetto -P $targetport $q \$f $targetuser@$targethost:\$f            || exit 1
     ;;
   *)
     $targetmkdir $targetdir/\`dirname \$f\`
-    $targetto $q \$f $targetuser@$targethost:$targetdir/\$f || exit 1
+    $targetto -P $targetport $q \$f $targetuser@$targethost:$targetdir/\$f || exit 1
     ;;
   esac
 done
@@ -2987,7 +2994,7 @@ EOF
 for f in \$@
 do
   $rm -f \$f
-  $targetfrom $q $targetuser@$targethost:$targetdir/\$f . || exit 1
+  $targetfrom -P $targetport $q $targetuser@$targethost:$targetdir/\$f . || exit 1
 done
 exit 0
 EOF
@@ -23741,6 +23748,7 @@ tar='$tar'
 targetarch='$targetarch'
 targetdir='$targetdir'
 targethost='$targethost'
+targetport='$targetport'
 tbl='$tbl'
 tee='$tee'
 test='$test'
-- 
2.7.4