From 36ab06143f3f2e3242bf62f510a55687e26de4eb Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 14 Mar 2019 00:47:39 -0300 Subject: [PATCH] elogind: add missing patches. --- .../elogind/patches/0007-drop-canonicalize.patch | 16 ++++++++++++++++ .../elogind/patches/0008-drop-GLOB_BRACE.patch | 15 +++++++++++++++ srcpkgs/elogind/template | 2 +- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/elogind/patches/0007-drop-canonicalize.patch create mode 100644 srcpkgs/elogind/patches/0008-drop-GLOB_BRACE.patch diff --git a/srcpkgs/elogind/patches/0007-drop-canonicalize.patch b/srcpkgs/elogind/patches/0007-drop-canonicalize.patch new file mode 100644 index 00000000000..a631807a909 --- /dev/null +++ b/srcpkgs/elogind/patches/0007-drop-canonicalize.patch @@ -0,0 +1,16 @@ +diff --git src/shared/musl_missing.h src/shared/musl_missing.h +index d42f03c34..127df2d33 100644 +--- src/shared/musl_missing.h ++++ src/shared/musl_missing.h +@@ -64,10 +64,6 @@ extern char *program_invocation_short_name; + } ) ) + #endif + +-/* See http://man7.org/linux/man-pages/man3/canonicalize_file_name.3.html */ +-#define canonicalize_file_name(path) \ +- realpath(path, NULL) +- + /* GLOB_BRACE is another glibc extension - ignore it for musl libc */ + #define GLOB_BRACE 0 + + diff --git a/srcpkgs/elogind/patches/0008-drop-GLOB_BRACE.patch b/srcpkgs/elogind/patches/0008-drop-GLOB_BRACE.patch new file mode 100644 index 00000000000..ba9747dfb91 --- /dev/null +++ b/srcpkgs/elogind/patches/0008-drop-GLOB_BRACE.patch @@ -0,0 +1,15 @@ +diff --git src/shared/musl_missing.h src/shared/musl_missing.h +index d42f03c34..cb98836ac 100644 +--- src/shared/musl_missing.h ++++ src/shared/musl_missing.h +@@ -68,9 +68,6 @@ extern char *program_invocation_short_name; + #define canonicalize_file_name(path) \ + realpath(path, NULL) + +-/* GLOB_BRACE is another glibc extension - ignore it for musl libc */ +-#define GLOB_BRACE 0 +- + /* getnameinfo(3) glibc extensions are undefined in musl libc */ + #define NI_IDN 0 + #define NI_IDN_USE_STD3_ASCII_RULES 0 + diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template index 6ed449ecad7..52da01b6424 100644 --- a/srcpkgs/elogind/template +++ b/srcpkgs/elogind/template @@ -1,7 +1,7 @@ # Template file for 'elogind' pkgname=elogind version=241.1 -revision=1 +revision=2 build_style=meson configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt -Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot