| 1 |
commit: 4a81da5b0cd6e8316a9df0b6e601b898a941b27b |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 19 21:26:51 2016 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 19 21:26:51 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a81da5b |
| 7 |
|
| 8 |
app-text/xapian-omega: fix build system, bug #574666 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
.../files/xapian-omega-1.3.4-fix-lz.patch | 20 ++++++++++++++++++++ |
| 13 |
app-text/xapian-omega/xapian-omega-1.3.4.ebuild | 8 ++++++++ |
| 14 |
2 files changed, 28 insertions(+) |
| 15 |
|
| 16 |
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 |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..e8126ba |
| 19 |
--- /dev/null |
| 20 |
+++ b/app-text/xapian-omega/files/xapian-omega-1.3.4-fix-lz.patch |
| 21 |
@@ -0,0 +1,20 @@ |
| 22 |
+commit 755169cc3b0991bb783ade963da3a473db147067 |
| 23 |
+Author: Olly Betts <olly@××××××.com> |
| 24 |
+Date: Tue Jan 12 17:24:11 2016 +1300 |
| 25 |
+ |
| 26 |
+ Need to AC_SUBST probed value of ZLIB_LIBS |
| 27 |
+ |
| 28 |
+ Noted by Paul Wise |
| 29 |
+ |
| 30 |
+diff --git a/xapian-applications/omega/configure.ac b/xapian-applications/omega/configure.ac |
| 31 |
+index db56262..36d894e 100644 |
| 32 |
+--- a/xapian-applications/omega/configure.ac |
| 33 |
++++ b/xapian-applications/omega/configure.ac |
| 34 |
+@@ -120,6 +120,7 @@ AC_SEARCH_LIBS([zlibVersion], [z zlib zdll], [], [ |
| 35 |
+ AC_MSG_ERROR([zlibVersion() not found in -lz, -lzlib, or -lzdll (you may need to install the zlib1g-dev or zlib-devel package)]) |
| 36 |
+ ]) |
| 37 |
+ ZLIB_LIBS=$LIBS |
| 38 |
++AC_SUBST([ZLIB_LIBS]) |
| 39 |
+ LIBS=$SAVE_LIBS |
| 40 |
+ |
| 41 |
+ dnl libmagic used to detect MIME types for files we don't detect by extension. |
| 42 |
|
| 43 |
diff --git a/app-text/xapian-omega/xapian-omega-1.3.4.ebuild b/app-text/xapian-omega/xapian-omega-1.3.4.ebuild |
| 44 |
index d387955..a48191a 100644 |
| 45 |
--- a/app-text/xapian-omega/xapian-omega-1.3.4.ebuild |
| 46 |
+++ b/app-text/xapian-omega/xapian-omega-1.3.4.ebuild |
| 47 |
@@ -4,6 +4,8 @@ |
| 48 |
|
| 49 |
EAPI="5" |
| 50 |
|
| 51 |
+inherit autotools eutils |
| 52 |
+ |
| 53 |
DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend" |
| 54 |
SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz" |
| 55 |
HOMEPAGE="http://www.xapian.org/" |
| 56 |
@@ -20,6 +22,12 @@ DEPEND="dev-libs/xapian:0/1.3.5 |
| 57 |
sys-libs/zlib" |
| 58 |
RDEPEND="${DEPEND}" |
| 59 |
|
| 60 |
+src_prepare() { |
| 61 |
+ # Bug #574666 |
| 62 |
+ epatch "${FILESDIR}"/${P}-fix-lz.patch |
| 63 |
+ eautoreconf |
| 64 |
+} |
| 65 |
+ |
| 66 |
src_install () { |
| 67 |
emake DESTDIR="${D}" install |
Archives