From e1b886a6073ced376c7d0d905c50d3542a426b42 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Mon, 9 Apr 2018 21:58:43 +0200 Subject: [PATCH] media-video/vcdimager: Fix building for non-native ABIs. Closes: https://bugs.gentoo.org/652832 --- .../vcdimager/files/vcdimager-2.0.1-pkg-config.patch | 11 +++++++++++ media-video/vcdimager/vcdimager-2.0.1.ebuild | 12 ++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 media-video/vcdimager/files/vcdimager-2.0.1-pkg-config.patch diff --git a/media-video/vcdimager/files/vcdimager-2.0.1-pkg-config.patch b/media-video/vcdimager/files/vcdimager-2.0.1-pkg-config.patch new file mode 100644 index 00000000000..9d603b91869 --- /dev/null +++ b/media-video/vcdimager/files/vcdimager-2.0.1-pkg-config.patch @@ -0,0 +1,11 @@ +--- /configure.ac ++++ /configure.ac +@@ -171,6 +171,8 @@ + dnl For vcdimager and vcdxbuild to be able to set creation time of VCD + AC_CHECK_FUNCS(getdate strptime, , ) + ++PKG_PROG_PKG_CONFIG ++ + if test "x$enable_cli_fe" = "xyes" -o "x$enable_xml_fe" = "xyes"; then + PKG_CHECK_MODULES(LIBPOPT, popt, [], [enable_cli_fe=no; enable_xml_fe=no]) + fi diff --git a/media-video/vcdimager/vcdimager-2.0.1.ebuild b/media-video/vcdimager/vcdimager-2.0.1.ebuild index 618eb4d7ef3..0eed4a6d623 100644 --- a/media-video/vcdimager/vcdimager-2.0.1.ebuild +++ b/media-video/vcdimager/vcdimager-2.0.1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit multilib-minimal +inherit autotools multilib-minimal DESCRIPTION="GNU VCDimager" HOMEPAGE="https://www.gnu.org/software/vcdimager/" @@ -20,11 +20,13 @@ RDEPEND=" xml? ( dev-libs/libxml2:2 ) " DEPEND="${RDEPEND} - virtual/pkgconfig + virtual/pkgconfig[${MULTILIB_USEDEP}] " DOCS=( AUTHORS BUGS ChangeLog FAQ HACKING NEWS README THANKS TODO ) +PATCHES=("${FILESDIR}/${P}-pkg-config.patch") + src_prepare() { default @@ -32,10 +34,12 @@ src_prepare() { sed -i \ -e 's/check_PROGRAMS =/check_PROGRAMS +=/' \ -e 's/noinst_PROGRAMS =/check_PROGRAMS =/' \ - test/Makefile.in || die + test/Makefile.am || die sed -i \ -e 's/noinst_PROGRAMS =/check_PROGRAMS =/' \ - example/Makefile.in || die + example/Makefile.am || die + + eautoreconf } multilib_src_configure() { -- 2.17.0