summaryrefslogtreecommitdiffstats
path: root/smgl
diff options
context:
space:
mode:
authorTreeve Jelbert2018-03-11 13:25:40 +0100
committerTreeve Jelbert2018-03-11 13:28:49 +0100
commitb1551a7ede1dd5fbee50f35657de3d5ed5748486 (patch)
tree39fc7761471faa93dabbe1e88ca3aae87796c7ce /smgl
parentec1fe51e4cd6c1dbe7955ad9b8612e0d3dd60159 (diff)
elogind: => 235.3
Diffstat (limited to 'smgl')
-rwxr-xr-xsmgl/elogind/DETAILS4
-rw-r--r--smgl/elogind/HISTORY5
-rwxr-xr-xsmgl/elogind/PRE_BUILD3
-rw-r--r--smgl/elogind/patches/glibc-2.27.patch32
4 files changed, 42 insertions, 2 deletions
diff --git a/smgl/elogind/DETAILS b/smgl/elogind/DETAILS
index 0c9123a9d9..d5a17cafef 100755
--- a/smgl/elogind/DETAILS
+++ b/smgl/elogind/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=elogind
- VERSION=235.2
- SOURCE_HASH=sha512:6fa9194e8c21fa3d3caf6f9499f772dbfe38b9d40d8a0fe43ee32ad4b2acd672a78798d00694d1e0d6107625f4f3f06b71e0a5466ed4be446d670f9bcd961313
+ VERSION=235.3
+ SOURCE_HASH=sha512:83080169d58438e6e3bf350ec6e30b198662f5b8ab9be7916edc1c3faf788adc2c0634b260b55f63505b55dd7600c5cd34640a1c65333e915e4251951d0092bf
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://github.com/elogind/elogind
diff --git a/smgl/elogind/HISTORY b/smgl/elogind/HISTORY
index 18e89e6c85..5539159ed6 100644
--- a/smgl/elogind/HISTORY
+++ b/smgl/elogind/HISTORY
@@ -1,3 +1,8 @@
+2018-03-11 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 235.3
+ * PRE_BUILD glibc.patch: added
+ fixes build with glibc2.27
+
2018-01-16 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 235.2
* BUILD DEPENDS: adapt to meson build
diff --git a/smgl/elogind/PRE_BUILD b/smgl/elogind/PRE_BUILD
new file mode 100755
index 0000000000..922c0ab256
--- /dev/null
+++ b/smgl/elogind/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/smgl/elogind/patches/glibc-2.27.patch b/smgl/elogind/patches/glibc-2.27.patch
new file mode 100644
index 0000000000..77244d5460
--- /dev/null
+++ b/smgl/elogind/patches/glibc-2.27.patch
@@ -0,0 +1,32 @@
+--- a/meson.build 2018-03-02 19:07:27.075804300 +0100
++++ b/meson.build 2018-03-02 19:17:55.025815868 +0100
+@@ -481,7 +481,8 @@
+ endforeach
+
+ foreach ident : [
+- ['memfd_create', '''#include <sys/memfd.h>'''],
++ ['memfd_create', '''#define _GNU_SOURCE
++ #include <sys/mman.h>'''],
+ ['gettid', '''#include <sys/types.h>'''],
+ ['pivot_root', '''#include <stdlib.h>'''], # no known header declares pivot_root
+ ['name_to_handle_at', '''#define _GNU_SOURCE
+@@ -494,7 +495,8 @@
+ ['kcmp', '''#include <linux/kcmp.h>'''],
+ ['keyctl', '''#include <sys/types.h>
+ #include <keyutils.h>'''],
+- ['copy_file_range', '''#include <sys/syscall.h>
++ ['copy_file_range', '''#define _GNU_SOURCE
++ #include <sys/syscall.h>
+ #include <unistd.h>'''],
+ ['bpf', '''#include <sys/syscall.h>
+ #include <unistd.h>'''],
+--- a/src/basic/fileio.c 2018-03-02 19:20:22.485818585 +0100
++++ b/src/basic/fileio.c 2018-03-02 19:20:40.799152256 +0100
+@@ -24,6 +24,7 @@
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/mman.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>