-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
7224ffa
commit 127ba08
Showing
14 changed files
with
275 additions
and
1,166 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
diff --git a/build-aux/ar-lib b/build-aux/ar-lib | ||
index 17de55e79c..33f0b676ef 100644 | ||
index 1521987496..fa651e18a5 100644 | ||
--- a/build-aux/ar-lib | ||
+++ b/build-aux/ar-lib | ||
@@ -1,6 +1,11 @@ | ||
|
@@ -12,9 +12,9 @@ index 17de55e79c..33f0b676ef 100644 | |
+ . "$(dirname "$(readlink -f "$0")")/wrapper_helper.sh" "$@" | ||
+fi | ||
me=ar-lib | ||
scriptversion=2019-07-04.01; # UTC | ||
scriptversion=2024-06-19.01; # UTC | ||
|
||
@@ -29,6 +34,14 @@ scriptversion=2019-07-04.01; # UTC | ||
@@ -29,6 +34,14 @@ scriptversion=2024-06-19.01; # UTC | ||
# bugs to <[email protected]> or send patches to | ||
# <[email protected]>. | ||
|
||
|
@@ -57,7 +57,7 @@ index 17de55e79c..33f0b676ef 100644 | |
done | ||
} | ||
|
||
@@ -205,7 +223,7 @@ if test -n "$delete"; then | ||
@@ -209,7 +227,7 @@ if test -n "$delete"; then | ||
;; | ||
*) | ||
func_file_conv "$1" | ||
|
@@ -66,7 +66,7 @@ index 17de55e79c..33f0b676ef 100644 | |
;; | ||
esac | ||
done | ||
@@ -223,15 +241,15 @@ elif test -n "$extract"; then | ||
@@ -227,15 +245,15 @@ elif test -n "$extract"; then | ||
;; | ||
*) | ||
func_file_conv "$1" | ||
|
@@ -85,7 +85,7 @@ index 17de55e79c..33f0b676ef 100644 | |
done | ||
fi | ||
|
||
@@ -262,14 +280,14 @@ elif test -n "$quick$replace"; then | ||
@@ -266,14 +284,14 @@ elif test -n "$quick$replace"; then | ||
done | ||
|
||
if test -n "$orig_archive"; then | ||
|
@@ -104,7 +104,7 @@ index 17de55e79c..33f0b676ef 100644 | |
+ func_ar_run -LIST ${COLOR_MAJOR}"$archive"${COLOR_NONE} | ||
fi | ||
diff --git a/build-aux/compile b/build-aux/compile | ||
index ba883b54aa..4e9157a535 100644 | ||
index 49b3d05fde..a88792bed9 100644 | ||
--- a/build-aux/compile | ||
+++ b/build-aux/compile | ||
@@ -1,5 +1,10 @@ | ||
|
@@ -116,7 +116,7 @@ index ba883b54aa..4e9157a535 100644 | |
+ . "$(dirname "$(readlink -f "$0")")/wrapper_helper.sh" "$@" | ||
+fi | ||
|
||
scriptversion=2018-03-07.03; # UTC | ||
scriptversion=2024-06-19.01; # UTC | ||
|
||
@@ -49,6 +54,10 @@ func_file_conv () | ||
/ | /[!/]*) # absolute file, and not a UNC file | ||
|
@@ -242,7 +242,7 @@ index ba883b54aa..4e9157a535 100644 | |
do | ||
@@ -145,16 +189,32 @@ func_cl_wrapper () | ||
case $2 in | ||
*.o | *.[oO][bB][jJ]) | ||
*.o | *.lo | *.[oO][bB][jJ]) | ||
func_file_conv "$2" | ||
- set x "$@" -Fo"$file" | ||
+ set x "$@" -Fo${COLOR_MAJOR}"$file"${COLOR_NONE} | ||
|
4 changes: 2 additions & 2 deletions
4
patches/patches_GNULIB_FIX_SYSSTAT_TIMESPEC_DISABLE_BUG.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 7 additions & 7 deletions
14
patches/patches_GNULIB_GNULIB_TOOL_APPLY_PATCHES_BY_FILE.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
diff --git a/gnulib-tool b/gnulib-tool | ||
index ae1b17f4dd..7b38761978 100644 | ||
--- a/gnulib-tool | ||
+++ b/gnulib-tool | ||
@@ -1793,7 +1793,7 @@ func_lookup_file () | ||
diff --git a/gnulib-tool.sh b/gnulib-tool.sh | ||
index d4f8792898..0e291be22e 100644 | ||
--- a/gnulib-tool.sh | ||
+++ b/gnulib-tool.sh | ||
@@ -1825,7 +1825,7 @@ func_lookup_file () | ||
IFS="$PATH_SEPARATOR" | ||
for patchfile in $lkpatches; do | ||
IFS="$save_IFS" | ||
IFS="$saved_IFS" | ||
- patch -s "$tmp/$lkbase" < "$patchfile" >&2 \ | ||
+ patch --ignore-whitespace -i "$patchfile" "$tmp/$lkbase" >&2 \ | ||
|| func_fatal_error "patch file $patchfile didn't apply cleanly" | ||
done | ||
IFS="$save_IFS" | ||
IFS="$saved_IFS" |
8 changes: 4 additions & 4 deletions
8
patches/patches_GNULIB_MSVC_PARAMETER_HANDLER_M4_MACRO_FIX.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
diff --git a/m4/printf.m4 b/m4/printf.m4 | ||
index 8b8f01067f..198e3363b7 100644 | ||
index 4c3e8ecf2d..e1d99ea315 100644 | ||
--- a/m4/printf.m4 | ||
+++ b/m4/printf.m4 | ||
@@ -908,6 +908,7 @@ int main () | ||
@@ -931,6 +931,7 @@ int main () | ||
{ | ||
int count = -1; | ||
#ifdef _MSC_VER | ||
+ _set_error_mode(1); #1 being _OUT_TO_STDERR, disable abort/retry/ignore popup in debug mode | ||
_set_invalid_parameter_handler (invalid_parameter_handler); | ||
#endif | ||
/* Copy the format string. Some systems (glibc with _FORTIFY_SOURCE=2) | ||
/* Also avoid an Abort/Retry/Ignore dialog in debug builds. | ||
<https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/crtsetreportmode> */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.