Commit 8ae52559 authored by Łukasz Nowak's avatar Łukasz Nowak

Feature/version up 202110 complex

See merge request nexedi/slapos!1069
parents 6f2c9945 86707a66
...@@ -9,11 +9,9 @@ extends = ...@@ -9,11 +9,9 @@ extends =
parts = parts =
libxml2 libxml2
[libxml2] [libxml2-common]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://xmlsoft.org/sources/libxml2-2.9.10.tar.gz
md5sum = 10942a1dc23137a8aa07f0639cbfece5
configure-options = configure-options =
--disable-static --disable-static
--without-python --without-python
...@@ -22,3 +20,13 @@ configure-options = ...@@ -22,3 +20,13 @@ configure-options =
environment = environment =
PATH=${perl:location}/bin:%(PATH)s PATH=${perl:location}/bin:%(PATH)s
LDFLAGS=-Wl,-rpath=${zlib:location}/lib LDFLAGS=-Wl,-rpath=${zlib:location}/lib
[libxml2-2.9.10]
<= libxml2-common
url = http://xmlsoft.org/sources/libxml2-2.9.10.tar.gz
md5sum = 10942a1dc23137a8aa07f0639cbfece5
[libxml2]
<= libxml2-common
url = http://xmlsoft.org/sources/libxml2-2.9.12.tar.gz
md5sum = f433a39be087a9f0b197eb2307ad9f75
...@@ -14,7 +14,7 @@ shared = true ...@@ -14,7 +14,7 @@ shared = true
# --disable-static is temporarilly removed due to build error # --disable-static is temporarilly removed due to build error
# with xml2-config that does not support '--dynamic' argument. # with xml2-config that does not support '--dynamic' argument.
configure-options = configure-options =
--with-libxml-prefix=${libxml2:location} --with-libxml-prefix=${libxml2-2.9.10:location}
--without-crypto --without-crypto
--without-python --without-python
--without-debug --without-debug
......
[buildout] [buildout]
extends = extends =
../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
../patch/buildout.cfg
parts = parts =
m4 m4
[m4] [m4]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.xz url = http://ftp.gnu.org/gnu/m4/m4-1.4.19.tar.xz
md5sum = 730bb15d96fffe47e148d1e09235af82 md5sum = 0d90823e1426f1da2fd872df0311298d
environment = environment =
PATH=${xz-utils:location}/bin:%(PATH)s PATH=${xz-utils:location}/bin:%(PATH)s
patch-binary = ${patch:location}/bin/patch
patch-options = -p1
patches =
https://sources.debian.org/data/main/m/m4/1.4.18-5/debian/patches/01-fix-ftbfs-with-glibc-2.28.patch#058a786425e507f911649205b61ffcac
...@@ -4,12 +4,17 @@ extends = ...@@ -4,12 +4,17 @@ extends =
parts = parts =
meson meson
[meson-0.57.2]
<= meson
version = 0.57.2
md5sum = 4a07b6d42d7a46a6b6e9604fae7da9aa
[meson] [meson]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://github.com/mesonbuild/meson/releases/download/${:version}/meson-${:version}.tar.gz url = https://github.com/mesonbuild/meson/releases/download/${:version}/meson-${:version}.tar.gz
version = 0.57.2 version = 0.59.2
md5sum = 4a07b6d42d7a46a6b6e9604fae7da9aa md5sum = 9d65e09b53b1dfab6339a0982176935d
configure-command = true configure-command = true
make-binary = true make-binary = true
post-install = post-install =
......
...@@ -32,7 +32,7 @@ pre-configure = ...@@ -32,7 +32,7 @@ pre-configure =
sed -i '/^libmigration\b/s/$/ dependencies: [zlib],/' meson.build sed -i '/^libmigration\b/s/$/ dependencies: [zlib],/' meson.build
sed -i 's/\bsnappy,/zlib, \0/' dump/meson.build sed -i 's/\bsnappy,/zlib, \0/' dump/meson.build
configure-options = configure-options =
--meson=${meson:location}/bin/meson --meson=${meson-0.57.2:location}/bin/meson
--ninja=${ninja:location}/bin/ninja --ninja=${ninja:location}/bin/ninja
--target-list="$(uname -m 2>/dev/null|sed 's,^i[456]86$,i386,')-softmmu" --target-list="$(uname -m 2>/dev/null|sed 's,^i[456]86$,i386,')-softmmu"
--enable-system --enable-system
......
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