SPDX-FileCopyrightText: 2021 Melg Eight 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"