commit: 4a81da5b0cd6e8316a9df0b6e601b898a941b27b Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Fri Feb 19 21:26:51 2016 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Fri Feb 19 21:26:51 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a81da5b
app-text/xapian-omega: fix build system, bug #574666 Package-Manager: portage-2.2.26 .../files/xapian-omega-1.3.4-fix-lz.patch | 20 ++++++++++++++++++++ app-text/xapian-omega/xapian-omega-1.3.4.ebuild | 8 ++++++++ 2 files changed, 28 insertions(+) diff --git a/app-text/xapian-omega/files/xapian-omega-1.3.4-fix-lz.patch b/app-text/xapian-omega/files/xapian-omega-1.3.4-fix-lz.patch new file mode 100644 index 0000000..e8126ba --- /dev/null +++ b/app-text/xapian-omega/files/xapian-omega-1.3.4-fix-lz.patch @@ -0,0 +1,20 @@ +commit 755169cc3b0991bb783ade963da3a473db147067 +Author: Olly Betts <[email protected]> +Date: Tue Jan 12 17:24:11 2016 +1300 + + Need to AC_SUBST probed value of ZLIB_LIBS + + Noted by Paul Wise + +diff --git a/xapian-applications/omega/configure.ac b/xapian-applications/omega/configure.ac +index db56262..36d894e 100644 +--- a/xapian-applications/omega/configure.ac ++++ b/xapian-applications/omega/configure.ac +@@ -120,6 +120,7 @@ AC_SEARCH_LIBS([zlibVersion], [z zlib zdll], [], [ + AC_MSG_ERROR([zlibVersion() not found in -lz, -lzlib, or -lzdll (you may need to install the zlib1g-dev or zlib-devel package)]) + ]) + ZLIB_LIBS=$LIBS ++AC_SUBST([ZLIB_LIBS]) + LIBS=$SAVE_LIBS + + dnl libmagic used to detect MIME types for files we don't detect by extension. diff --git a/app-text/xapian-omega/xapian-omega-1.3.4.ebuild b/app-text/xapian-omega/xapian-omega-1.3.4.ebuild index d387955..a48191a 100644 --- a/app-text/xapian-omega/xapian-omega-1.3.4.ebuild +++ b/app-text/xapian-omega/xapian-omega-1.3.4.ebuild @@ -4,6 +4,8 @@ EAPI="5" +inherit autotools eutils + DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend" SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"; HOMEPAGE="http://www.xapian.org/"; @@ -20,6 +22,12 @@ DEPEND="dev-libs/xapian:0/1.3.5 sys-libs/zlib" RDEPEND="${DEPEND}" +src_prepare() { + # Bug #574666 + epatch "${FILESDIR}"/${P}-fix-lz.patch + eautoreconf +} + src_install () { emake DESTDIR="${D}" install
