From 4527ed8f562352e4febe72c565603d36c5a667cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 24 May 2021 22:50:09 +0100 Subject: [PATCH] Unify coreutils patches. --- sysa/coreutils-8.32/patches/Makefile.am.patch | 17 ------------ ...{printf.c.patch => gperf_dependency.patch} | 26 +++++++++++++++---- ...onfigure.ac.patch => remove_gettext.patch} | 11 ++++++++ sysa/coreutils-8.32/patches/system.h.patch | 26 ------------------- 4 files changed, 32 insertions(+), 48 deletions(-) delete mode 100644 sysa/coreutils-8.32/patches/Makefile.am.patch rename sysa/coreutils-8.32/patches/{printf.c.patch => gperf_dependency.patch} (57%) rename sysa/coreutils-8.32/patches/{configure.ac.patch => remove_gettext.patch} (80%) delete mode 100644 sysa/coreutils-8.32/patches/system.h.patch diff --git a/sysa/coreutils-8.32/patches/Makefile.am.patch b/sysa/coreutils-8.32/patches/Makefile.am.patch deleted file mode 100644 index bd2e810e..00000000 --- a/sysa/coreutils-8.32/patches/Makefile.am.patch +++ /dev/null @@ -1,17 +0,0 @@ -SPDX-FileCopyrightText: 2021 Melg Eight - -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/printf.c.patch b/sysa/coreutils-8.32/patches/gperf_dependency.patch similarity index 57% rename from sysa/coreutils-8.32/patches/printf.c.patch rename to sysa/coreutils-8.32/patches/gperf_dependency.patch index e718f514..693a1c89 100644 --- a/sysa/coreutils-8.32/patches/printf.c.patch +++ b/sysa/coreutils-8.32/patches/gperf_dependency.patch @@ -1,11 +1,10 @@ SPDX-FileCopyrightText: 2021 Melg Eight - 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. +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 @@ -32,3 +31,20 @@ we can't regenerate them. } 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/configure.ac.patch b/sysa/coreutils-8.32/patches/remove_gettext.patch similarity index 80% rename from sysa/coreutils-8.32/patches/configure.ac.patch rename to sysa/coreutils-8.32/patches/remove_gettext.patch index 0048f88d..bd5e7709 100644 --- a/sysa/coreutils-8.32/patches/configure.ac.patch +++ b/sysa/coreutils-8.32/patches/remove_gettext.patch @@ -18,3 +18,14 @@ of the build. # 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 deleted file mode 100644 index a3396601..00000000 --- a/sysa/coreutils-8.32/patches/system.h.patch +++ /dev/null @@ -1,26 +0,0 @@ -SPDX-FileCopyrightText: 2021 Melg Eight - -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" -