Commit 64701828 authored by Boxiang Sun's avatar Boxiang Sun

These fixups is trying to solve the compilation issues which found under a limited network access.

See merge request nexedi/slapos!1229
parents 05dd3bb1 d62712ba
Pipeline #23295 failed with stage
...@@ -14,6 +14,7 @@ extends = ...@@ -14,6 +14,7 @@ extends =
../libtool/buildout.cfg ../libtool/buildout.cfg
../m4/buildout.cfg ../m4/buildout.cfg
../perl/buildout.cfg ../perl/buildout.cfg
../python-2.7/buildout.cfg
../pkgconfig/buildout.cfg ../pkgconfig/buildout.cfg
../xorg/buildout.cfg ../xorg/buildout.cfg
../icu/buildout.cfg ../icu/buildout.cfg
...@@ -81,7 +82,7 @@ configure-options = ...@@ -81,7 +82,7 @@ configure-options =
--disable-static --disable-static
--disable-gtk-doc-html --disable-gtk-doc-html
environment = environment =
PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${python2.7:location}/bin:${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${:pkg_config_depends} PKG_CONFIG_PATH=${:pkg_config_depends}
CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${harfbuzz:location}/lib -Wl,-rpath=${harfbuzz:location}/lib LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${harfbuzz:location}/lib -Wl,-rpath=${harfbuzz:location}/lib
......
...@@ -401,7 +401,7 @@ PyPDF2 = 1.26.0+SlapOSPatched001 ...@@ -401,7 +401,7 @@ PyPDF2 = 1.26.0+SlapOSPatched001
Django = 1.11 Django = 1.11
mock = 2.0.0:whl mock = 2.0.0:whl
testfixtures = 6.11 testfixtures = 6.11.0
funcsigs = 1.0.2 funcsigs = 1.0.2
mysqlclient = 1.3.12 mysqlclient = 1.3.12
pexpect = 4.8.0 pexpect = 4.8.0
......
...@@ -263,7 +263,7 @@ Werkzeug = 1.0.1 ...@@ -263,7 +263,7 @@ Werkzeug = 1.0.1
requests = 2.27.1 requests = 2.27.1
charset-normalizer = 2.0.12 charset-normalizer = 2.0.12
pyparsing = 2.2.0 pyparsing = 2.2.0
certifi = 2020.04.05.1 certifi = 2020.4.5.1
[versions:sys.version_info < (3,8)] [versions:sys.version_info < (3,8)]
MarkupSafe = 1.0 MarkupSafe = 1.0
......
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