Unify coreutils patches.

This commit is contained in:
Andrius Štikonas 2021-05-24 22:50:09 +01:00
parent 952ae49590
commit 4527ed8f56
4 changed files with 32 additions and 48 deletions

View File

@ -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 \

View File

@ -1,11 +1,10 @@
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.
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"

View File

@ -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 \

View File

@ -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"