From 95ffba29f39d25b30940d5dc0befc05bc089d5f8 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 9 Jan 2024 12:04:09 +0100 Subject: [PATCH] overlay coreos/user-patches: Add a patch for net-dialup/lrzsz It fixes a build issue when i18n is disabled through masking nls USE flag. --- .../net-dialup/lrzsz/0001-no-nls-fix.patch | 15 +++++++++++++++ .../user-patches/net-dialup/lrzsz/README.md | 3 +++ 2 files changed, 18 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/user-patches/net-dialup/lrzsz/0001-no-nls-fix.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/user-patches/net-dialup/lrzsz/README.md diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/net-dialup/lrzsz/0001-no-nls-fix.patch b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/net-dialup/lrzsz/0001-no-nls-fix.patch new file mode 100644 index 0000000000..0da8a50ba7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/net-dialup/lrzsz/0001-no-nls-fix.patch @@ -0,0 +1,15 @@ +diff -r -u lrzsz-0.12.20/configure.in lrzsz-0.12.20-patched/configure.in +--- lrzsz-0.12.20/configure.in 2024-01-09 10:51:43.460543006 -0000 ++++ lrzsz-0.12.20-patched/configure.in 2024-01-09 10:57:32.001193035 -0000 +@@ -263,6 +263,11 @@ + AC_SUBST(LDFLAGS) + AC_SUBST(LIBS) + ++# a workaround for not AC_SUBSTed USE_INCLUDED_LIBINTL when disable-nls is passed ++if test "x${USE_NLS}" = xno ; then ++ USE_INCLUDED_LIBINTL=no ++ AC_SUBST(USE_INCLUDED_LIBINTL) ++fi + + AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME", [LOCALEDIR]) + AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/net-dialup/lrzsz/README.md b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/net-dialup/lrzsz/README.md new file mode 100644 index 0000000000..29c9aba0a5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/net-dialup/lrzsz/README.md @@ -0,0 +1,3 @@ +This patch should be upstreamed to Gentoo to fix build issues when nls +USE flag is masked (nls is used for internationalization). I think it +happens only when our SDK also has nls USE flag disabled.