6b401a3319
- Replace wrong shlib package name "libclucene2" (the SONAME is
libclucene*.so.1, not .2) by libclucene-{core,shared}1
- Use more robust make install command
- Add patch clucene-kill-ext-includes.diff
OBS-URL: https://build.opensuse.org/request/show/149934
OBS-URL: https://build.opensuse.org/package/show/server:search/clucene-core?expand=0&rev=27
51 lines
2.6 KiB
Diff
51 lines
2.6 KiB
Diff
From: Jan Engelhardt <jengelh@inai.de>
|
||
Date: 2013-01-25 01:40:24.101555823 +0100+
|
||
References: http://sourceforge.net/mailarchive/forum.php?thread_name=1359079095-6295-2-git-send-email-jengelh%40inai.de&forum_name=clucene-developers
|
||
|
||
clucene: avoid causing compile failures in downstream users
|
||
|
||
`pkg-config clucene --cflags` is giving me -I/usr/include/clucene/ext,
|
||
which causes projects using both clucence and boost to fail
|
||
in compilation because ext/boost and the regular boost headers
|
||
do not match up.
|
||
|
||
$ echo -en '#include <boost/filesystem.hpp>' | \
|
||
g++ -x c++ $(pkg-config libclucene-core --cflags) -c -
|
||
|
||
In file included from /usr/include/boost/filesystem/v3/path.hpp:27:0,
|
||
from /usr/include/boost/filesystem.hpp:35,
|
||
from test.cpp:1:
|
||
/usr/include/boost/system/system_error.hpp:22:45: error: expected initializer before ‘:’ token
|
||
In file included from /usr/include/CLucene/ext/boost/detail/sp_typeinfo.hpp:103:0,
|
||
from /usr/include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_nt.hpp:21,
|
||
from /usr/include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base.hpp:33,
|
||
from /usr/include/CLucene/ext/boost/smart_ptr/detail/shared_count.hpp:29,
|
||
from /usr/include/CLucene/ext/boost/smart_ptr/shared_ptr.hpp:32,
|
||
from /usr/include/CLucene/ext/boost/shared_ptr.hpp:17,
|
||
from /usr/include/boost/filesystem/v3/path.hpp:29,
|
||
from /usr/include/boost/filesystem.hpp:35,
|
||
from test.cpp:1:
|
||
/usr/include/c++/4.7/typeinfo:41:37: error: expected ‘}’ before end of line
|
||
/usr/include/c++/4.7/typeinfo:41:37: error: expected ‘}’ before end of line
|
||
/usr/include/c++/4.7/typeinfo:41:37: error: expected declaration before end of line
|
||
|
||
Rip out this /ext nonsense.
|
||
...and the vim tilde.
|
||
|
||
---
|
||
src/core/libclucene-core.pc.cmake | 4 ++--
|
||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
||
Index: clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake
|
||
===================================================================
|
||
--- clucene-core-2.3.3.4.orig/src/core/libclucene-core.pc.cmake
|
||
+++ clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake
|
||
@@ -7,5 +7,5 @@ Name: libclucene
|
||
Description: CLucene - a C++ search engine, ported from the popular Apache Lucene
|
||
Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@
|
||
Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared
|
||
-Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -I@LUCENE_SYS_INCLUDES@
|
||
-~
|
||
+Cflags: -I${prefix}/include -I@LUCENE_SYS_INCLUDES@
|
||
+
|