From bca53d7e70c500c83ba428e2f405c35e80e53b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Mon, 19 Nov 2018 13:57:48 +0100 Subject: [PATCH] component/subversion: Use openssl == 1.0 Since default openssl component is 1.1 and is not compatible with this component, use openssl-1.0. --- component/subversion/buildout.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/component/subversion/buildout.cfg b/component/subversion/buildout.cfg index f4dbbb8b7..de99a1d47 100644 --- a/component/subversion/buildout.cfg +++ b/component/subversion/buildout.cfg @@ -53,9 +53,9 @@ configure-options = make-targets = install -j1 environment = PATH=${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s - PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${serf:location}/lib/pkgconfig + PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl-1.0:location}/lib/pkgconfig:${serf:location}/lib/pkgconfig CPPFLAGS=-I${libexpat:location}/include -I${libuuid:location}/include - LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${openssl:location}/lib + LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib [subversion-1.9] recipe = hexagonit.recipe.cmmi @@ -95,6 +95,6 @@ make-targets = environment = PATH=${pkgconfig:location}/bin:${neon:location}/bin:%(PATH)s - PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${neon:location}/lib/pkgconfig + PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl-1.0:location}/lib/pkgconfig:${neon:location}/lib/pkgconfig CPPFLAGS=-I${libexpat:location}/include -I${libuuid:location}/include - LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${neon:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib + LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${neon:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -- 2.30.9