From 8149c48fddda44043c94c6095f9edfb3e156fdea Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 10 Jan 2024 09:36:30 +0100 Subject: [PATCH 1/3] overlay coreos/config: Override a check for sys-apps/texinfo It's required now, because we cross-compile sys-apps/texinfo for binary packages and there's a check that bails out for cross-compilation case. --- .../coreos-overlay/coreos/config/env/sys-apps/texinfo | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/texinfo diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/texinfo b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/texinfo new file mode 100644 index 0000000000..302c86f300 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/texinfo @@ -0,0 +1,7 @@ +# texinfo checks if iconv converts EUC-CN encoding to UTF-8. It does +# it by compiling and running a test program, which obviously won't +# fly during cross-compilation. On SDK (for which a native compilation +# is done) the conversion does not happen, so we parrot it for the +# cross-compilation case too. + +export texinfo_cv_sys_iconv_converts_euc_cn='no' From 819d64d700cee77f5622abfb288ef34ce680694d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 10 Jan 2024 17:36:42 +0100 Subject: [PATCH 2/3] overlay profiles: Keep using old binary package format for now Looks like portage has changed its default from xpak to gpkg, and our scripts are not yet ready for this change. --- .../coreos-overlay/profiles/coreos/base/make.defaults | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index 6f15ef413a..eeded5e9ff 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -130,3 +130,6 @@ BINPKG_COMPRESS=bzip2 # Enable cgo by default. Required for the docker device-mapper driver to compile. CGO_ENABLED=1 + +# Keep using old binary format for now. +BINPKG_FORMAT=xpak From 95ffba29f39d25b30940d5dc0befc05bc089d5f8 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 9 Jan 2024 12:04:09 +0100 Subject: [PATCH 3/3] 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.