commit: 4527ed8f562352e4febe72c565603d36c5a667cd
parent 952ae49590552e9777e8dc0d376d0e2171612d54
Author: Andrius Štikonas <andrius@stikonas.eu>
Date: Mon, 24 May 2021 22:50:09 +0100
Unify coreutils patches.
Diffstat:
6 files changed, 81 insertions(+), 97 deletions(-)
diff --git a/sysa/coreutils-8.32/patches/Makefile.am.patch b/sysa/coreutils-8.32/patches/Makefile.am.patch
@@ -1,17 +0,0 @@
-SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com>
-
-SPDX-License-Identifier: GPL-3.0-or-later
-
-Remove dependency on po folder because we don't have gettext yet.
-
---- ./Makefile.am
-+++ ./Makefile.am
-@@ -17,7 +17,7 @@
-
- ALL_RECURSIVE_TARGETS =
-
--SUBDIRS = po . gnulib-tests
-+SUBDIRS = . gnulib-tests
-
- EXTRA_DIST = \
- .mailmap \
diff --git a/sysa/coreutils-8.32/patches/configure.ac.patch b/sysa/coreutils-8.32/patches/configure.ac.patch
@@ -1,20 +0,0 @@
-SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com>
-
-SPDX-License-Identifier: GPL-3.0-or-later
-
-Remove dependency on gettext, because we don't have it at this stage
-of the build.
-
---- ./configure.ac
-+++ ./configure.ac
-@@ -624,8 +624,8 @@ AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes])
-
- # As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in
- # translatable strings, we must use need-formatstring-macros here.
--AM_GNU_GETTEXT([external], [need-formatstring-macros])
--AM_GNU_GETTEXT_VERSION([0.19.2])
-+# AM_GNU_GETTEXT([external], [need-formatstring-macros])
-+# AM_GNU_GETTEXT_VERSION([0.19.2])
-
- # For a test of uniq: it uses the $LOCALE_FR envvar.
- gt_LOCALE_FR
diff --git a/sysa/coreutils-8.32/patches/gperf_dependency.patch b/sysa/coreutils-8.32/patches/gperf_dependency.patch
@@ -0,0 +1,50 @@
+SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com>
+SPDX-License-Identifier: GPL-3.0-or-later
+
+Remove dependency on gperf. This drops support for outputting unicode
+characters. We do that, because inclusion of unicodeio.h and propername.h
+from gnulib brings dependencies on gperf generated files. We don't have
+gperf at this stage so we can't regenerate them.
+
+--- ./src/printf.c
++++ ./src/printf.c
+@@ -59,7 +59,6 @@
+ #include "die.h"
+ #include "error.h"
+ #include "quote.h"
+-#include "unicodeio.h"
+ #include "xprintf.h"
+
+ /* The official name of this program (e.g., no 'g' prefix). */
+@@ -292,8 +291,12 @@ print_esc (const char *escstart, bool octal_0)
+ || (uni_value >= 0xd800 && uni_value <= 0xdfff))
+ die (EXIT_FAILURE, 0, _("invalid universal character name \\%c%0*x"),
+ esc_char, (esc_char == 'u' ? 4 : 8), uni_value);
+-
+- print_unicode_char (stdout, uni_value, 0);
++ putchar ('\\');
++ if (*p)
++ {
++ putchar (*p);
++ p++;
++ }
+ }
+ else
+ {
+--- ./src/system.h
++++ ./src/system.h
+@@ -361,13 +361,13 @@ enum
+ #include "version-etc.h"
+ #undef emit_bug_reporting_address
+
+-#include "propername.h"
+ /* Define away proper_name (leaving proper_name_utf8, which affects far
+ fewer programs), since it's not worth the cost of adding ~17KB to
+ the x86_64 text size of every single program. This avoids a 40%
+ (almost ~2MB) increase in the on-disk space utilization for the set
+ of the 100 binaries. */
+ #define proper_name(x) (x)
++#define proper_name_utf8(x, y) (x, y)
+
+ #include "progname.h"
+
diff --git a/sysa/coreutils-8.32/patches/printf.c.patch b/sysa/coreutils-8.32/patches/printf.c.patch
@@ -1,34 +0,0 @@
-SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com>
-
-SPDX-License-Identifier: GPL-3.0-or-later
-
-Remove dependency on unicodeio.h. This drops support for outputting unicode
-characters. We do that, because inclusion of unicodeio.h from gnulib brings
-dependencies on gperf generated files. We don't have gperf on this stage so
-we can't regenerate them.
-
---- ./src/printf.c
-+++ ./src/printf.c
-@@ -59,7 +59,6 @@
- #include "die.h"
- #include "error.h"
- #include "quote.h"
--#include "unicodeio.h"
- #include "xprintf.h"
-
- /* The official name of this program (e.g., no 'g' prefix). */
-@@ -292,8 +291,12 @@ print_esc (const char *escstart, bool octal_0)
- || (uni_value >= 0xd800 && uni_value <= 0xdfff))
- die (EXIT_FAILURE, 0, _("invalid universal character name \\%c%0*x"),
- esc_char, (esc_char == 'u' ? 4 : 8), uni_value);
--
-- print_unicode_char (stdout, uni_value, 0);
-+ putchar ('\\');
-+ if (*p)
-+ {
-+ putchar (*p);
-+ p++;
-+ }
- }
- else
- {
diff --git a/sysa/coreutils-8.32/patches/remove_gettext.patch b/sysa/coreutils-8.32/patches/remove_gettext.patch
@@ -0,0 +1,31 @@
+SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com>
+
+SPDX-License-Identifier: GPL-3.0-or-later
+
+Remove dependency on gettext, because we don't have it at this stage
+of the build.
+
+--- ./configure.ac
++++ ./configure.ac
+@@ -624,8 +624,8 @@ AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes])
+
+ # As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in
+ # translatable strings, we must use need-formatstring-macros here.
+-AM_GNU_GETTEXT([external], [need-formatstring-macros])
+-AM_GNU_GETTEXT_VERSION([0.19.2])
++# AM_GNU_GETTEXT([external], [need-formatstring-macros])
++# AM_GNU_GETTEXT_VERSION([0.19.2])
+
+ # For a test of uniq: it uses the $LOCALE_FR envvar.
+ gt_LOCALE_FR
+--- ./Makefile.am
++++ ./Makefile.am
+@@ -17,7 +17,7 @@
+
+ ALL_RECURSIVE_TARGETS =
+
+-SUBDIRS = po . gnulib-tests
++SUBDIRS = . gnulib-tests
+
+ EXTRA_DIST = \
+ .mailmap \
diff --git a/sysa/coreutils-8.32/patches/system.h.patch b/sysa/coreutils-8.32/patches/system.h.patch
@@ -1,26 +0,0 @@
-SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com>
-
-SPDX-License-Identifier: GPL-3.0-or-later
-
-Remove dependency on propername.h.
-We do that, because inclusion of propername.h from gnulib brings dependencies
-on gperf generated files. We don't have gperf at this stage so we can't
-regenerate them.
-
---- ./src/system.h
-+++ ./src/system.h
-@@ -361,13 +361,13 @@ enum
- #include "version-etc.h"
- #undef emit_bug_reporting_address
-
--#include "propername.h"
- /* Define away proper_name (leaving proper_name_utf8, which affects far
- fewer programs), since it's not worth the cost of adding ~17KB to
- the x86_64 text size of every single program. This avoids a 40%
- (almost ~2MB) increase in the on-disk space utilization for the set
- of the 100 binaries. */
- #define proper_name(x) (x)
-+#define proper_name_utf8(x, y) (x, y)
-
- #include "progname.h"
-
