mirror of
https://github.com/openbsd/ports.git
synced 2026-06-17 23:13:55 +02:00
luceneplusplus: fix build with Boost 1.91; regen wantlib
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
V = 3.0.8
|
V = 3.0.8
|
||||||
PKGNAME = luceneplusplus-${V}
|
PKGNAME = luceneplusplus-${V}
|
||||||
COMMENT = C++ port of the Java Lucene library, the text search engine
|
COMMENT = C++ port of the Java Lucene library, the text search engine
|
||||||
REVISION = 4
|
REVISION = 5
|
||||||
|
|
||||||
GH_ACCOUNT = luceneplusplus
|
GH_ACCOUNT = luceneplusplus
|
||||||
GH_PROJECT = LucenePlusPlus
|
GH_PROJECT = LucenePlusPlus
|
||||||
@@ -15,10 +15,10 @@ CATEGORIES = textproc
|
|||||||
# LGPL3
|
# LGPL3
|
||||||
PERMIT_PACKAGE = Yes
|
PERMIT_PACKAGE = Yes
|
||||||
|
|
||||||
WANTLIB += ${COMPILER_LIBCXX} m
|
WANTLIB += ${COMPILER_LIBCXX} boost_atomic-mt boost_chrono-mt
|
||||||
WANTLIB += boost_atomic-mt boost_chrono-mt boost_date_time-mt
|
WANTLIB += boost_container-mt boost_date_time-mt boost_filesystem-mt
|
||||||
WANTLIB += boost_filesystem-mt boost_iostreams-mt boost_regex-mt
|
WANTLIB += boost_iostreams-mt boost_random-mt boost_regex-mt boost_thread-mt
|
||||||
WANTLIB += boost_thread-mt z boost_random-mt
|
WANTLIB += m z
|
||||||
|
|
||||||
COMPILER = base-clang ports-gcc
|
COMPILER = base-clang ports-gcc
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
luceneplusplus: fix build with Boost 1.91
|
||||||
|
|
||||||
|
Index: cmake/dependencies.cmake
|
||||||
|
--- cmake/dependencies.cmake.orig
|
||||||
|
+++ cmake/dependencies.cmake
|
||||||
|
@@ -7,7 +7,6 @@ find_package(Boost COMPONENTS
|
||||||
|
filesystem
|
||||||
|
iostreams
|
||||||
|
regex
|
||||||
|
- system
|
||||||
|
thread
|
||||||
|
REQUIRED
|
||||||
|
)
|
||||||
@@ -3,7 +3,15 @@ disable cotire as it's deprecated and breaks the build with newer libc++
|
|||||||
Index: src/contrib/CMakeLists.txt
|
Index: src/contrib/CMakeLists.txt
|
||||||
--- src/contrib/CMakeLists.txt.orig
|
--- src/contrib/CMakeLists.txt.orig
|
||||||
+++ src/contrib/CMakeLists.txt
|
+++ src/contrib/CMakeLists.txt
|
||||||
@@ -85,8 +85,6 @@ set_target_properties(lucene++
|
@@ -61,7 +61,6 @@ target_link_libraries(lucene++-contrib
|
||||||
|
Boost::filesystem
|
||||||
|
Boost::iostreams
|
||||||
|
Boost::regex
|
||||||
|
- Boost::system
|
||||||
|
Boost::thread
|
||||||
|
ZLIB::ZLIB
|
||||||
|
lucene++::lucene++
|
||||||
|
@@ -85,8 +84,6 @@ set_target_properties(lucene++
|
||||||
VERSION ${lucene++_VERSION}
|
VERSION ${lucene++_VERSION}
|
||||||
SOVERSION ${lucene++_SOVERSION})
|
SOVERSION ${lucene++_SOVERSION})
|
||||||
|
|
||||||
|
|||||||
@@ -3,13 +3,21 @@ disable cotire as it's deprecated and breaks the build with newer libc++
|
|||||||
Index: src/core/CMakeLists.txt
|
Index: src/core/CMakeLists.txt
|
||||||
--- src/core/CMakeLists.txt.orig
|
--- src/core/CMakeLists.txt.orig
|
||||||
+++ src/core/CMakeLists.txt
|
+++ src/core/CMakeLists.txt
|
||||||
@@ -79,9 +79,6 @@ set_target_properties(lucene++
|
@@ -57,7 +57,6 @@ target_link_libraries(lucene++
|
||||||
|
Boost::filesystem
|
||||||
|
Boost::iostreams
|
||||||
|
Boost::regex
|
||||||
|
- Boost::system
|
||||||
|
Boost::thread
|
||||||
|
ZLIB::ZLIB
|
||||||
|
)
|
||||||
|
@@ -78,9 +77,6 @@ set_target_properties(lucene++
|
||||||
|
VISIBILITY_INLINES_HIDDEN 1
|
||||||
VERSION ${lucene++_VERSION}
|
VERSION ${lucene++_VERSION}
|
||||||
SOVERSION ${lucene++_SOVERSION})
|
SOVERSION ${lucene++_SOVERSION})
|
||||||
|
-
|
||||||
-cotire(lucene++)
|
-cotire(lucene++)
|
||||||
-
|
-
|
||||||
-
|
|
||||||
install(TARGETS lucene++
|
install(TARGETS lucene++
|
||||||
DESTINATION "${LIB_DESTINATION}"
|
DESTINATION "${LIB_DESTINATION}"
|
||||||
COMPONENT runtime)
|
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
Index: src/demo/deletefiles/CMakeLists.txt
|
||||||
|
--- src/demo/deletefiles/CMakeLists.txt.orig
|
||||||
|
+++ src/demo/deletefiles/CMakeLists.txt
|
||||||
|
@@ -38,7 +38,6 @@ target_link_libraries(deletefiles
|
||||||
|
Boost::filesystem
|
||||||
|
Boost::iostreams
|
||||||
|
Boost::regex
|
||||||
|
- Boost::system
|
||||||
|
Boost::thread
|
||||||
|
ZLIB::ZLIB
|
||||||
|
lucene++::lucene++
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
Index: src/demo/indexfiles/CMakeLists.txt
|
||||||
|
--- src/demo/indexfiles/CMakeLists.txt.orig
|
||||||
|
+++ src/demo/indexfiles/CMakeLists.txt
|
||||||
|
@@ -39,7 +39,6 @@ target_link_libraries(indexfiles
|
||||||
|
Boost::filesystem
|
||||||
|
Boost::iostreams
|
||||||
|
Boost::regex
|
||||||
|
- Boost::system
|
||||||
|
Boost::thread
|
||||||
|
ZLIB::ZLIB
|
||||||
|
lucene++::lucene++
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
Index: src/demo/searchfiles/CMakeLists.txt
|
||||||
|
--- src/demo/searchfiles/CMakeLists.txt.orig
|
||||||
|
+++ src/demo/searchfiles/CMakeLists.txt
|
||||||
|
@@ -38,7 +38,6 @@ target_link_libraries(searchfiles
|
||||||
|
Boost::filesystem
|
||||||
|
Boost::iostreams
|
||||||
|
Boost::regex
|
||||||
|
- Boost::system
|
||||||
|
Boost::thread
|
||||||
|
ZLIB::ZLIB
|
||||||
|
lucene++::lucene++
|
||||||
@@ -3,7 +3,15 @@ disable cotire as it's deprecated and breaks the build with newer libc++
|
|||||||
Index: src/test/CMakeLists.txt
|
Index: src/test/CMakeLists.txt
|
||||||
--- src/test/CMakeLists.txt.orig
|
--- src/test/CMakeLists.txt.orig
|
||||||
+++ src/test/CMakeLists.txt
|
+++ src/test/CMakeLists.txt
|
||||||
@@ -77,5 +77,3 @@ target_link_libraries(lucene++-tester
|
@@ -63,7 +63,6 @@ target_link_libraries(lucene++-tester
|
||||||
|
Boost::filesystem
|
||||||
|
Boost::iostreams
|
||||||
|
Boost::regex
|
||||||
|
- Boost::system
|
||||||
|
Boost::thread
|
||||||
|
ZLIB::ZLIB
|
||||||
|
gtest_main
|
||||||
|
@@ -77,5 +76,3 @@ target_link_libraries(lucene++-tester
|
||||||
# link args
|
# link args
|
||||||
####################################
|
####################################
|
||||||
target_compile_options(lucene++-tester PRIVATE -DLPP_EXPOSE_INTERNAL)
|
target_compile_options(lucene++-tester PRIVATE -DLPP_EXPOSE_INTERNAL)
|
||||||
|
|||||||
Reference in New Issue
Block a user