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

[Evangelos Foutras]

    Date: Wednesday, March 28, 2018 @ 03:13:54
  Author: foutrelis
Revision: 313012

Fix build with ICU 61

Modified:
  mapnik/trunk/PKGBUILD

----------+
 PKGBUILD |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-28 01:06:15 UTC (rev 313011)
+++ PKGBUILD	2018-03-28 03:13:54 UTC (rev 313012)
@@ -29,6 +29,9 @@
 build() {
   cd "${srcdir}"/$pkgname-v$pkgver
 
+  # http://site.icu-project.org/download/61#TOC-Migration-Issues
+  CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
+
   PYTHON=python2
   scons configure \
     PREFIX="/usr" \
@@ -35,8 +38,9 @@
     INPUT_PLUGINS=all \
     XMLPARSER=libxml2 \
     DESTDIR="$pkgdir" \
-    CUSTOM_CXXFLAGS="-DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL"
-  scons -j1 # $MAKEFLAGS
+    CUSTOM_CXXFLAGS="$CXXFLAGS" \
+    CUSTOM_LDFLAGS="$LDFLAGS"
+  scons $(expr "$MAKEFLAGS" : '.*\(\-j[0-9]\+\)')
 }
 
 package(){