Refresh patches. Remove upstreamed: 001-fix-func_append.patch Signed-off-by: Ivan Pavlov <AuthorReflex@gmail.com>
		
			
				
	
	
		
			113 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			113 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
--- a/libltdl/config/general.m4sh
 | 
						|
+++ b/libltdl/config/general.m4sh
 | 
						|
@@ -359,7 +359,7 @@ opt_warning=:
 | 
						|
 # name if it has been set yet.
 | 
						|
 func_echo ()
 | 
						|
 {
 | 
						|
-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
 | 
						|
+    $ECHO "OpenWrt-$progname: ${opt_mode+$opt_mode: }$*"
 | 
						|
 }
 | 
						|
 
 | 
						|
 # func_verbose arg...
 | 
						|
@@ -385,14 +385,14 @@ func_echo_all ()
 | 
						|
 # Echo program name prefixed message to standard error.
 | 
						|
 func_error ()
 | 
						|
 {
 | 
						|
-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
 | 
						|
+    $ECHO "OpenWrt-$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
 | 
						|
 }
 | 
						|
 
 | 
						|
 # func_warning arg...
 | 
						|
 # Echo program name prefixed warning message to standard error.
 | 
						|
 func_warning ()
 | 
						|
 {
 | 
						|
-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 | 
						|
+    $opt_warning && $ECHO "OpenWrt-$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 | 
						|
 
 | 
						|
     # bash bug again:
 | 
						|
     :
 | 
						|
--- a/libltdl/config/ltmain.sh
 | 
						|
+++ b/libltdl/config/ltmain.sh
 | 
						|
@@ -439,7 +439,7 @@ opt_warning=:
 | 
						|
 # name if it has been set yet.
 | 
						|
 func_echo ()
 | 
						|
 {
 | 
						|
-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
 | 
						|
+    $ECHO "OpenWrt-$progname: ${opt_mode+$opt_mode: }$*"
 | 
						|
 }
 | 
						|
 
 | 
						|
 # func_verbose arg...
 | 
						|
@@ -465,14 +465,14 @@ func_echo_all ()
 | 
						|
 # Echo program name prefixed message to standard error.
 | 
						|
 func_error ()
 | 
						|
 {
 | 
						|
-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
 | 
						|
+    $ECHO "OpenWrt-$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
 | 
						|
 }
 | 
						|
 
 | 
						|
 # func_warning arg...
 | 
						|
 # Echo program name prefixed warning message to standard error.
 | 
						|
 func_warning ()
 | 
						|
 {
 | 
						|
-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 | 
						|
+    $opt_warning && $ECHO "OpenWrt-$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 | 
						|
 
 | 
						|
     # bash bug again:
 | 
						|
     :
 | 
						|
--- a/libtoolize.in
 | 
						|
+++ b/libtoolize.in
 | 
						|
@@ -648,7 +648,7 @@ opt_warning=:
 | 
						|
 # name if it has been set yet.
 | 
						|
 func_echo ()
 | 
						|
 {
 | 
						|
-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
 | 
						|
+    $ECHO "OpenWrt-$progname: ${opt_mode+$opt_mode: }$*"
 | 
						|
 }
 | 
						|
 
 | 
						|
 # func_verbose arg...
 | 
						|
@@ -674,14 +674,14 @@ func_echo_all ()
 | 
						|
 # Echo program name prefixed message to standard error.
 | 
						|
 func_error ()
 | 
						|
 {
 | 
						|
-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
 | 
						|
+    $ECHO "OpenWrt-$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
 | 
						|
 }
 | 
						|
 
 | 
						|
 # func_warning arg...
 | 
						|
 # Echo program name prefixed warning message to standard error.
 | 
						|
 func_warning ()
 | 
						|
 {
 | 
						|
-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 | 
						|
+    $opt_warning && $ECHO "OpenWrt-$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 | 
						|
 
 | 
						|
     # bash bug again:
 | 
						|
     :
 | 
						|
--- a/tests/defs.in
 | 
						|
+++ b/tests/defs.in
 | 
						|
@@ -596,7 +596,7 @@ opt_warning=:
 | 
						|
 # name if it has been set yet.
 | 
						|
 func_echo ()
 | 
						|
 {
 | 
						|
-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
 | 
						|
+    $ECHO "OpenWrt-$progname: ${opt_mode+$opt_mode: }$*"
 | 
						|
 }
 | 
						|
 
 | 
						|
 # func_verbose arg...
 | 
						|
@@ -622,14 +622,14 @@ func_echo_all ()
 | 
						|
 # Echo program name prefixed message to standard error.
 | 
						|
 func_error ()
 | 
						|
 {
 | 
						|
-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
 | 
						|
+    $ECHO "OpenWrt-$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
 | 
						|
 }
 | 
						|
 
 | 
						|
 # func_warning arg...
 | 
						|
 # Echo program name prefixed warning message to standard error.
 | 
						|
 func_warning ()
 | 
						|
 {
 | 
						|
-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 | 
						|
+    $opt_warning && $ECHO "OpenWrt-$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 | 
						|
 
 | 
						|
     # bash bug again:
 | 
						|
     :
 |