gentoo resync : 14.07.2018

3 files changed, 89 insertions, 0 deletions

diff --git a/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch b/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch
new file mode 100644
index 000000000000..ff4e970a4fd4
--- /dev/null
+++ b/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch
@@ -0,0 +1,45 @@
+fix from upstream:
+
+2004-03-05  Daniel Jacobowitz  <drow@mvista.com>
+                                                                                
+	* lib/remote.exp (standard_spawn): Fix rsh username support.
+
+diff --git a/lib/remote.exp b/lib/remote.exp
+index b57276e..cdec0d2 100644
+--- a/lib/remote.exp
++++ b/lib/remote.exp
+@@ -860,19 +860,18 @@ proc standard_spawn { dest commandline } {
+         set RSH [board_info $dest rsh_prog]
+     }
+ 
+-    if ![board_info $dest exists username] {
+-        set rsh_useropts ""
+-    } else {
+-        set rsh_useropts "-l $username"
+-    }
+-
+     if [board_info $dest exists hostname] {
+ 	set remote [board_info $dest hostname]
+     } else {
+ 	set remote $dest
+     }
+ 
+-    spawn $RSH $rsh_useropts $remote $commandline
++    if ![board_info $dest exists username] {
++        spawn $RSH $remote $commandline
++    } else {
++        spawn $RSH -l [board_info $dest username] $remote $commandline
++    }
++
+     set board_info($dest,fileid) $spawn_id
+     return $spawn_id
+ }
+@@ -1257,6 +1256,8 @@ proc remote_expect { board timeout args } {
+     }
+ 
+     if {$code == 1} {
++        if {[info exists string]} {send_user "ERROR OCCURED: $errorInfo $errorCode $string"}
++
+ 	if { $error_sect != "" } {
+ 	    set code [catch {uplevel $error_sect} string]
+ 	} else {
diff --git a/dev-util/dejagnu/files/dejagnu-1.4.4-testglue-protos.patch b/dev-util/dejagnu/files/dejagnu-1.4.4-testglue-protos.patch
new file mode 100644
index 000000000000..4ddaffb1c66d
--- /dev/null
+++ b/dev-util/dejagnu/files/dejagnu-1.4.4-testglue-protos.patch
@@ -0,0 +1,21 @@
+fix from upstream:
+
+2004-08-20  Daniel Jacobowitz  <dan@debian.org>
+
+	* testglue.c: Prototype abort(3) and exit(3).
+
+diff --git a/testglue.c b/testglue.c
+index 55a7f92..4ede6eb 100644
+--- a/testglue.c
++++ b/testglue.c
+@@ -40,6 +40,10 @@
+ #define ORIG_ABORT __wrap_abort
+ #define ORIG_MAIN __wrap_main
+ #endif
++
++extern void abort (void);
++extern void exit (int);
++
+ #endif
+ 
+ #ifdef REAL_MAIN
diff --git a/dev-util/dejagnu/files/dejagnu-ignore-libwarning.patch b/dev-util/dejagnu/files/dejagnu-ignore-libwarning.patch
new file mode 100644
index 000000000000..f4af06e6ff89
--- /dev/null
+++ b/dev-util/dejagnu/files/dejagnu-ignore-libwarning.patch
@@ -0,0 +1,23 @@
+dejagnu/ChangeLog
+	* lib/target.exp (prune_warnings): Correct pic/PIC regexp.
+	Ignore incompatible library warning.
+
+Index: dejagnu/lib/target.exp
+===================================================================
+RCS file: /cvs/src/src/dejagnu/lib/target.exp,v
+retrieving revision 1.12
+diff -u -p -r1.12 target.exp
+--- dejagnu/lib/target.exp	21 Apr 2002 08:47:07 -0000	1.12
++++ dejagnu/lib/target.exp	9 Jun 2003 07:34:06 -0000
+@@ -279,7 +279,10 @@ proc prune_warnings { text } {
+     regsub -all "(^|\n)\[^\n\]*: warning:   as it has already been specified\[^\n\]*" $text "" text
+ 
+     # Cygwin cc1 warns about -fpic and -fPIC
+-    regsub -all ".*: warning: -f(pic|PIC) ignored for target .*" $text "" text
++    regsub -all "(^|\n)\[^\n\]*: warning: -f(pic|PIC) ignored for target \[^\n\]*" $text "" text
++
++    # Ignore linker warning when searching 64bit libraries in /lib.
++    regsub -all "(^|\n)\[^\n\]*: skipping incompatible \[^\n\]* when searching for \[^\n\]*" $text "" text
+ 
+     # It might be tempting to get carried away and delete blank lines, etc.
+     # Just delete *exactly* what we're ask to, and that's it.