From 8b64d0c55681319cc9184661d5843e70b23e1ae1 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Wed, 18 Apr 2018 11:47:06 -0700 Subject: [PATCH 1/2] systemd: update to v238 --- packages/sysutils/systemd/package.mk | 5 ++-- ...temd-0101-fix-build-with-kernel-3.10.patch | 27 ------------------- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 packages/sysutils/systemd/patches/systemd-0101-fix-build-with-kernel-3.10.patch diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index 289e279891..fd151656cf 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="systemd" -PKG_VERSION="237" -PKG_SHA256="c83dabbe1c9de6b9db1dafdb7e04140c7d0535705c68842f6c0768653ba4913c" +PKG_VERSION="238" +PKG_SHA256="bbc8599bab2e3c4273886dfab12464e488ecdaf20b8284949e50f8858de3e022" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd" @@ -31,6 +31,7 @@ PKG_LONGDESC="systemd is a system and session manager for Linux, compatible with PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \ -Drootprefix=/usr \ -Dsplit-usr=false \ + -Dsplit-bin=true \ -Ddefault-hierarchy=hybrid \ -Dtty-gid=5 \ -Dtests=false \ diff --git a/packages/sysutils/systemd/patches/systemd-0101-fix-build-with-kernel-3.10.patch b/packages/sysutils/systemd/patches/systemd-0101-fix-build-with-kernel-3.10.patch deleted file mode 100644 index 2fdf03c211..0000000000 --- a/packages/sysutils/systemd/patches/systemd-0101-fix-build-with-kernel-3.10.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e52504dca98923302ecbdd018aae8e86376e166a Mon Sep 17 00:00:00 2001 -From: MilhouseVH -Date: Sun, 4 Feb 2018 17:46:59 +0000 -Subject: [PATCH] kernel 3.10 compat: RTAX_QUICKACK not added until 3.11.0 - ---- - src/basic/missing.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/basic/missing.h b/src/basic/missing.h -index 1280e6c..9d4d08e 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -1047,6 +1047,10 @@ struct input_mask { - #define RTA_PREF 20 - #endif - -+#ifndef RTAX_QUICKACK -+#define RTAX_QUICKACK 15 -+#endif -+ - #ifndef IPV6_UNICAST_IF - #define IPV6_UNICAST_IF 76 - #endif --- -2.14.1 - From d3f5ce595f2c317c85f2efffdc4e2979c375d6e5 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Wed, 18 Apr 2018 12:40:22 -0700 Subject: [PATCH 2/2] meson: add upstream patch PR3196 --- ...ort-data-types-larger-than-128-bytes.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 packages/python/devel/meson/patches/meson-0001-Support-data-types-larger-than-128-bytes.patch diff --git a/packages/python/devel/meson/patches/meson-0001-Support-data-types-larger-than-128-bytes.patch b/packages/python/devel/meson/patches/meson-0001-Support-data-types-larger-than-128-bytes.patch new file mode 100644 index 0000000000..39962d7c01 --- /dev/null +++ b/packages/python/devel/meson/patches/meson-0001-Support-data-types-larger-than-128-bytes.patch @@ -0,0 +1,38 @@ +From c4192a04fd3d46ac7a0ee81a158e7b1e3d4f06f8 Mon Sep 17 00:00:00 2001 +From: Thierry Reding +Date: Wed, 7 Mar 2018 12:51:25 +0100 +Subject: [PATCH] Support data types larger than 128 bytes + +Recent versions of systemd (starting with v238) started to check for the +existence of the statx structure using the cc.sizeof() operation. The cc +compiler implementation fails to detect this structure because it's size +limit is 128, meaning it will fail for any type larger than 128 bytes in +the following way during cross-compilation checks: + + meson.build:10:2: ERROR: Cross-compile check overflowed + +Increase the size limit for data types to 1024 bytes, which should give +plenty of room for even large data structures. This is obviously not +guaranteed to be an upper bound, but given the binary search algorithm +implemented in the cross-compile check, raising the limit too high may +significantly increase the time required for this check on smaller data +types. + +Signed-off-by: Thierry Reding +--- + mesonbuild/compilers/c.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py +index e0cccc3cb..56b46b4fb 100644 +--- a/mesonbuild/compilers/c.py ++++ b/mesonbuild/compilers/c.py +@@ -416,7 +416,7 @@ def cross_sizeof(self, typename, prefix, env, extra_args=None, dependencies=None + }}''' + if not self.compiles(t.format(**fargs), env, extra_args, dependencies): + return -1 +- return self.cross_compute_int('sizeof(%s)' % typename, 1, 128, None, prefix, env, extra_args, dependencies) ++ return self.cross_compute_int('sizeof(%s)' % typename, 1, 1024, None, prefix, env, extra_args, dependencies) + + def sizeof(self, typename, prefix, env, extra_args=None, dependencies=None): + if extra_args is None: