From 17ccfe132d122655e3d1849f696677914108872705fd619ef91721feaf1821c9 Mon Sep 17 00:00:00 2001 From: Bernhard Voelker Date: Mon, 4 Oct 2021 22:48:12 +0000 Subject: [PATCH] - coreutils-i18n.patch: Re-sync the patch with Fedora. Refresh the patch, adding a hunk to link the expand+unexpand tools against lib/mbfile.c, thus fixing build problems with clang (see https://src.fedoraproject.org/rpms/coreutils/c/f4a53e34). OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=324 --- coreutils-i18n.patch | 21 +++++++++++++++++++-- coreutils.changes | 8 ++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch index 0d7f263..6e54250 100644 --- a/coreutils-i18n.patch +++ b/coreutils-i18n.patch @@ -8,12 +8,14 @@ src/expand-common.c | 114 ++++++ src/expand-common.h | 12 src/expand.c | 90 ++++- - src/fold.c | 308 ++++++++++++++++- + src/fold.c | 312 ++++++++++++++++- src/join.c | 359 +++++++++++++++++--- + src/local.mk | 4 src/pr.c | 443 ++++++++++++++++++++++--- src/sort.c | 772 +++++++++++++++++++++++++++++++++++++++++--- src/unexpand.c | 101 ++++- src/uniq.c | 119 ++++++ + tests/Coreutils.pm | 3 tests/expand/mb.sh | 183 ++++++++++ tests/i18n/sort.sh | 29 + tests/local.mk | 4 @@ -27,7 +29,7 @@ tests/misc/uniq.pl | 55 +++ tests/pr/pr-tests.pl | 49 ++ tests/unexpand/mb.sh | 172 +++++++++ - 29 files changed, 3632 insertions(+), 210 deletions(-) + 31 files changed, 3640 insertions(+), 213 deletions(-) create mode 100644 lib/mbfile.c create mode 100644 lib/mbfile.h create mode 100644 m4/mbfile.m4 @@ -5349,3 +5351,18 @@ Index: tests/Coreutils.pm if ($max < length $test_name) { warn "$program_name: $test_name: test name is too long (> $max)\n"; +Index: src/local.mk +=================================================================== +--- src/local.mk.orig ++++ src/local.mk +@@ -429,8 +429,8 @@ src_base32_CPPFLAGS = -DBASE_TYPE=32 $(A + src_basenc_SOURCES = src/basenc.c + src_basenc_CPPFLAGS = -DBASE_TYPE=42 $(AM_CPPFLAGS) + +-src_expand_SOURCES = src/expand.c src/expand-common.c +-src_unexpand_SOURCES = src/unexpand.c src/expand-common.c ++src_expand_SOURCES = src/expand.c src/expand-common.c lib/mbfile.c ++src_unexpand_SOURCES = src/unexpand.c src/expand-common.c lib/mbfile.c + + src_wc_SOURCES = src/wc.c + if USE_AVX2_WC_LINECOUNT diff --git a/coreutils.changes b/coreutils.changes index 7abed7e..3203727 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Oct 4 22:15:01 UTC 2021 - Bernhard Voelker + +- coreutils-i18n.patch: Re-sync the patch with Fedora. + Refresh the patch, adding a hunk to link the expand+unexpand tools + against lib/mbfile.c, thus fixing build problems with clang + (see https://src.fedoraproject.org/rpms/coreutils/c/f4a53e34). + ------------------------------------------------------------------- Fri Oct 1 19:38:16 UTC 2021 - Dirk Müller