diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/Manifest index 92177545e8..1c633be509 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/Manifest @@ -1 +1 @@ -DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54 +DIST dbus-glib-0.112.tar.gz 715340 BLAKE2B 24e1c222f0116b32c109682816f6c35771647f4c63cab93a6621bd68b71ea4dca62fbf9e6bb360386b8658146dbf34b0d7dc471db7525585412d120340c4c969 SHA512 7c9f393f065dfb3d698f35e6554caf15fe539f5dd52d2b2bb6ed1770e130f5dab8e45379232520301455bae9bb77e25a109faf175153fcd4b9dd11d7de4a546e diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.110-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.112.ebuild similarity index 59% rename from sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.110-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.112.ebuild index 2540e494ef..1dac549aef 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.110-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.112.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit bash-completion-r1 eutils ltprune multilib-minimal +EAPI=7 + +inherit autotools bash-completion-r1 multilib-minimal toolchain-funcs DESCRIPTION="D-Bus bindings for glib" HOMEPAGE="https://dbus.freedesktop.org/" @@ -10,29 +11,37 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz" LICENSE="|| ( GPL-2 AFL-2.1 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" -IUSE="debug static-libs test cros_host" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +IUSE="debug static-libs test" RESTRICT="!test? ( test )" -CDEPEND=" +DEPEND=" >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] >=sys-apps/dbus-1.8[${MULTILIB_USEDEP}] " -DEPEND="${CDEPEND} +RDEPEND="${DEPEND}" +BDEPEND=" + >=dev-libs/expat-2.1.0-r3 + >=dev-libs/glib-2.40:2 + >=sys-apps/dbus-1.8 >=dev-util/glib-utils-2.40 >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig -" -RDEPEND="${CDEPEND}" +" # CBUILD dependencies are needed to make a native tool while cross-compiling. -DOCS=( AUTHORS ChangeLog HACKING NEWS README ) +DOCS=( AUTHORS CONTRIBUTING.md NEWS README ) set_TBD() { # out of sources build dir for make check export TBD="${BUILD_DIR}-tests" } +src_prepare() { + default + eautoreconf +} + multilib_src_configure() { local myconf=( --localstatedir="${EPREFIX}"/var @@ -42,9 +51,13 @@ multilib_src_configure() { $(use_enable static-libs static) ) - # Use host tool when building cross. - if ! use cros_host; then - myconf+=("--with-dbus-binding-tool=/usr/bin/dbus-binding-tool") + # Configure a CBUILD directory to make a native build tool. + if tc-is-cross-compiler; then + mkdir "${BUILD_DIR}-build" || die + cd "${BUILD_DIR}-build" || die + ECONF_SOURCE="${S}" econf_build + myconf+=( --with-dbus-binding-tool="$PWD/dbus/dbus-binding-tool" ) + cd - || die fi ECONF_SOURCE="${S}" econf "${myconf[@]}" @@ -65,6 +78,8 @@ multilib_src_configure() { } multilib_src_compile() { + tc-is-cross-compiler && emake -C "${BUILD_DIR}-build" + emake if use test; then @@ -85,7 +100,7 @@ multilib_src_install_all() { einstalldocs newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus-send - rm -rf "${ED}"/etc/bash_completion.d || die + rm -r "${ED}"/etc/bash_completion.d || die - prune_libtool_files + find "${ED}" -type f -name '*.la' -delete || die } diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/metadata.xml index 63e7905d8e..d73e5f1efb 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/metadata.xml @@ -1,5 +1,5 @@ - + freedesktop-bugs@gentoo.org