Commit 73fbf648 authored by Jérome Perrin's avatar Jérome Perrin

software/gitlab: fix rpath for nokogiri

This was using zlib and lzma from system if they are available, so we
tell bundler to use the slapos version.

We have to use both in --with-cflags for nokogiri itself and as CFLAGS
environ for when nokogiri build its included libxml2
parent e288dc6b
...@@ -14,6 +14,7 @@ extends = ...@@ -14,6 +14,7 @@ extends =
../../component/nodejs/buildout.cfg ../../component/nodejs/buildout.cfg
../../component/openssl/buildout.cfg ../../component/openssl/buildout.cfg
../../component/nginx/buildout.cfg ../../component/nginx/buildout.cfg
../../component/xz-utils/buildout.cfg
../../component/zlib/buildout.cfg ../../component/zlib/buildout.cfg
../../component/icu/buildout.cfg ../../component/icu/buildout.cfg
gowork.cfg gowork.cfg
...@@ -182,7 +183,8 @@ bundle = ${bundler-4gitlab:bundle} ...@@ -182,7 +183,8 @@ bundle = ${bundler-4gitlab:bundle}
configure-command = cd ${:path} && configure-command = cd ${:path} &&
${:bundle} config --local build.charlock_holmes --with-icu-dir=${icu:location} && ${:bundle} config --local build.charlock_holmes --with-icu-dir=${icu:location} &&
${:bundle} config --local build.pg --with-pg-config=${postgresql10:location}/bin/pg_config && ${:bundle} config --local build.pg --with-pg-config=${postgresql10:location}/bin/pg_config &&
${:bundle} config --local build.re2 --with-re2-dir=${re2:location} ${:bundle} config --local build.re2 --with-re2-dir=${re2:location} &&
${:bundle} config --local build.nokogiri --with-zlib-dir=${zlib:location} --with-cflags="-I${xz-utils:location}/include" --with-ldflags="-L${xz-utils:location}/lib -Wl,-rpath -Wl,${xz-utils:location}/lib"
make-binary = make-binary =
make-targets= cd ${:path} && make-targets= cd ${:path} &&
...@@ -190,6 +192,7 @@ make-targets= cd ${:path} && ...@@ -190,6 +192,7 @@ make-targets= cd ${:path} &&
environment = environment =
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${re2:location}/lib/pkgconfig PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${re2:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:%(PATH)s
CFLAGS=-I${xz-utils:location}/include
################## Google re2 ################## Google re2
[re2] [re2]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment