diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/Manifest deleted file mode 100644 index b6017de329..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST texinfo-6.8.tar.gz 10119420 BLAKE2B df9dc1698e7bb4f7c97ba4d44b08631502e3f997b91169ae64161b69701fbb0f85c82295ef6867e716a0addfd7c5677e14079645b167bd74933a0153fee92200 SHA512 f46dfb1c0f324a9c54959a8f256f0dcb8aaa59caccb0f027a5ee39a173b6e51a31a488f9d787707e7aa8401a439b2a01a1f3022dbae24ef377a1c021c1ebeb37 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 deleted file mode 100644 index 12d10ae14a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/README.md +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index f771766217..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/files/flatcar-modifications.patch +++ /dev/null @@ -1,26 +0,0 @@ -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/files/texinfo-6.8-undo-gnulib-nonnul.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/files/texinfo-6.8-undo-gnulib-nonnul.patch deleted file mode 100644 index 60f2e63b7c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/files/texinfo-6.8-undo-gnulib-nonnul.patch +++ /dev/null @@ -1,186 +0,0 @@ - -Patch by Vitezslav Crhonek -Source: https://src.fedoraproject.org/rpms/texinfo/c/9b2cca4817fa4bd8d520fed05e9560fc7183dcdf?branch=rawhide - -diff -up texinfo-6.8/gnulib/lib/cdefs.h.orig texinfo-6.8/gnulib/lib/cdefs.h ---- texinfo-6.8/gnulib/lib/cdefs.h.orig 2021-03-11 19:57:53.000000000 +0100 -+++ texinfo-6.8/gnulib/lib/cdefs.h 2021-07-19 12:26:46.985176475 +0200 -@@ -321,15 +321,15 @@ - - /* The nonnull function attribute marks pointer parameters that - must not be NULL. */ --#ifndef __attribute_nonnull__ -+#ifndef __nonnull - # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__) --# define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params)) -+# define __nonnull(params) __attribute__ ((__nonnull__ params)) - # else --# define __attribute_nonnull__(params) -+# define __nonnull(params) - # endif --#endif --#ifndef __nonnull --# define __nonnull(params) __attribute_nonnull__ (params) -+#elif !defined __GLIBC__ -+# undef __nonnull -+# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params) - #endif - - /* If fortification mode, we warn about unused results of certain -diff -up texinfo-6.8/gnulib/lib/libc-config.h.orig texinfo-6.8/gnulib/lib/libc-config.h ---- texinfo-6.8/gnulib/lib/libc-config.h.orig 2021-03-11 19:57:54.000000000 +0100 -+++ texinfo-6.8/gnulib/lib/libc-config.h 2021-07-19 12:27:58.810590975 +0200 -@@ -33,9 +33,9 @@ - #include - - /* On glibc this includes and and #defines -- _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 and -- DragonFlyBSD 5.9 it includes which defines __nonnull. -- Elsewhere it is harmless. */ -+ _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 it -+ includes which defines __nonnull. Elsewhere it -+ is harmless. */ - #include - - /* From glibc . */ -diff -up texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c ---- texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig 2021-03-11 19:57:54.000000000 +0100 -+++ texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c 2021-07-19 12:24:46.878419397 +0200 -@@ -192,7 +192,7 @@ DYNARRAY_NAME (free__array__) (struct DY - - /* Initialize a dynamic array object. This must be called before any - use of the object. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static void - DYNARRAY_NAME (init) (struct DYNARRAY_STRUCT *list) - { -@@ -202,7 +202,7 @@ DYNARRAY_NAME (init) (struct DYNARRAY_ST - } - - /* Deallocate the dynamic array and its elements. */ --__attribute_maybe_unused__ __attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __nonnull ((1)) - static void - DYNARRAY_FREE (struct DYNARRAY_STRUCT *list) - { -@@ -213,7 +213,7 @@ DYNARRAY_FREE (struct DYNARRAY_STRUCT *l - } - - /* Return true if the dynamic array is in an error state. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline bool - DYNARRAY_NAME (has_failed) (const struct DYNARRAY_STRUCT *list) - { -@@ -222,7 +222,7 @@ DYNARRAY_NAME (has_failed) (const struct - - /* Mark the dynamic array as failed. All elements are deallocated as - a side effect. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static void - DYNARRAY_NAME (mark_failed) (struct DYNARRAY_STRUCT *list) - { -@@ -236,7 +236,7 @@ DYNARRAY_NAME (mark_failed) (struct DYNA - - /* Return the number of elements which have been added to the dynamic - array. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline size_t - DYNARRAY_NAME (size) (const struct DYNARRAY_STRUCT *list) - { -@@ -245,7 +245,7 @@ DYNARRAY_NAME (size) (const struct DYNAR - - /* Return a pointer to the array element at INDEX. Terminate the - process if INDEX is out of bounds. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline DYNARRAY_ELEMENT * - DYNARRAY_NAME (at) (struct DYNARRAY_STRUCT *list, size_t index) - { -@@ -257,7 +257,7 @@ DYNARRAY_NAME (at) (struct DYNARRAY_STRU - /* Return a pointer to the first array element, if any. For a - zero-length array, the pointer can be NULL even though the dynamic - array has not entered the failure state. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline DYNARRAY_ELEMENT * - DYNARRAY_NAME (begin) (struct DYNARRAY_STRUCT *list) - { -@@ -267,7 +267,7 @@ DYNARRAY_NAME (begin) (struct DYNARRAY_S - /* Return a pointer one element past the last array element. For a - zero-length array, the pointer can be NULL even though the dynamic - array has not entered the failure state. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline DYNARRAY_ELEMENT * - DYNARRAY_NAME (end) (struct DYNARRAY_STRUCT *list) - { -@@ -294,7 +294,7 @@ DYNARRAY_NAME (add__) (struct DYNARRAY_S - /* Add ITEM at the end of the array, enlarging it by one element. - Mark *LIST as failed if the dynamic array allocation size cannot be - increased. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline void - DYNARRAY_NAME (add) (struct DYNARRAY_STRUCT *list, DYNARRAY_ELEMENT item) - { -@@ -348,8 +348,7 @@ DYNARRAY_NAME (emplace__) (struct DYNARR - /* Allocate a place for a new element in *LIST and return a pointer to - it. The pointer can be NULL if the dynamic array cannot be - enlarged due to a memory allocation failure. */ --__attribute_maybe_unused__ __attribute_warn_unused_result__ --__attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1)) - static - /* Avoid inlining with the larger initialization code. */ - #if !(defined (DYNARRAY_ELEMENT_INIT) || defined (DYNARRAY_ELEMENT_FREE)) -@@ -373,7 +372,7 @@ DYNARRAY_NAME (emplace) (struct DYNARRAY - existing size, new elements are added (which can be initialized). - Otherwise, the list is truncated, and elements are freed. Return - false on memory allocation failure (and mark *LIST as failed). */ --__attribute_maybe_unused__ __attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __nonnull ((1)) - static bool - DYNARRAY_NAME (resize) (struct DYNARRAY_STRUCT *list, size_t size) - { -@@ -418,7 +417,7 @@ DYNARRAY_NAME (resize) (struct DYNARRAY_ - } - - /* Remove the last element of LIST if it is present. */ --__attribute_maybe_unused__ __attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __nonnull ((1)) - static void - DYNARRAY_NAME (remove_last) (struct DYNARRAY_STRUCT *list) - { -@@ -435,7 +434,7 @@ DYNARRAY_NAME (remove_last) (struct DYNA - - /* Remove all elements from the list. The elements are freed, but the - list itself is not. */ --__attribute_maybe_unused__ __attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __nonnull ((1)) - static void - DYNARRAY_NAME (clear) (struct DYNARRAY_STRUCT *list) - { -@@ -453,8 +452,7 @@ DYNARRAY_NAME (clear) (struct DYNARRAY_S - stored in *RESULT if LIST refers to an empty list. On success, the - pointer in *RESULT is heap-allocated and must be deallocated using - free. */ --__attribute_maybe_unused__ __attribute_warn_unused_result__ --__attribute_nonnull__ ((1, 2)) -+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1, 2)) - static bool - DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, - DYNARRAY_FINAL_TYPE *result) -@@ -485,8 +483,7 @@ DYNARRAY_NAME (finalize) (struct DYNARRA - have a sentinel at the end). If LENGTHP is not NULL, the array - length is written to *LENGTHP. *LIST is re-initialized and can be - reused. */ --__attribute_maybe_unused__ __attribute_warn_unused_result__ --__attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1)) - static DYNARRAY_ELEMENT * - DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, size_t *lengthp) - { diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/metadata.xml deleted file mode 100644 index fd41c89eb3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - base-system@gentoo.org - Gentoo Base System - - - perl@gentoo.org - Gentoo Perl Project - - - Build standalone version that survives all Portage bugs - - - cpe:/a:gnu:texinfo - - 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 deleted file mode 100644 index f0e7bc230b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.8.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Note: if your package uses the texi2dvi utility, it must depend on the -# virtual/texi2dvi package to pull in all the right deps. The tool is not -# usable out-of-the-box because it requires the large tex packages. - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="The GNU info program and utilities" -HOMEPAGE="https://www.gnu.org/software/texinfo/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls +standalone static" - -RDEPEND=" - !=app-text/tetex-2* - >=sys-libs/ncurses-5.2-r2:0= - standalone? ( dev-lang/perl ) - !standalone? ( - dev-lang/perl:= - dev-perl/libintl-perl - dev-perl/Unicode-EastAsianWidth - dev-perl/Text-Unidecode - ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND}" -BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )" - -PATCHES=( - "${FILESDIR}/${P}-undo-gnulib-nonnul.patch" - "${FILESDIR}/flatcar-modifications.patch" -) - -src_prepare() { - default - - if use prefix ; then - sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die - touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1 - fi - - eautoreconf -} - -src_configure() { - # Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions. #622576 - local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}" - - use static && append-ldflags -static - local myeconfargs=( $(use_enable nls) ) - - if use standalone ; then - myeconfargs+=( - --without-external-libintl-perl - --without-external-Unicode-EastAsianWidth - --without-external-Text-Unidecode - --disable-perl-xs - ) - else - myeconfargs+=( - --with-external-libintl-perl - --with-external-Unicode-EastAsianWidth - --with-external-Text-Unidecode - --enable-perl-xs - ) - fi - - econf "${myeconfargs[@]}" -}