From 2507be348faf26f33cf2dd8fd225572d2777e6b3 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 21 Sep 2021 13:20:11 +0200 Subject: [PATCH] sys-apps/texinfo: Apply Flatcar modifications --- .../coreos-overlay/sys-apps/texinfo/README.md | 5 ++++ .../texinfo/files/flatcar-modifications.patch | 26 +++++++++++++++++++ .../sys-apps/texinfo/texinfo-6.8.ebuild | 5 +++- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/README.md create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/files/flatcar-modifications.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/README.md b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/README.md new file mode 100644 index 0000000000..12d10ae14a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/README.md @@ -0,0 +1,5 @@ +We keep this package in overlay, because we need CCACHE_DIR for tool +build, so we need to modify the configure.ac script and run autoreconf +again. We also skip building doc, man and js for main build. + +There wasn't too much information about the reasons for the changes. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/files/flatcar-modifications.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/files/flatcar-modifications.patch new file mode 100644 index 0000000000..f771766217 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/files/flatcar-modifications.patch @@ -0,0 +1,26 @@ +diff -ur texinfo-6.8/Makefile.am texinfo-6.8-patched/Makefile.am +--- texinfo-6.8/Makefile.am 2021-02-16 21:07:41.000000000 +0000 ++++ texinfo-6.8-patched/Makefile.am 2021-09-21 11:05:15.495497278 +0000 +@@ -62,9 +62,7 @@ + SUBDIRS += info + endif + endif +- SUBDIRS += install-info po po_document tp Pod-Simple-Texinfo texindex util \ +- doc man +- SUBDIRS += js ++ SUBDIRS += install-info po po_document tp Pod-Simple-Texinfo texindex util + endif + + distclean-local: +diff -ur texinfo-6.8/configure.ac texinfo-6.8-patched/configure.ac +--- texinfo-6.8/configure.ac 2021-07-03 09:12:42.000000000 +0000 ++++ texinfo-6.8-patched/configure.ac 2021-09-21 11:03:11.238623956 +0000 +@@ -192,7 +192,7 @@ + # env -i gives this build host configure a clean environment; + # consequently, we have to re-initialize $PATH. + env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \ +- PATH="$PATH" \ ++ PATH="$PATH" CCACHE_DIR="$CCACHE_DIR" \ + tools_only=1 \ + ${confdir}/configure --build=${build} --host=${build} \ + --disable-rpath --disable-nls diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.8.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.8.ebuild index e6d5db9200..f0e7bc230b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.8.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.8.ebuild @@ -7,7 +7,7 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="The GNU info program and utilities" HOMEPAGE="https://www.gnu.org/software/texinfo/" @@ -34,6 +34,7 @@ BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )" PATCHES=( "${FILESDIR}/${P}-undo-gnulib-nonnul.patch" + "${FILESDIR}/flatcar-modifications.patch" ) src_prepare() { @@ -43,6 +44,8 @@ src_prepare() { sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1 fi + + eautoreconf } src_configure() {