diff --git a/component/coreutils/buildout.cfg b/component/coreutils/buildout.cfg index 6dfbf6ce4c256365a0f5dc49755d285112a0c9b3..a70946417fd4e82f7168c3e8597d524dcc3e2406 100644 --- a/component/coreutils/buildout.cfg +++ b/component/coreutils/buildout.cfg @@ -11,6 +11,9 @@ recipe = slapos.recipe.cmmi shared = true url = https://ftp.gnu.org/gnu/coreutils/coreutils-8.31.tar.xz md5sum = 0009a224d8e288e8ec406ef0161f9293 +configure-options = + --disable-libcap + --prefix=@@LOCATION@@ environment = PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s LDFLAGS=-Wl,--as-needed -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib diff --git a/component/libzip/buildout.cfg b/component/libzip/buildout.cfg index 134a4c997c5caeff0fa9bd0fd61f7466cb746800..b6987f902f5024bb69280b5012454aa7a9fa4190 100644 --- a/component/libzip/buildout.cfg +++ b/component/libzip/buildout.cfg @@ -26,4 +26,4 @@ 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 + LDFLAGS=-L${:location}/lib -Wl,-rpath=${:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib diff --git a/component/proftpd/buildout.cfg b/component/proftpd/buildout.cfg index 41997cfe366caca2158f0f7d4f037292767f746b..c04c2a40334c2fa6a10cda19a6fa23a40842da3f 100644 --- a/component/proftpd/buildout.cfg +++ b/component/proftpd/buildout.cfg @@ -22,11 +22,8 @@ recipe = collective.recipe.grp [proftpd] recipe = slapos.recipe.cmmi -md5sum = 13270911c42aac842435f18205546a1b -url = ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.6.tar.gz -# 1.3.6 is not compatible with openssl 1.1.x -# https://github.com/proftpd/proftpd/issues/674 -# (fix is in master, we are waiting for next release) +md5sum = 4040f6a6b86173e2a03f4ccdb9b9af6e +url = ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.6b.tar.gz configure-options = --enable-openssl --enable-nls @@ -39,8 +36,8 @@ environment = LDFLAGS=${:ldflags} install_user=${proftpd-environment:USER} install_group=${proftpd-grp:GROUP} -cppflags=-I${zlib:location}/include -I${openssl-1.0:location}/include -ldflags=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib +cppflags=-I${zlib:location}/include -I${openssl:location}/include +ldflags=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib patch-binary = ${patch:location}/bin/patch patch-options = -p1 patches = diff --git a/component/zstd/buildout.cfg b/component/zstd/buildout.cfg index 267c57ed9d2b213c36a08504cdfce85671420d0f..13ae3c92fe9f7c2c5c4abb036bc2e4d16064bc20 100644 --- a/component/zstd/buildout.cfg +++ b/component/zstd/buildout.cfg @@ -1,4 +1,5 @@ [buildout] +extends = ../zlib/buildout.cfg parts = zstd @@ -10,4 +11,7 @@ md5sum = 487f7ee1562dee7c1c8adf85e2a63df9 shared = true location = @@LOCATION@@ configure-command = : -make-options = PREFIX=${:location} +environment = + PREFIX=${:location} + LD_FLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib + CFLAGS=-I${zlib:location}/include