summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <dragonheart@gentoo.org>2006-01-14 12:31:15 +0000
committerDaniel Black <dragonheart@gentoo.org>2006-01-14 12:31:15 +0000
commit61b6147b6903f0b77cb0fe9d948063352b6e155d (patch)
treedf9418fe1d8cd61c2c03c121dfcdbbec238b8f38 /dev-libs/xapian/files
parentAdded 2.3 hardmasked for testing. Bug #107686 (diff)
downloadhistorical-61b6147b6903f0b77cb0fe9d948063352b6e155d.tar.gz
historical-61b6147b6903f0b77cb0fe9d948063352b6e155d.tar.bz2
historical-61b6147b6903f0b77cb0fe9d948063352b6e155d.zip
added patch to fix xapian-config problem. Removed old xapian version
Package-Manager: portage-2.1_pre3-r1
Diffstat (limited to 'dev-libs/xapian/files')
-rw-r--r--dev-libs/xapian/files/digest-xapian-0.8.31
-rw-r--r--dev-libs/xapian/files/digest-xapian-0.9.2-r11
-rw-r--r--dev-libs/xapian/files/xapian-0.9.2-config.patch17
3 files changed, 18 insertions, 1 deletions
diff --git a/dev-libs/xapian/files/digest-xapian-0.8.3 b/dev-libs/xapian/files/digest-xapian-0.8.3
deleted file mode 100644
index 84252d872555..000000000000
--- a/dev-libs/xapian/files/digest-xapian-0.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7feef46188912b180d048953e3518fc6 xapian-core-0.8.3.tar.gz 2095952
diff --git a/dev-libs/xapian/files/digest-xapian-0.9.2-r1 b/dev-libs/xapian/files/digest-xapian-0.9.2-r1
new file mode 100644
index 000000000000..ddf3665b9266
--- /dev/null
+++ b/dev-libs/xapian/files/digest-xapian-0.9.2-r1
@@ -0,0 +1 @@
+MD5 772115e47e4bbf7cacc74dc0d11a592a xapian-core-0.9.2.tar.gz 2482298
diff --git a/dev-libs/xapian/files/xapian-0.9.2-config.patch b/dev-libs/xapian/files/xapian-0.9.2-config.patch
new file mode 100644
index 000000000000..2cb181a34c85
--- /dev/null
+++ b/dev-libs/xapian/files/xapian-0.9.2-config.patch
@@ -0,0 +1,17 @@
+--- xapian-config.in.orig
++++ xapian-config.in
+@@ -132,6 +132,14 @@
+ test /usr/lib != "$libdir" && L="-L$libdir "
+ D=
+ eval `grep ^dependency_libs= "$libdir/libxapian.la"`
++ # Replace "/path/to/libfoo.la" with "-L/path/to -lfoo" which doesn't
++ # take into account any dependency_libs which libfoo.la may pull in
++ # but the only .la that we're likely to see is libstdc++.la and it'll
++ # hopefully work there as any dependency libs will probably be pulled
++ # in by the compiler for us. Recursively pulling in dependency_libs
++ # is probably too hard to do in sh - we'd need to reimplement
++ # xapian-config in C or C++.
++ dependency_libs=`echo " $dependency_libs "|sed 's![ ][ ]*! !g;s! \(/[^ ]*\)/lib\([^ ]*\).la ! -L\1 -l\2 !g;s! ! !g;s!^ !!;s! $!!'`
+ test -n "$dependency_libs" && D=" $dependency_libs"
+ echo "$F$L-lxapian$D"
+ ;;