xxx icu4c-55.1 + qt5-make

component/onlyoffice-core/buildout.cfg

@@ -12,7 +12,7 @@ parts +=
   onlyoffice-core
 
 [onlyoffice-core]
-dummy = ${pole:location}:${icu4c-55-1:location}:${cryptopp-5.6:location}:${v8-4.10:location}
+dummy = ${pole:location}:${icu4c-55.1:location}:${cryptopp-5.6:location}:${v8-4.10:location}
 # XXX please, put the third party component in slapos !
 #     boost, cef, icu, v8 and pole (is there others ??? XXX TRISTAN XXX)
 recipe = slapos.recipe.cmmi
@@ -43,17 +43,18 @@ configure-command =
   sed 's:^V8_ABSOLUTE_PATH=SED_IT$:V8_ABSOLUTE_PATH=${v8-4.10:location}:' -i Common/3dParty/v8/fetch.sh || exit 1
   sed 's,\(include($$PWD/OfficeUtils.pri)\)),\1,g' -i OfficeUtils/OfficeUtils.pro || exit 1
   sed 's,\$\$SOURCES_UTILS,'"$PWD/OfficeUtils/src,g" -i OfficeUtils/OfficeUtils.pri || exit 1
-  sed 's@qmake -r@qmake -r -spec ${qmake:location}/mkspecs/linux-g++ "QMAKE_CXXFLAGS += -std=c++11 -fPIC -I${zlib:location}/include -Wl,-rpath=${zlib:location}/lib"@g' -i Makefile || exit 1
+#  sed 's@qmake -r@qmake -r -spec ${qt5-qmake:location}/mkspecs/linux-g++ "QMAKE_CXXFLAGS += -std=c++11 -fPIC -I${zlib:location}/include -Wl,-rpath=${zlib:location}/lib"@g' -i Makefile || exit 1
+  sed 's@qmake -r@qmake -r -spec ${qt5-qmake:location}/mkspecs/linux-g++ "QMAKE_CXXFLAGS += -std=c++11"@g' -i Makefile || exit 1
   ( cd Common/3dParty && ./make.sh ) || exit 1
 #  cp -rnt DesktopEditor/doctrenderer ${nodejs-4:location}/include/node/*
 #  echo 'QMAKE_CXXFLAGS += -std=c++11' >> PdfWriter/PdfWriter.pro
 make-targets =
-  bin
+  lib bin
 environment =
-  PATH=${p7zip:location}/bin:${qmake:location}/bin:%(PATH)s
-  CPPFLAGS=-I${qmake:location}/include -I${zlib:location}/include -fPIC
-  CXXFLAGS=-I${qmake:location}/include -I${zlib:location}/include -fPIC
-  LD_LIBRARY_PATH=${qmake:location}/lib:${qmake:location}/lib64:${zlib:location}/lib
+  PATH=${p7zip:location}/bin:${qt5-qmake:location}/bin:%(PATH)s
+  CPPFLAGS=-I${qt5-qmake:location}/include -I${zlib:location}/include -fPIC
+  CXXFLAGS=-I${qt5-qmake:location}/include -I${zlib:location}/include -fPIC
+  LD_LIBRARY_PATH=${qt5-qmake:location}/lib:${qt5-qmake:location}/lib64:${zlib:location}/lib
 #  PATH=${gcc:location}/bin:${nodejs:location}/bin:%(PATH)s
 #  CPPFLAGS=-I${gcc:location}/include
 #  LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64