From 564f8f7b1d3faff0b032f049294a3f11a8122a32 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Fri, 30 Jul 2021 16:34:24 +0530 Subject: [PATCH 1/2] dev-libs/expat: Sync with Gentoo upstream; updates to 2.4.1 Signed-off-by: Sayan Chowdhury --- .../coreos-overlay/dev-libs/expat/Manifest | 2 +- ...{expat-2.2.8.ebuild => expat-2.4.1.ebuild} | 20 +++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) rename sdk_container/src/third_party/coreos-overlay/dev-libs/expat/{expat-2.2.8.ebuild => expat-2.4.1.ebuild} (71%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/expat/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-libs/expat/Manifest index 60480d79ac..167b959732 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/expat/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/expat/Manifest @@ -1 +1 @@ -DIST expat-2.2.8.tar.xz 422324 BLAKE2B 1f3e8bbce7f05aa080ca647d12a4ff9bf6d21cd31366d70daabcf8db48985e0b644faac5e251e0a559a74f0a27b247ede64b6f117940a5f7f70dc1cce0f0036a SHA512 102a3af89af37a961f81ade2dfb4f3e13bf779110decff9f1462f21079aa6959009871c39b933d9bf47ebc3ee50d3f8d5b41859dce833d290f17886a2aa80aa9 +DIST expat-2.4.1.tar.xz 445024 BLAKE2B 2ae66d284a03176ef7290093f59bb7ad98011dfbf3c7c3515ba4e4b99f849474def6ce6d9844c944fed22d86ac4ea1a38863646be914d9432eda7b69d890be65 SHA512 9dc760dbf701f75e55c4479d81417622f8c750d8473498458a382a4c2932a2976a059cb3589f88855188e5173ec7868d285c4601428e0ca625df7a59cf975191 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/expat/expat-2.2.8.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/expat/expat-2.4.1.ebuild similarity index 71% rename from sdk_container/src/third_party/coreos-overlay/dev-libs/expat/expat-2.2.8.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-libs/expat/expat-2.4.1.ebuild index 502519c8ca..e06e6d5503 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/expat/expat-2.2.8.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/expat/expat-2.4.1.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 AUTOTOOLS_AUTO_DEPEND=no -inherit autotools eutils libtool multilib toolchain-funcs multilib-minimal +AT_NOEAUTOHEADER=yes # because expat_config.h.in would need post-processing +inherit autotools multilib-minimal usr-ldscript DESCRIPTION="Stream-oriented XML parser library" HOMEPAGE="https://libexpat.github.io/" @@ -11,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +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 ~x86-winnt" IUSE="elibc_FreeBSD examples static-libs unicode" BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" @@ -72,6 +73,12 @@ multilib_src_install() { sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die popd >/dev/null fi + + if multilib_is_native_abi ; then + # libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since + # we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1 + use elibc_FreeBSD && gen_usr_ldscript -a expat + fi } multilib_src_install_all() { @@ -81,11 +88,12 @@ multilib_src_install_all() { # Note: Use of HTML_DOCS would add unwanted "doc" subfolder docinto html - dodoc doc/*.{css,html,png} + dodoc doc/*.{css,html} if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/*.c + docinto examples + dodoc examples/*.c + docompress -x usr/share/doc/${PF}/examples fi find "${D}" -name '*.la' -type f -delete || die From 39db514ce3cf4f9dbb1eed0ca83a78b395664d1d Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Fri, 30 Jul 2021 16:44:55 +0530 Subject: [PATCH 2/2] dev-libs/expat: Apply Flatcar changes Signed-off-by: Sayan Chowdhury --- .../coreos-overlay/dev-libs/expat/expat-2.4.1.ebuild | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/expat/expat-2.4.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/expat/expat-2.4.1.ebuild index e06e6d5503..5410d6b367 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/expat/expat-2.4.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/expat/expat-2.4.1.ebuild @@ -4,7 +4,9 @@ EAPI=7 AUTOTOOLS_AUTO_DEPEND=no AT_NOEAUTOHEADER=yes # because expat_config.h.in would need post-processing -inherit autotools multilib-minimal usr-ldscript + +# Flatcar: Don't inherit usr-ldscript +inherit autotools multilib-minimal DESCRIPTION="Stream-oriented XML parser library" HOMEPAGE="https://libexpat.github.io/" @@ -73,12 +75,6 @@ multilib_src_install() { sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die popd >/dev/null fi - - if multilib_is_native_abi ; then - # libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since - # we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1 - use elibc_FreeBSD && gen_usr_ldscript -a expat - fi } multilib_src_install_all() {