snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

clucene: install headers to /usr/include not /usr/lib; fix zlib detection (via Arch).

This commit is contained in:
Juan RP 2014-08-04 19:20:51 +02:00
parent 2ae3c7af33
commit 312815c60a
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
srcpkgs/clucene/patches/fix_zlib_detections.diff Normal file
View File

@ -0,0 +1,21 @@
From: Veit Jahns <idolum@users.sourceforge.net>
Date: Thu, 26 May 2011 11:35:28 +0000 (+0200)
Subject: Fixing ZLIB configuration in shared's CMakeLists
X-Git-Url: http://clucene.git.sourceforge.net/git/gitweb.cgi?p=clucene%2Fclucene;a=commitdiff_plain;h=772481ca94071ddfe65102a451926e4f9aeb4d2c;hp=a834f87bad3543b2a0331cef7202c15ded4245be
Fixing ZLIB configuration in shared's CMakeLists
---
diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
index 68314a7..3d1975e 100644
--- src/shared/CMakeLists.txt
+++ src/shared/CMakeLists.txt
@@ -42,7 +42,7 @@ INCLUDE (CheckAtomicFunctions)
find_package(ZLIB)
IF ( ZLIB_FOUND )
SET ( EXTRA_LIBS ${EXTRA_LIBS} ${ZLIB_LIBRARY} )
-ELSEIF ( ZLIB_FOUND )
+ELSE ( ZLIB_FOUND )
MESSAGE( "ZLIB not found, using local: ${clucene-ext_SOURCE_DIR}/zlib" )
SET(ZLIB_INCLUDE_DIR ${clucene-ext_SOURCE_DIR}/zlib )
SET(ZLIB_LIBRARY ${clucene-ext_BINARY_DIR})

7
srcpkgs/clucene/template
View File

@ -1,12 +1,12 @@
# Template file for 'clucene' # Template file for 'clucene'
pkgname=clucene pkgname=clucene
version=2.3.3.4 version=2.3.3.4
revision=3 revision=4
wrksrc=${pkgname}-core-${version} wrksrc=${pkgname}-core-${version}
build_style=cmake build_style=cmake
configure_args="-DENABLE_ASCII_MODE=OFF -DENABLE_PACKAGING=OFF configure_args="-DENABLE_ASCII_MODE=OFF -DENABLE_PACKAGING=OFF
-DBUILD_CONTRIBS_LIB:BOOL=ON -DLIB_DESTINATION:PATH=/usr/lib -DBUILD_CONTRIBS_LIB:BOOL=ON -DLIB_DESTINATION:PATH=/usr/lib
-DLUCENE_SYS_INCLUDES:PATH=/usr/lib -DDISABLE_MULTITHREADING=OFF" -DLUCENE_SYS_INCLUDES:PATH=/usr/include -DDISABLE_MULTITHREADING=OFF"
hostmakedepends="cmake pkg-config" hostmakedepends="cmake pkg-config"
makedepends="zlib-devel boost-devel" makedepends="zlib-devel boost-devel"
short_desc="Text search engine written in C++" short_desc="Text search engine written in C++"
@ -17,12 +17,11 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-core-${version}.tar.gz"
checksum=ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab checksum=ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
clucene-devel_package() { clucene-devel_package() {
depends="libstdc++-devel ${sourcepkg}-${version}_${revision}" depends="libstdc++-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files" short_desc+=" - development files"
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove "usr/lib/*.so" vmove "usr/lib/*.so"
vmove usr/lib/CLucene
vmove usr/lib/CLuceneConfig.cmake vmove usr/lib/CLuceneConfig.cmake
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig
} }