Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (5076fd51d1ff12801f8d6b7b248d0ce1cb0d3e1c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (5076fd51d1ff12801f8d6b7b248d0ce1cb0d3e1c)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (5076fd51d1ff12801f8d6b7b248d0ce1cb0d3e1c)
  • Date: Wed, 25 Aug 2021 15:23:07 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

libs/luceneplusplus/BUILD | 2
libs/luceneplusplus/DEPENDS | 3
libs/luceneplusplus/DETAILS | 1
libs/luceneplusplus/HISTORY | 5
libs/luceneplusplus/PRE_BUILD | 3
libs/luceneplusplus/patches/0001-Fix-installation-issues.patch | 152
++++++++++
6 files changed, 165 insertions(+), 1 deletion(-)

New commits:
commit 5076fd51d1ff12801f8d6b7b248d0ce1cb0d3e1c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

luceneplusplus: Fix installation; PATCHLEVEL++

diff --git a/libs/luceneplusplus/BUILD b/libs/luceneplusplus/BUILD
new file mode 100755
index 0000000..aa0d24c
--- /dev/null
+++ b/libs/luceneplusplus/BUILD
@@ -0,0 +1,2 @@
+OPTS+=' -DENABLE_TEST=0' &&
+default_build
diff --git a/libs/luceneplusplus/DEPENDS b/libs/luceneplusplus/DEPENDS
index 221ddef..d5db239 100755
--- a/libs/luceneplusplus/DEPENDS
+++ b/libs/luceneplusplus/DEPENDS
@@ -1,2 +1,3 @@
. "$GRIMOIRE"/CMAKE_DEPENDS &&
-depends boost
+depends boost &&
+depends zlib
diff --git a/libs/luceneplusplus/DETAILS b/libs/luceneplusplus/DETAILS
index aa7d0db..b8d0da4 100755
--- a/libs/luceneplusplus/DETAILS
+++ b/libs/luceneplusplus/DETAILS
@@ -1,6 +1,7 @@
. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=luceneplusplus
VERSION=3.0.8
+ PATCHLEVEL=1
SOURCE="LucenePlusPlus-rel_$VERSION.tar.gz"

SOURCE_URL[0]="https://github.com/$SPELL/LucenePlusPlus/archive/refs/tags/rel_$VERSION.tar.gz";

SOURCE_HASH=sha512:fdc4ce5d55b05d8a1fa62bf749e2e428b8beec66847524f632b806d10ec7c969ca7d3c556804d2ce4b7cdf05db4f3c5613bde41aae53df9fe574d3046d448bf1
diff --git a/libs/luceneplusplus/HISTORY b/libs/luceneplusplus/HISTORY
index 347a7c5..050ef4d 100644
--- a/libs/luceneplusplus/HISTORY
+++ b/libs/luceneplusplus/HISTORY
@@ -1,2 +1,7 @@
2021-08-25 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS: spell created
+ * PRE_BUILD, patches/0001-Fix-installation-issues.patch:
+ fixed installation
+ * DEPENDS: added dep on zlib
+ * BUILD: disabled tests
+ * DETAILS: PATCHLEVEL++
diff --git a/libs/luceneplusplus/PRE_BUILD b/libs/luceneplusplus/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/libs/luceneplusplus/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/libs/luceneplusplus/patches/0001-Fix-installation-issues.patch
b/libs/luceneplusplus/patches/0001-Fix-installation-issues.patch
new file mode 100644
index 0000000..be8efa1
--- /dev/null
+++ b/libs/luceneplusplus/patches/0001-Fix-installation-issues.patch
@@ -0,0 +1,152 @@
+From 1cd2509ed74ae47965006d16de3c09db029b4efe Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco AT yahoo.it>
+Date: Mon, 4 Jan 2021 23:45:13 +0100
+Subject: [PATCH] Fix installation issues
+
+Fix various cmake issues:
+* "CMAKE_INSTALL_FULL_LIBDIR" not being correctly evaluated
+* pkgconfig directory wrongly set to include instead of lib
+* cmake directory wrongly set to include instead of lib
+* core_libname contrib_libname PACKAGE_CMAKE_INSTALL_INCLUDEDIR
+ PACKAGE_CMAKE_INSTALL_LIBDIR variables not being substituted to cmake.in
+ files
+* cmake helpers not being correctly set
+
+[ismael AT iodev.co.uk: Edited commit message]
+---
+ CMakeLists.txt | 2 +-
+ src/config/CMakeLists.txt | 12 ++++++------
+ src/config/contrib/CMakeLists.txt | 7 ++++---
+ .../contrib/liblucene++-contribConfig.cmake.in | 6 +++---
+ src/config/core/CMakeLists.txt | 7 ++++---
+ src/config/core/liblucene++Config.cmake.in | 6 +++---
+ 6 files changed, 21 insertions(+), 19 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 41de688b..71dbbd56 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,7 +21,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+ endif()
+
+ set(LIB_DESTINATION
+- "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE STRING "Define lib output directory
name")
++ "${CMAKE_INSTALL_LIBDIR}" CACHE STRING "Define lib output directory name")
+
+
+ ####################################
+diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt
+index e5e66240..fe8e8b89 100644
+--- a/src/config/CMakeLists.txt
++++ b/src/config/CMakeLists.txt
+@@ -1,16 +1,16 @@
+ ####################################
+ # Set config vars
+ ####################################
+-set(core_libname, "lucene++")
+-set(contrib_libname, "lucene++-contrib")
++set(core_libname "lucene++")
++set(contrib_libname "lucene++-contrib")
+
+ set(
+- PACKAGE_CMAKE_INSTALL_INCLUDEDIR,
+- "${lucene++_INCLUDE_DIR}/lucene++/")
++ PACKAGE_CMAKE_INSTALL_INCLUDEDIR
++ "${CMAKE_INSTALL_INCLUDEDIR}/lucene++/")
+
+ set(
+- PACKAGE_CMAKE_INSTALL_LIBDIR,
+- "${LIB_INSTALL_DIR}/cmake")
++ PACKAGE_CMAKE_INSTALL_LIBDIR
++ "${LIB_DESTINATION}")
+
+
+ ####################################
+diff --git a/src/config/contrib/CMakeLists.txt
b/src/config/contrib/CMakeLists.txt
+index c0dd86fc..b4a4391c 100644
+--- a/src/config/contrib/CMakeLists.txt
++++ b/src/config/contrib/CMakeLists.txt
+@@ -9,7 +9,7 @@ if(NOT WIN32)
+ install(
+ FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc"
+- DESTINATION "include/pkgconfig")
++ DESTINATION "${LIB_DESTINATION}/pkgconfig")
+ endif()
+
+
+@@ -19,7 +19,8 @@ endif()
+ configure_package_config_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/liblucene++-contribConfig.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfig.cmake"
+- INSTALL_DESTINATION "${LIB_DESTINATION}/cmake")
++ INSTALL_DESTINATION "${LIB_DESTINATION}/cmake/liblucene++-contrib"
++ PATH_VARS contrib_libname PACKAGE_CMAKE_INSTALL_INCLUDEDIR
PACKAGE_CMAKE_INSTALL_LIBDIR)
+
+ write_basic_package_version_file(
+ "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfigVersion.cmake"
+@@ -30,4 +31,4 @@ install(
+ FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfig.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfigVersion.cmake"
+- DESTINATION "include/cmake")
++ DESTINATION "${LIB_DESTINATION}/cmake/liblucene++-contrib")
+diff --git a/src/config/contrib/liblucene++-contribConfig.cmake.in
b/src/config/contrib/liblucene++-contribConfig.cmake.in
+index f92f6830..85fdfd2e 100644
+--- a/src/config/contrib/liblucene++-contribConfig.cmake.in
++++ b/src/config/contrib/liblucene++-contribConfig.cmake.in
+@@ -20,6 +20,6 @@ if (NOT DEFINED set_and_check)
+ endif()
+
+
+-set_and_check(liblucene++-contrib_INCLUDE_DIRS
"@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@contrib_libname@")
+-set_and_check(liblucene++-contrib_LIBRARY_DIRS
"@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+-set(liblucene++-contrib_LIBRARIES
"@PACKAGE_CMAKE_INSTALL_LIBDIR@/@contrib_libname@")
++set_and_check(liblucene++-contrib_INCLUDE_DIRS
"${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
++set_and_check(liblucene++-contrib_LIBRARY_DIRS
"${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_LIBDIR@")
++set(liblucene++-contrib_LIBRARIES "@contrib_libname@")
+diff --git a/src/config/core/CMakeLists.txt b/src/config/core/CMakeLists.txt
+index a3eb17a1..65376f55 100644
+--- a/src/config/core/CMakeLists.txt
++++ b/src/config/core/CMakeLists.txt
+@@ -9,7 +9,7 @@ if(NOT WIN32)
+ install(
+ FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc"
+- DESTINATION "include/pkgconfig")
++ DESTINATION "${LIB_DESTINATION}/pkgconfig")
+ endif()
+
+
+@@ -19,7 +19,8 @@ endif()
+ configure_package_config_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/liblucene++Config.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/liblucene++Config.cmake"
+- INSTALL_DESTINATION "${LIB_DESTINATION}/cmake")
++ INSTALL_DESTINATION "${LIB_DESTINATION}/cmake/liblucene++"
++ PATH_VARS core_libname PACKAGE_CMAKE_INSTALL_INCLUDEDIR
PACKAGE_CMAKE_INSTALL_LIBDIR)
+
+ write_basic_package_version_file(
+ ${CMAKE_CURRENT_BINARY_DIR}/liblucene++ConfigVersion.cmake
+@@ -30,4 +31,4 @@ install(
+ FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/liblucene++Config.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/liblucene++ConfigVersion.cmake"
+- DESTINATION "include/cmake")
++ DESTINATION "${LIB_DESTINATION}/cmake/liblucene++")
+diff --git a/src/config/core/liblucene++Config.cmake.in
b/src/config/core/liblucene++Config.cmake.in
+index 89b48a3d..574f8129 100644
+--- a/src/config/core/liblucene++Config.cmake.in
++++ b/src/config/core/liblucene++Config.cmake.in
+@@ -20,8 +20,8 @@ if (NOT DEFINED set_and_check)
+ endif()
+
+
+-set_and_check(liblucene++_INCLUDE_DIRS
"@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@core_libname@")
+-set_and_check(liblucene++_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+-set(liblucene++_LIBRARIES "@PACKAGE_CMAKE_INSTALL_LIBDIR@/@core_libname@")
++set_and_check(liblucene++_INCLUDE_DIRS
"${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
++set_and_check(liblucene++_LIBRARY_DIRS
"${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_LIBDIR@")
++set(liblucene++_LIBRARIES "@core_libname@")
+
+


  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (5076fd51d1ff12801f8d6b7b248d0ce1cb0d3e1c), Ismael Luceno, 08/25/2021

Archive powered by MHonArc 2.6.24.

Top of Page