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() {