[arch-commits] Commit in lucene++/trunk (PKGBUILD)

[Kyle Keen]

    Date: Friday, April 24, 2015 @ 17:24:07
  Author: kkeen
Revision: 132120

upgpkg: lucene++ 3.0.7-2  boost 1.58 rebuild

Modified:
  lucene++/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-24 15:18:49 UTC (rev 132119)
+++ PKGBUILD	2015-04-24 15:24:07 UTC (rev 132120)
@@ -4,7 +4,8 @@
 
 pkgname=lucene++
 pkgver=3.0.7
-pkgrel=1
+_githash='972c9cb37'
+pkgrel=2
 pkgdesc='C++ port of the popular Java Lucene library'
 arch=(i686 x86_64)
 url='https://github.com/luceneplusplus/LucenePlusPlus'
@@ -12,27 +13,30 @@
 depends=('boost-libs')
 makedepends=('boost' 'cmake' 'subversion')
 #source=(https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_$pkgver.tar.gz)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/luceneplusplus/LucenePlusPlus/archive/master.tar.gz")
-md5sums=('72dab7dbd7c1fea7d29d7dc01fd65af0')
+source=("https://github.com/luceneplusplus/LucenePlusPlus/archive/${_githash}.tar.gz")
+md5sums=('486af3a6da7a119669e64c979049852c')
 
 prepare() {
   mkdir build
+  #ln -s LucenePlusPlus-rel_$pkgver LucenePlusPlus-$pkgver
+  #ln -s LucenePlusPlus-master LucenePlusPlus-$pkgver
+  ln -s LucenePlusPlus-$_githash* LucenePlusPlus-$pkgver
   sed -i \
     -e 's#SET(LUCENE++_VERSION_REVISION.*#SET(LUCENE++_VERSION_REVISION "5")#' \
     -e 's#SET(LUCENE++_VERSION_PATCH.*#SET(LUCENE++_VERSION_PATCH "0")#' \
-    $srcdir/LucenePlusPlus-master/CMakeLists.txt
-#    $srcdir/LucenePlusPlus-rel_$pkgver/CMakeLists.txt
+    $srcdir/LucenePlusPlus-$pkgver/CMakeLists.txt
 }
 
 build() {
   cd build
 
-#  cmake ../LucenePlusPlus-rel_$pkgver \
-  cmake ../LucenePlusPlus-master \
+  cmake ../LucenePlusPlus-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_DESTINATION=/usr/lib \
     -DBoost_LIBRARY_DIR=/usr/lib \
-    -DENABLE_CUSTOM_ALLOCATOR='FALSE'
+    -DENABLE_CUSTOM_ALLOCATOR='FALSE' \
+    -DCMAKE_CXX_FLAGS='-DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT'
+    # RELAXED for boost 1.58 breakage, remove when lucene++ updates
 
   make
 }