Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (85b77858714e86bd048062b000065bec1ee095f8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (85b77858714e86bd048062b000065bec1ee095f8)
  • Date: Tue, 19 May 2015 12:12:38 -0500

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

libs/clucene/BUILD | 3 +
libs/clucene/CONFIGURE | 3 +
libs/clucene/HISTORY | 6 ++
libs/clucene/PRE_BUILD | 6 ++
libs/clucene/PRE_SUB_DEPENDS | 1
libs/clucene/REPAIR^all^PRE_SUB_DEPENDS | 1
libs/clucene/SUB_DEPENDS | 2
libs/clucene/clucene-2.3.3.4-contribs_lib-1.patch | 49
++++++++++++++++++++++
8 files changed, 71 insertions(+)

New commits:
commit 85b77858714e86bd048062b000065bec1ee095f8
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

libs/clucene: added option to build third-party contributions for 2.x
branch

diff --git a/libs/clucene/BUILD b/libs/clucene/BUILD
index f52df82..22e4416 100755
--- a/libs/clucene/BUILD
+++ b/libs/clucene/BUILD
@@ -2,5 +2,8 @@ if [[ $CLUCENE_BRANCH == "stable" ]]; then
OPTS="--disable-static $OPTS" &&
default_build
else
+ if [[ $CLUCENE_CONTRIBS == "y" ]]; then
+ OPTS="-DBUILD_CONTRIBS=ON -DBUILD_CONTRIBS_LIB=ON $OPTS"
+ fi &&
cmake_build
fi
diff --git a/libs/clucene/CONFIGURE b/libs/clucene/CONFIGURE
new file mode 100755
index 0000000..7ba092d
--- /dev/null
+++ b/libs/clucene/CONFIGURE
@@ -0,0 +1,3 @@
+if [[ $CLUCENE_BRANCH != "stable" ]]; then
+ config_query CLUCENE_CONTRIBS "Do you want third-party contributions?" n
+fi
diff --git a/libs/clucene/HISTORY b/libs/clucene/HISTORY
index f32643e..38742ae 100644
--- a/libs/clucene/HISTORY
+++ b/libs/clucene/HISTORY
@@ -1,3 +1,9 @@
+2015-05-19 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, CONFIGURE, *SUB_DEPENDS: added option to build third-party
+ contributions for 2.x branch
+ * PRE_BUILD, clucene-2.3.3.4-contribs_lib-1.patch: added fix for
+ building third-party contributions (borrowed from BLFS & Debian)
+
2012-07-23 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: re-add stable branch (0.9.21b)
* PREPARE: added, to select branch
diff --git a/libs/clucene/PRE_BUILD b/libs/clucene/PRE_BUILD
new file mode 100755
index 0000000..b4771b8
--- /dev/null
+++ b/libs/clucene/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if [ "$CLUCENE_BRANCH" != "stable" ]; then
+ patch -p1 < "$SPELL_DIRECTORY/clucene-2.3.3.4-contribs_lib-1.patch"
+fi
diff --git a/libs/clucene/PRE_SUB_DEPENDS b/libs/clucene/PRE_SUB_DEPENDS
index efc181b..07f5559 100755
--- a/libs/clucene/PRE_SUB_DEPENDS
+++ b/libs/clucene/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
stable) [[ $CLUCENE_BRANCH == "stable" ]] && return 0;;
+CONTRIBS) [[ $CLUCENE_BRANCH == "2.x" && $CLUCENE_CONTRIBS == "y" ]] &&
return 0;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
esac
diff --git a/libs/clucene/REPAIR^all^PRE_SUB_DEPENDS
b/libs/clucene/REPAIR^all^PRE_SUB_DEPENDS
index efc181b..07f5559 100755
--- a/libs/clucene/REPAIR^all^PRE_SUB_DEPENDS
+++ b/libs/clucene/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
stable) [[ $CLUCENE_BRANCH == "stable" ]] && return 0;;
+CONTRIBS) [[ $CLUCENE_BRANCH == "2.x" && $CLUCENE_CONTRIBS == "y" ]] &&
return 0;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
esac
diff --git a/libs/clucene/SUB_DEPENDS b/libs/clucene/SUB_DEPENDS
index cd14da7..f158859 100755
--- a/libs/clucene/SUB_DEPENDS
+++ b/libs/clucene/SUB_DEPENDS
@@ -1,5 +1,7 @@
case $THIS_SUB_DEPENDS in
stable) message "clucene stable branch (0.9.21b) needed, forcing it." &&
CLUCENE_BRANCH="stable";;
+CONTRIBS) message "clucene third-party contributions in 2.x branch needed,
forcing it." &&
+ CLUCENE_BRANCH="2.x" && CLUCENE_CONTRIBS="y";;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
esac
diff --git a/libs/clucene/clucene-2.3.3.4-contribs_lib-1.patch
b/libs/clucene/clucene-2.3.3.4-contribs_lib-1.patch
new file mode 100644
index 0000000..7866eae
--- /dev/null
+++ b/libs/clucene/clucene-2.3.3.4-contribs_lib-1.patch
@@ -0,0 +1,49 @@
+Submitted By: Igor Živković <contact AT igor-zivkovic.from.hr>
+Date: 2013-10-17
+Initial Package Version: 2.3.3.4
+Upstream Status: Reported
+Origin: Debian
+Description: Fixed building and installing of contribs-lib if
specified by config.
+
+diff -Naur clucene-2.3.3.4.orig/CMakeLists.txt clucene-2.3.3.4/CMakeLists.txt
+--- clucene-2.3.3.4.orig/CMakeLists.txt 2013-10-17 11:32:30.064546492
+0200
++++ clucene-2.3.3.4/CMakeLists.txt 2013-10-17 11:33:58.559550441 +0200
+@@ -163,7 +163,7 @@
+ SET(BUILD_CONTRIBS_LIB 1)
+ ENDIF ( BUILD_CONTRIBS )
+ IF ( BUILD_CONTRIBS_LIB )
+- ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL)
++ ADD_SUBDIRECTORY (src/contribs-lib)
+ ENDIF ( BUILD_CONTRIBS_LIB )
+
+
+diff -Naur clucene-2.3.3.4.orig/src/contribs-lib/CMakeLists.txt
clucene-2.3.3.4/src/contribs-lib/CMakeLists.txt
+--- clucene-2.3.3.4.orig/src/contribs-lib/CMakeLists.txt 2013-10-17
11:32:30.076546493 +0200
++++ clucene-2.3.3.4/src/contribs-lib/CMakeLists.txt 2013-10-17
11:33:58.560550441 +0200
+@@ -106,9 +106,26 @@
+ )
+ TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs})
+
++#install public headers.
++FOREACH(file ${HEADERS})
++ get_filename_component(apath ${file} PATH)
++ get_filename_component(aname ${file} NAME)
++ file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib
${apath})
++ IF ( NOT aname MATCHES "^_.*" )
++ install(FILES ${file}
++ DESTINATION include/${relpath}
++ COMPONENT development)
++ ENDIF ( NOT aname MATCHES "^_.*" )
++ENDFOREACH(file)
++
+ #set properties on the libraries
+ SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES
+ VERSION ${CLUCENE_VERSION}
+ SOVERSION ${CLUCENE_SOVERSION}
+ COMPILE_DEFINITIONS_DEBUG _DEBUG
+ )
++
++#and install library
++install(TARGETS clucene-contribs-lib
++ DESTINATION ${LIB_DESTINATION}
++ COMPONENT runtime )



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (85b77858714e86bd048062b000065bec1ee095f8), Pavel Vinogradov, 05/19/2015

Archive powered by MHonArc 2.6.24.

Top of Page