From d7dbef5ec04202a2195ae6204c0758b715f6d57a Mon Sep 17 00:00:00 2001 From: xdavidwu Date: Tue, 8 Aug 2023 00:14:05 +0800 Subject: [PATCH] systemd: -lintl only for userspace avoid tainting efi build --- .../0103-meson-lintl-for-musl-gettext.patch | 25 +++++++++++++++++++ systemd/APKBUILD | 6 +++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 systemd/0103-meson-lintl-for-musl-gettext.patch diff --git a/systemd/0103-meson-lintl-for-musl-gettext.patch b/systemd/0103-meson-lintl-for-musl-gettext.patch new file mode 100644 index 0000000..8ea8085 --- /dev/null +++ b/systemd/0103-meson-lintl-for-musl-gettext.patch @@ -0,0 +1,25 @@ +From 2541d4ee00ee2da0e8ee35f48ead7d1271cedc26 Mon Sep 17 00:00:00 2001 +From: xdavidwu +Date: Tue, 8 Aug 2023 00:11:58 +0800 +Subject: [PATCH] meson: -lintl for musl+gettext + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 395eca1..c5cf936 100644 +--- a/meson.build ++++ b/meson.build +@@ -322,7 +322,7 @@ conf.set10('FIRST_BOOT_FULL_PRESET', get_option('first- + + cc = meson.get_compiler('c') + userspace_c_args = [] +-userspace_c_ld_args = [] ++userspace_c_ld_args = ['-lintl'] + meson_build_sh = find_program('tools/meson-build.sh') + + want_tests = get_option('tests') +-- +2.41.0 + diff --git a/systemd/APKBUILD b/systemd/APKBUILD index 0e079f8..5f5bc22 100644 --- a/systemd/APKBUILD +++ b/systemd/APKBUILD @@ -40,14 +40,15 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/systemd/systemd-stable/archi 0029-shared-Do-not-use-malloc_info-on-musl.patch 0100-Do-not-buffer-on-systemd-sleep.patch 0101-efi-do-not-set-wide-exec-charset.patch - 0102-efi-hack-out-musl-wchar-definition.patch" + 0102-efi-hack-out-musl-wchar-definition.patch + 0103-meson-lintl-for-musl-gettext.patch" pkgusers="systemd-network systemd-resolve systemd-coredump" pkggroups="systemd-journal" provides="hwids-udev=99999999 eudev=99 eudev-libs=99" builddir="$srcdir/systemd-stable-$pkgver" build() { - env LDFLAGS=" -lintl " CFLAGS=" -D__UAPI_DEF_ETHHDR=0 " meson \ + env CFLAGS=" -D__UAPI_DEF_ETHHDR=0 " meson \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -179,4 +180,5 @@ fcee3a9384cb27083b82792a246045b1d1d974ee200fd772661766e9445ea36d8c0c9003527783f2 9737f2d261fca96f0038489e0d3b166de015a76aa8738413afa8a44da6ebb6c9cf55f4642b9b2ddd9000f76880dc9b2b077ac655597b11cdb79ccfb0196190bd 0100-Do-not-buffer-on-systemd-sleep.patch 4ea51f1b47140ee79d738fa983c42402ed0bb4c5ae79880fd30555c7571b5e0a4e7e86457be987bfdf0da928a1111a54709ed54a6676305e5036920347adb5cd 0101-efi-do-not-set-wide-exec-charset.patch ab3075a07010708fa795a9ff2a0f08f9a0a317034479e41bc8948c0d24155087b797b832e13dc6f534151600dbe5ad4526e9a48eec0328fc00c6609a8328aee7 0102-efi-hack-out-musl-wchar-definition.patch +ec8feed6259e52874ff8c3019746a6c40d38cc4b5a775d934161c51515f435768baad7d87315ecf8192266d2a5e096137a73c8bbe2f8f88b6844e53c276cfdd1 0103-meson-lintl-for-musl-gettext.patch " -- 2.45.2