diff --git a/component/h2o/buildout.cfg b/component/h2o/buildout.cfg index 32bc951bbfcbecd5fb11ef40b591f5fab730b5ca..0829b9aa953c393fc6493625eb50e582fc6ba137 100644 --- a/component/h2o/buildout.cfg +++ b/component/h2o/buildout.cfg @@ -14,7 +14,7 @@ recipe = slapos.recipe.cmmi shared = True url = https://github.com/h2o/h2o/archive/v2.2.6.tar.gz md5sum = 075283f92347fcb7b2f87dcc5251b922 -configure-command = ${cmake:location}/bin/cmake . +configure-command = ${cmake:location}/bin/cmake configure-options = -DCMAKE_INSTALL_PREFIX=@@LOCATION@@ -DWITH_MRUBY=on diff --git a/component/inkscape/buildout.cfg b/component/inkscape/buildout.cfg index 593e5ce2fe590bb79994c89443f9426c595ae559..cb96ad2747c08e6a50c54665a5213c6a3e0b349f 100644 --- a/component/inkscape/buildout.cfg +++ b/component/inkscape/buildout.cfg @@ -41,11 +41,10 @@ recipe = slapos.recipe.cmmi shared = true url = https://inkscape.org/gallery/item/13330/inkscape-0.92.4_A6N0YOn.tar.bz2 md5sum = ac30f6d5747fd9c620c00dad500f414f -location = @@LOCATION@@ pkg_config_depends = ${freetype:location}/lib/pkgconfig:${gtkmm:location}/lib/pkgconfig:${gtkmm:pkg_config_depends}:${gsl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig configure-command = ${cmake:location}/bin/cmake configure-options = - -DCMAKE_INSTALL_PREFIX=${:location} + -DCMAKE_INSTALL_PREFIX=@@LOCATION@@ -DENABLE_POPPLER=OFF -DWITH_GNOME_VFS=OFF -DWITH_IMAGE_MAGICK=OFF diff --git a/component/libzip/buildout.cfg b/component/libzip/buildout.cfg index a50d2932e42b73c7522f58b7f24b2ba9bd50ed55..242d3e7400a2d69ebbf4d1556b72e61c00677a31 100644 --- a/component/libzip/buildout.cfg +++ b/component/libzip/buildout.cfg @@ -13,17 +13,16 @@ shared = true url = https://libzip.org/download/libzip-1.5.2.tar.xz md5sum = f9dd38d273bcdec5d3d1498fe6684f42 location = @@LOCATION@@ -configure-command = - mkdir build && cd build && \ - ${cmake:location}/bin/cmake \ - -DCMAKE_INSTALL_PREFIX=${:location} \ - -DCMAKE_INCLUDE_PATH=${zlib:location}/include:${bzip2:location}/include \ - -DCMAKE_LIBRARY_PATH=${zlib:location}/lib:${bzip2:location}/lib \ - .. -make-binary = - cd build && make +configure-command = cmake +configure-options = + -Bbuild + -DCMAKE_BUILD_TYPE=Release + -DCMAKE_INSTALL_PREFIX=${:location} + -DCMAKE_INCLUDE_PATH=${zlib:location}/include:${bzip2:location}/include + -DCMAKE_LIBRARY_PATH=${zlib:location}/lib:${bzip2:location}/lib +make-options = -C build environment = PATH=${cmake:location}/bin:%(PATH)s CMAKE_INCLUDE_PATH=${zlib:location}/include:${bzip2:location}/include CMAKE_LIBRARY_PATH=${zlib:location}/lib:${bzip2:location}/lib - LDFLAGS=-L${:location}/lib -Wl,-rpath=${:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib + LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib diff --git a/component/llvm/buildout.cfg b/component/llvm/buildout.cfg index 628a16580cb2eadefbbdbe86ca597c24565d1ef2..787e6acfb68812030e411acb30cf975f3cba25d2 100644 --- a/component/llvm/buildout.cfg +++ b/component/llvm/buildout.cfg @@ -11,8 +11,9 @@ shared = true url = https://github.com/llvm/llvm-project/releases/download/llvmorg-${:version}/llvm-${:version}.src.tar.xz version = 11.0.0 md5sum = 85844102335b2e01b3c64b6734fb56f2 -configure-command = mkdir build && cd build && ${cmake:location}/bin/cmake .. +configure-command = ${cmake:location}/bin/cmake configure-options = + -Bbuild -DCMAKE_INSTALL_PREFIX=@@LOCATION@@ -DCMAKE_BUILD_TYPE=Release -DLLVM_INSTALL_UTILS=ON diff --git a/component/snappy/buildout.cfg b/component/snappy/buildout.cfg index 760cc36c283be36d32e5d617d0ca2851ee1caefd..b94b20277f74645f2054b3cebf74a2561a752238 100644 --- a/component/snappy/buildout.cfg +++ b/component/snappy/buildout.cfg @@ -9,10 +9,8 @@ recipe = slapos.recipe.cmmi shared = true url = https://github.com/google/snappy/archive/1.1.8.tar.gz md5sum = 70e48cba7fecf289153d009791c9977f -location = @@LOCATION@@ configure-command = ${cmake:location}/bin/cmake configure-options = - -DCMAKE_INSTALL_PREFIX=${:location} + -DCMAKE_BUILD_TYPE=Release + -DCMAKE_INSTALL_PREFIX=@@LOCATION@@ -DBUILD_SHARED_LIBS=ON -environment = - CMAKE_PROGRAM_PATH=${cmake:location}/bin diff --git a/component/srslte/buildout.cfg b/component/srslte/buildout.cfg index bad38f512a229f2e42755d5d2840ba725dae0493..a27f62f199f86427293235d4f3430944092b2ddf 100644 --- a/component/srslte/buildout.cfg +++ b/component/srslte/buildout.cfg @@ -15,28 +15,22 @@ parts = recipe = slapos.recipe.cmmi url = https://github.com/srsLTE/srsLTE/archive/release_18_09.zip md5sum = d9007ff9bd03ba67c6ed8acfd9bf2a7a -pre-configure = - mkdir -p build -configure-command = cd build && ${cmake:location}/bin/cmake ../ - -make-binary = -make-targets= cd build && - make DESTDIR=@@LOCATION@@ -j1 install - - -configure-options = +configure-command = cmake +configure-options = + -Bbuild + -DCMAKE_INSTALL_PREFIX=@@LOCATION@@ -DCMAKE_C_FLAGS="${:CMAKE_CFLAGS}" -DCMAKE_CXX_FLAGS="${:CMAKE_CFLAGS}" -DCMAKE_INSTALL_RPATH=${:CMAKE_LIBRARY_PATH} -DCMAKE_INCLUDE_PATH=${mbedtls:location}/include -DCMAKE_LIBRARY_PATH=${mbedtls:location}/lib +make-options = -C build CMAKE_CFLAGS = -I${bzip2:location}/include -I${fftw3:location}/include -I${mbedtls:location}/include -I${lksctp-tools:location}/include -I${libconfig:location}/include -I${boost-lib:location}/include CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${mbedtls:location}/lib:${lksctp-tools:location}/lib:${libconfig:location}/lib:${boost-lib:location}/lib:${fftw3:location}/lib environment = CMAKE_INSTALL_PREFIX=${buildout:directory}/bin - CMAKE_PROGRAM_PATH=${cmake:location}/bin CMAKE_INCLUDE_PATH=${bzip2:location}/include:${mbedtls:location}/include:${lksctp-tools:location}/include:${libconfig:location}/include:${boost-lib:location}/include:${fftw3:location}/include CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH} CPPFLAGS=${:CMAKE_CFLAGS} diff --git a/component/yaml-cpp/buildout.cfg b/component/yaml-cpp/buildout.cfg index e0693ce4ede0e0222b7c3b37355b30f561d7a359..b3c0e471f65d860c6abb47812a285d4befb53f00 100644 --- a/component/yaml-cpp/buildout.cfg +++ b/component/yaml-cpp/buildout.cfg @@ -10,11 +10,9 @@ recipe = slapos.recipe.cmmi shared = true url = https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.3.tar.gz md5sum = b45bf1089a382e81f6b661062c10d0c2 -location = @@LOCATION@@ -configure-command = - mkdir build && cd build && \ - ${cmake:location}/bin/cmake \ - -DYAML_BUILD_SHARED_LIBS=ON \ - -DCMAKE_INSTALL_PREFIX=${:location} \ - .. +configure-command = ${cmake:location}/bin/cmake +configure-options = + -Bbuild + -DYAML_BUILD_SHARED_LIBS=ON + -DCMAKE_INSTALL_PREFIX=@@LOCATION@@ make-options = -C build