diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-02-07 21:53:07 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-02-07 22:02:47 +0100 |
| commit | cb444002409b677de22e54bf97030ef9121bd188 (patch) | |
| tree | d0b3546fe4f7563ce5e3dbe01d06b0eeffd6b414 /package/mpd/0002-notify-use-constexpr-only-with-glibc.patch | |
| parent | 834893a965a993e8a73e30b448426f626419f3c8 (diff) | |
| download | buildroot-cb444002409b677de22e54bf97030ef9121bd188.tar.gz buildroot-cb444002409b677de22e54bf97030ef9121bd188.zip | |
mpd: use upstream patches
This commit replaces 0002-musl-gcc5-fixes.patch by a backport of 3
upstream commits. It also renames
0001-thread-Name-include-stdio.h-for-prctl-as-well.patch to have the
sequence number 0004, so that it applies after the backported upstream
patches (since this patch is not upstream yet).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/mpd/0002-notify-use-constexpr-only-with-glibc.patch')
| -rw-r--r-- | package/mpd/0002-notify-use-constexpr-only-with-glibc.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/package/mpd/0002-notify-use-constexpr-only-with-glibc.patch b/package/mpd/0002-notify-use-constexpr-only-with-glibc.patch new file mode 100644 index 0000000000..e50f598540 --- /dev/null +++ b/package/mpd/0002-notify-use-constexpr-only-with-glibc.patch @@ -0,0 +1,31 @@ +From 09830d448d6299a47fbccf39af6f325be5f2b514 Mon Sep 17 00:00:00 2001 +From: Max Kellermann <max@duempel.org> +Date: Thu, 17 Sep 2015 22:56:35 +0200 +Subject: [PATCH] notify: use "constexpr" only with glibc + +The Mutex and Cond constructors are only "constexpr" with glibc, and +this is what this #ifdef is about. + +[Thomas: taken from upstream commit 459a812a54509ebfd634a3df2998395c9cb5b98f.] +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + src/notify.hxx | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/notify.hxx b/src/notify.hxx +index 1ee413f..c96390b 100644 +--- a/src/notify.hxx ++++ b/src/notify.hxx +@@ -28,8 +28,7 @@ struct notify { + Cond cond; + bool pending; + +-#if !defined(WIN32) && !defined(__NetBSD__) && !defined(__BIONIC__) && \ +- !defined(__HAIKU__) ++#ifdef __GLIBC__ + constexpr + #endif + notify():pending(false) {} +-- +2.6.4 + |
