elogind: fix musl
This commit is contained in:
parent
cc86c33aaf
commit
1557f6b7e1
3 changed files with 18 additions and 17 deletions
|
@ -1,13 +0,0 @@
|
|||
--- configure.ac.orig 2017-04-25 13:43:00.222521106 +0200
|
||||
+++ configure.ac 2017-04-25 13:43:06.527502607 +0200
|
||||
@@ -216,10 +216,6 @@ AS_CASE([$CC], [*clang*],
|
||||
-Wno-gnu-variable-sized-type-not-at-end \
|
||||
])])
|
||||
|
||||
-AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*],
|
||||
- [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
|
||||
- -flto])],
|
||||
- [AC_MSG_RESULT([skipping -flto, optimization not enabled])])
|
||||
AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags")
|
||||
|
||||
AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*],
|
15
srcpkgs/elogind/patches/fix-musl-respect-ro-stdout.patch
Normal file
15
srcpkgs/elogind/patches/fix-musl-respect-ro-stdout.patch
Normal file
|
@ -0,0 +1,15 @@
|
|||
diff --git a/src/shared/pager.c b/src/shared/pager.c
|
||||
index bc2d0372c..d84a7e073 100644
|
||||
--- src/shared/pager.c
|
||||
+++ src/shared/pager.c
|
||||
@@ -150,8 +150,8 @@ void pager_close(void) {
|
||||
return;
|
||||
|
||||
/* Inform pager that we are done */
|
||||
- stdout = safe_fclose(stdout);
|
||||
- stderr = safe_fclose(stderr);
|
||||
+ (void) safe_fclose(stdout);
|
||||
+ (void) safe_fclose(stderr);
|
||||
|
||||
(void) kill(pager_pid, SIGCONT);
|
||||
(void) wait_for_terminate(pager_pid, NULL);
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'elogind'
|
||||
pkgname=elogind
|
||||
version=227.2
|
||||
version=227.3
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="automake libxslt intltool libtool pkg-config gperf docbook-xsl gettext-devel"
|
||||
|
@ -11,10 +11,9 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
|
|||
license="GPL-2, LGPL-2, MIT"
|
||||
homepage="https://github.com/elogind/elogind"
|
||||
distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz"
|
||||
checksum=e5f81693dbac865e991268aa33c60e07feb3a76c698b8ab8396213171931dd24
|
||||
CFLAGS="-fno-lto"
|
||||
checksum=f2911417d1d81f95cb4fdf48faf52b554abe55dc764518fcbe0c9c22707ac2fb
|
||||
conf_files="/etc/elogind/logind.conf"
|
||||
configure_args+=" --disable-kdbus"
|
||||
configure_args+=" --disable-kdbus --disable-lto"
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -fi
|
||||
|
|
Loading…
Reference in a new issue