-
-
Notifications
You must be signed in to change notification settings - Fork 17
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
Showing
12 changed files
with
449 additions
and
1 deletion.
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
70 changes: 70 additions & 0 deletions
70
.../gettext-0.20.2-configure/0001-libtool-hide-using-cross-tools-not-prefixed-with-hos.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 |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| From: Michele Locati <michele@locati.it> | ||
| Date: Fri, 10 May 2019 10:25:28 +0200 | ||
| Subject: [PATCH] libtool: hide "using cross tools not prefixed with host | ||
| triplet" | ||
|
|
||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -32,6 +32,7 @@ else | ||
| esac | ||
| fi | ||
|
|
||
| +ac_tool_warned=yes | ||
|
|
||
| as_nl=' | ||
| ' | ||
|
|
||
| --- a/gettext-runtime/configure | ||
| +++ b/gettext-runtime/configure | ||
| @@ -32,6 +32,7 @@ else | ||
| esac | ||
| fi | ||
|
|
||
| +ac_tool_warned=yes | ||
|
|
||
| as_nl=' | ||
| ' | ||
|
|
||
| --- a/gettext-runtime/libasprintf/configure | ||
| +++ b/gettext-runtime/libasprintf/configure | ||
| @@ -30,6 +30,7 @@ else | ||
| esac | ||
| fi | ||
|
|
||
| +ac_tool_warned=yes | ||
|
|
||
| as_nl=' | ||
| ' | ||
|
|
||
| --- a/gettext-tools/configure | ||
| +++ b/gettext-tools/configure | ||
| @@ -32,6 +32,7 @@ else | ||
| esac | ||
| fi | ||
|
|
||
| +ac_tool_warned=yes | ||
|
|
||
| as_nl=' | ||
| ' | ||
|
|
||
| --- a/gettext-tools/examples/configure | ||
| +++ b/gettext-tools/examples/configure | ||
| @@ -32,6 +32,7 @@ else | ||
| esac | ||
| fi | ||
|
|
||
| +ac_tool_warned=yes | ||
|
|
||
| as_nl=' | ||
| ' | ||
|
|
||
| --- a/libtextstyle/configure | ||
| +++ b/libtextstyle/configure | ||
| @@ -30,6 +30,7 @@ else | ||
| esac | ||
| fi | ||
|
|
||
| +ac_tool_warned=yes | ||
|
|
||
| as_nl=' | ||
| ' |
39 changes: 39 additions & 0 deletions
39
patches/gettext-0.20.2-configure/0002-libtool-hide-library-was-moved.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 |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| From: Michele Locati <michele@locati.it> | ||
| Date: Fri, 10 May 2019 10:35:49 +0200 | ||
| Subject: [PATCH] libtool: hide "library was moved" | ||
|
|
||
| --- a/build-aux/ltmain.sh | ||
| +++ b/build-aux/ltmain.sh | ||
| @@ -7956,7 +7956,7 @@ func_mode_link () | ||
| # Find the relevant object directory and library name. | ||
| if test yes = "$installed"; then | ||
| if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then | ||
| - func_warning "library '$lib' was moved." | ||
| + #func_warning "library '$lib' was moved." | ||
| dir=$ladir | ||
| absdir=$abs_ladir | ||
| libdir=$abs_ladir | ||
|
|
||
| --- a/gettext-tools/examples/hello-c++-kde/admin/ltmain.sh | ||
| +++ b/gettext-tools/examples/hello-c++-kde/admin/ltmain.sh | ||
| @@ -1958,7 +1958,7 @@ EOF | ||
| # Find the relevant object directory and library name. | ||
| if test "X$installed" = Xyes; then | ||
| if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then | ||
| - $echo "$modename: warning: library \`$lib' was moved." 1>&2 | ||
| + #$echo "$modename: warning: library \`$lib' was moved." 1>&2 | ||
| dir="$ladir" | ||
| absdir="$abs_ladir" | ||
| libdir="$abs_ladir" | ||
|
|
||
| --- a/libtextstyle/build-aux/ltmain.sh | ||
| +++ b/libtextstyle/build-aux/ltmain.sh | ||
| @@ -7956,7 +7956,7 @@ func_mode_link () | ||
| # Find the relevant object directory and library name. | ||
| if test yes = "$installed"; then | ||
| if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then | ||
| - func_warning "library '$lib' was moved." | ||
| + #func_warning "library '$lib' was moved." | ||
| dir=$ladir | ||
| absdir=$abs_ladir | ||
| libdir=$abs_ladir |
35 changes: 35 additions & 0 deletions
35
patches/gettext-0.20.2-configure/0003-libtool-hide-Could-not-determine-host-file-name.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 |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| From: Michele Locati <michele@locati.it> | ||
| Date: Fri, 10 May 2019 10:35:49 +0200 | ||
| Subject: [PATCH] libtool: hide "Could not determine host file name" | ||
|
|
||
| --- a/build-aux/ltmain.sh | ||
| +++ b/build-aux/ltmain.sh | ||
| @@ -2891,9 +2891,9 @@ func_convert_path_check () | ||
| $debug_cmd | ||
|
|
||
| if test -z "$4" && test -n "$3"; then | ||
| - func_error "Could not determine the host path corresponding to" | ||
| - func_error " '$3'" | ||
| - func_error "Continuing, but uninstalled executables may not work." | ||
| + #func_error "Could not determine the host path corresponding to" | ||
| + #func_error " '$3'" | ||
| + #func_error "Continuing, but uninstalled executables may not work." | ||
| # Fallback. This is a deliberately simplistic "conversion" and | ||
| # should not be "improved". See libtool.info. | ||
| if test "x$1" != "x$2"; then | ||
|
|
||
| --- a/libtextstyle/build-aux/ltmain.sh | ||
| +++ b/libtextstyle/build-aux/ltmain.sh | ||
| @@ -2891,9 +2891,9 @@ func_convert_path_check () | ||
| $debug_cmd | ||
|
|
||
| if test -z "$4" && test -n "$3"; then | ||
| - func_error "Could not determine the host path corresponding to" | ||
| - func_error " '$3'" | ||
| - func_error "Continuing, but uninstalled executables may not work." | ||
| + #func_error "Could not determine the host path corresponding to" | ||
| + #func_error " '$3'" | ||
| + #func_error "Continuing, but uninstalled executables may not work." | ||
| # Fallback. This is a deliberately simplistic "conversion" and | ||
| # should not be "improved". See libtool.info. | ||
| if test "x$1" != "x$2"; then |
90 changes: 90 additions & 0 deletions
90
patches/gettext-0.20.2-configure/0004-Avoid-xalloc_oversized-redefined.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 |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| From: Michele Locati <michele@locati.it> | ||
| Date: Fri, 10 May 2019 10:45:12 +0200 | ||
| Subject: [PATCH] Avoid "xalloc_oversized" redefined | ||
|
|
||
| --- a/gettext-runtime/gnulib-lib/xalloc-oversized.h | ||
| +++ b/gettext-runtime/gnulib-lib/xalloc-oversized.h | ||
| @@ -41,6 +41,7 @@ typedef size_t __xalloc_count_type; | ||
| positive and N must be nonnegative. This is a macro, not a | ||
| function, so that it works correctly even when SIZE_MAX < N. */ | ||
|
|
||
| +#undef xalloc_oversized | ||
| #if 7 <= __GNUC__ | ||
| # define xalloc_oversized(n, s) \ | ||
| __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1) | ||
|
|
||
| --- a/gettext-runtime/gnulib-lib/xalloc.h | ||
| +++ b/gettext-runtime/gnulib-lib/xalloc.h | ||
| @@ -146,6 +146,7 @@ extern char *xstrdup (const char *string); | ||
| sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for | ||
| exactly-SIZE_MAX allocations on such hosts; this avoids a test and | ||
| branch when S is known to be 1. */ | ||
| +#undef xalloc_oversized | ||
| # define xalloc_oversized(n, s) \ | ||
| ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n)) | ||
|
|
||
|
|
||
| --- a/gettext-tools/gnulib-lib/xalloc-oversized.h | ||
| +++ b/gettext-tools/gnulib-lib/xalloc-oversized.h | ||
| @@ -41,6 +41,7 @@ typedef size_t __xalloc_count_type; | ||
| positive and N must be nonnegative. This is a macro, not a | ||
| function, so that it works correctly even when SIZE_MAX < N. */ | ||
|
|
||
| +#undef xalloc_oversized | ||
| #if 7 <= __GNUC__ | ||
| # define xalloc_oversized(n, s) \ | ||
| __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1) | ||
|
|
||
| --- a/gettext-tools/gnulib-lib/xalloc.h | ||
| +++ b/gettext-tools/gnulib-lib/xalloc.h | ||
| @@ -146,6 +146,7 @@ extern char *xstrdup (const char *string); | ||
| sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for | ||
| exactly-SIZE_MAX allocations on such hosts; this avoids a test and | ||
| branch when S is known to be 1. */ | ||
| +#undef xalloc_oversized | ||
| # define xalloc_oversized(n, s) \ | ||
| ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n)) | ||
|
|
||
|
|
||
| --- a/gettext-tools/libgettextpo/xalloc-oversized.h | ||
| +++ b/gettext-tools/libgettextpo/xalloc-oversized.h | ||
| @@ -41,6 +41,7 @@ typedef size_t __xalloc_count_type; | ||
| positive and N must be nonnegative. This is a macro, not a | ||
| function, so that it works correctly even when SIZE_MAX < N. */ | ||
|
|
||
| +#undef xalloc_oversized | ||
| #if 7 <= __GNUC__ | ||
| # define xalloc_oversized(n, s) \ | ||
| __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1) | ||
|
|
||
| --- a/gettext-tools/libgettextpo/xalloc.h | ||
| +++ b/gettext-tools/libgettextpo/xalloc.h | ||
| @@ -146,6 +146,7 @@ extern char *xstrdup (const char *string); | ||
| sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for | ||
| exactly-SIZE_MAX allocations on such hosts; this avoids a test and | ||
| branch when S is known to be 1. */ | ||
| +#undef xalloc_oversized | ||
| # define xalloc_oversized(n, s) \ | ||
| ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n)) | ||
|
|
||
|
|
||
| --- a/gnulib-local/lib/xalloc.h | ||
| +++ b/gnulib-local/lib/xalloc.h | ||
| @@ -146,6 +146,7 @@ extern char *xstrdup (const char *string); | ||
| sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for | ||
| exactly-SIZE_MAX allocations on such hosts; this avoids a test and | ||
| branch when S is known to be 1. */ | ||
| +#undef xalloc_oversized | ||
| # define xalloc_oversized(n, s) \ | ||
| ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n)) | ||
|
|
||
|
|
||
| --- a/libtextstyle/lib/xalloc.h | ||
| +++ b/libtextstyle/lib/xalloc.h | ||
| @@ -146,6 +146,7 @@ extern char *xstrdup (const char *string); | ||
| sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for | ||
| exactly-SIZE_MAX allocations on such hosts; this avoids a test and | ||
| branch when S is known to be 1. */ | ||
| +#undef xalloc_oversized | ||
| # define xalloc_oversized(n, s) \ | ||
| ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n)) |
27 changes: 27 additions & 0 deletions
27
patches/gettext-0.20.2-configure/0005-libtool-hide-seems-to-be-moved.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 |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| From: Michele Locati <michele@locati.it> | ||
| Date: Fri, 10 May 2019 11:04:38 +0200 | ||
| Subject: [PATCH] libtool: hide "seems to be moved" | ||
|
|
||
| --- a/build-aux/ltmain.sh | ||
| +++ b/build-aux/ltmain.sh | ||
| @@ -8523,7 +8523,7 @@ func_mode_link () | ||
| eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | ||
| test -z "$libdir" && \ | ||
| func_fatal_error "'$deplib' is not a valid libtool archive" | ||
| - test "$absdir" != "$libdir" && \ | ||
| + false && test "$absdir" != "$libdir" && \ | ||
| func_warning "'$deplib' seems to be moved" | ||
|
|
||
| path=-L$absdir | ||
|
|
||
| --- a/libtextstyle/build-aux/ltmain.sh | ||
| +++ b/libtextstyle/build-aux/ltmain.sh | ||
| @@ -8523,7 +8523,7 @@ func_mode_link () | ||
| eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | ||
| test -z "$libdir" && \ | ||
| func_fatal_error "'$deplib' is not a valid libtool archive" | ||
| - test "$absdir" != "$libdir" && \ | ||
| + false && test "$absdir" != "$libdir" && \ | ||
| func_warning "'$deplib' seems to be moved" | ||
|
|
||
| path=-L$absdir |
17 changes: 17 additions & 0 deletions
17
patches/gettext-0.20.2-configure/0006-Fix-compilation-of-pthread_sigmask.c.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 |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| From: Michele Locati <michele@locati.it> | ||
| Date: Fri, 10 May 2019 11:11:02 +0200 | ||
| Subject: [PATCH] Fix compilation of pthread_sigmask.c | ||
|
|
||
| --- a/gettext-tools/gnulib-tests/pthread_sigmask.c | ||
| +++ b/gettext-tools/gnulib-tests/pthread_sigmask.c | ||
| @@ -30,9 +30,9 @@ | ||
| # include <unistd.h> | ||
| #endif | ||
|
|
||
| +#undef pthread_sigmask | ||
| int | ||
| pthread_sigmask (int how, const sigset_t *new_mask, sigset_t *old_mask) | ||
| -#undef pthread_sigmask | ||
| { | ||
| #if HAVE_PTHREAD_SIGMASK | ||
| int ret; |
27 changes: 27 additions & 0 deletions
27
patches/gettext-0.20.2-configure/0007-libtool-hide-remember-to-run.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 |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| From: Michele Locati <michele@locati.it> | ||
| Date: Fri, 10 May 2019 11:16:55 +0200 | ||
| Subject: [PATCH] libtool: hide "remember to run" | ||
|
|
||
| --- a/build-aux/ltmain.sh | ||
| +++ b/build-aux/ltmain.sh | ||
| @@ -4543,7 +4543,7 @@ func_mode_install () | ||
| func_execute_cmds "$old_postinstall_cmds" 'exit $?' | ||
| done | ||
|
|
||
| - test -n "$future_libdirs" && \ | ||
| + false && test -n "$future_libdirs" && \ | ||
| func_warning "remember to run '$progname --finish$future_libdirs'" | ||
|
|
||
| if test -n "$current_libdirs"; then | ||
|
|
||
| --- a/libtextstyle/build-aux/ltmain.sh | ||
| +++ b/libtextstyle/build-aux/ltmain.sh | ||
| @@ -4543,7 +4543,7 @@ func_mode_install () | ||
| func_execute_cmds "$old_postinstall_cmds" 'exit $?' | ||
| done | ||
|
|
||
| - test -n "$future_libdirs" && \ | ||
| + false && test -n "$future_libdirs" && \ | ||
| func_warning "remember to run '$progname --finish$future_libdirs'" | ||
|
|
||
| if test -n "$current_libdirs"; then |
39 changes: 39 additions & 0 deletions
39
patches/gettext-0.20.2-configure/0008-libtool-hide-has-not-been-installed-in.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 |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| From: Michele Locati <michele@locati.it> | ||
| Date: Fri, 10 May 2019 11:24:34 +0200 | ||
| Subject: [PATCH] libtool: hide "has not been installed in" | ||
|
|
||
| --- a/build-aux/ltmain.sh | ||
| +++ b/build-aux/ltmain.sh | ||
| @@ -4458,7 +4458,7 @@ func_mode_install () | ||
| fi | ||
| libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` | ||
| if test -n "$libdir" && test ! -f "$libfile"; then | ||
| - func_warning "'$lib' has not been installed in '$libdir'" | ||
| + #func_warning "'$lib' has not been installed in '$libdir'" | ||
| finalize=false | ||
| fi | ||
| done | ||
|
|
||
| --- a/gettext-tools/examples/hello-c++-kde/admin/ltmain.sh | ||
| +++ b/gettext-tools/examples/hello-c++-kde/admin/ltmain.sh | ||
| @@ -4853,7 +4853,7 @@ relink_command=\"$relink_command\"" | ||
| fi | ||
| libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test | ||
| if test -n "$libdir" && test ! -f "$libfile"; then | ||
| - $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 | ||
| + #$echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 | ||
| finalize=no | ||
| fi | ||
| done | ||
|
|
||
| --- a/libtextstyle/build-aux/ltmain.sh | ||
| +++ b/libtextstyle/build-aux/ltmain.sh | ||
| @@ -4458,7 +4458,7 @@ func_mode_install () | ||
| fi | ||
| libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` | ||
| if test -n "$libdir" && test ! -f "$libfile"; then | ||
| - func_warning "'$lib' has not been installed in '$libdir'" | ||
| + #func_warning "'$lib' has not been installed in '$libdir'" | ||
| finalize=false | ||
| fi | ||
| done |
Oops, something went wrong.