From ff89bf96396a69e7d0a4a039e0c478c71520f664 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 8 Aug 2024 15:10:14 +0200 Subject: [PATCH] overlay coreos/user-patches: Drop user-patch for net-dialup/lrzsz The update of the package pulled some other fix for the issue. --- .../net-dialup/lrzsz/0001-no-nls-fix.patch | 15 --------------- .../user-patches/net-dialup/lrzsz/README.md | 3 --- 2 files changed, 18 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/user-patches/net-dialup/lrzsz/0001-no-nls-fix.patch delete 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 deleted file mode 100644 index 0da8a50ba7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/net-dialup/lrzsz/0001-no-nls-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 29c9aba0a5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/net-dialup/lrzsz/README.md +++ /dev/null @@ -1,3 +0,0 @@ -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.