Commit 3b9ad375 authored by Rafael Monnerat's avatar Rafael Monnerat

Follow up gettext changes and introduce few required workarrounds

parent cd5c93fa
...@@ -26,7 +26,7 @@ environment += ...@@ -26,7 +26,7 @@ environment +=
# Add gettext library path to RPATH as its binaries are used to build # Add gettext library path to RPATH as its binaries are used to build
# glib for example # glib for example
environment = environment =
PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${perl:location}/bin:${lunzip:location}/bin:%(PATH)s
CPPFLAGS=-I${libxml2:location}/include -I${zlib:location}/include -I${ncurses:location}/include CPPFLAGS=-I${libxml2:location}/include -I${zlib:location}/include -I${ncurses:location}/include
LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=%BUILD_DIRECTORY%/parts/${:_buildout_section_name_}/lib LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=%BUILD_DIRECTORY%/parts/${:_buildout_section_name_}/lib
...@@ -36,6 +36,11 @@ configure-options += ...@@ -36,6 +36,11 @@ configure-options +=
make-options += make-options +=
DESTDIR=%BUILD_ROOT_DIRECTORY% DESTDIR=%BUILD_ROOT_DIRECTORY%
[openssl]
# HTTPS is not work on debian 6 where the package is originally
# prepared to be upload.
url = http://www.openssl.org/source/openssl-1.0.2d.tar.gz
[versions] [versions]
cliff = 1.4.5 cliff = 1.4.5
slapos.core = 1.3.10 slapos.core = 1.3.12
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