commit: eb482f5626e53bdee63ff4a45c982db493ccde21 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Wed Jun 19 20:14:33 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Wed Jun 19 20:16:06 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb482f56
dev-libs/libgdata: fix build with newer autoconf-archive present Workaround eaclocal overwriting the older ax_code_coverage.m4 provided by the tarball, stopping breakage when newer autoconf-archive is present on the system. Due to all necessary ax_*.m4 being present in the tarball, the autoconf-archive build dep is also unnecessary (and now it doesn't update the copies either anymore if it's present on the build system). Closes: https://bugs.gentoo.org/686082 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> .../files/libgdata-0.17.9-ax2019-compat.patch | 20 ++++++++++++++++++++ dev-libs/libgdata/libgdata-0.17.9-r1.ebuild | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch b/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch new file mode 100644 index 00000000000..c73e3f9eaee --- /dev/null +++ b/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch @@ -0,0 +1,20 @@ +autoconf-archive-2019.01.06 breaks AX_CODE_COVERAGE usage by requiring +a different integration inside Makefile.am. This would be fine if the +local m4/ax_code_coverage.m4 would get used, but eaclocal parses out +the install from ACLOCAL_AMFLAGS, and calls aclocal with that, which +overwrites ax_code_coverage.m4 with the newer version, obviously +breaking the usage of all that in Makefile.am. +Workaround it by patching out the --install argument, thus using the +tarball copy of it (older version), which works with Makefile.am +without further patching. + +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + SUBDIRS = . po docs gdata/tests + +-ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS} ++ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + + DISTCHECK_CONFIGURE_FLAGS = + MAINTAINERCLEANFILES = diff --git a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild index 9ba51467475..f9f1ba47702 100644 --- a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild +++ b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild @@ -36,15 +36,15 @@ DEPEND="${RDEPEND} dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=dev-util/intltool-0.40 - sys-devel/autoconf-archive virtual/pkgconfig test? ( >=net-libs/uhttpmock-0.5 ) vala? ( $(vala_depend) ) " -# eautoreconf needs autoconf-archive PATCHES=( "${FILESDIR}"/${PN}-0.17.8-disable-demos.patch + # don't overwrite m4/ax_* with newer breaking versions + "${FILESDIR}"/${P}-ax2019-compat.patch ) src_prepare() {
