diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2016-05-03 20:43:38 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-05-03 20:43:38 +0000 |
commit | 5fe65558eae7567514f51e0f26fb8d675847134d (patch) | |
tree | ca6164cc5ba963a77af973c1616c318cd6bc9be6 /community/sigar/0002-only-enable-the-GNU-libc-strerror_r-on-GNU-libc.patch | |
parent | 5813bbbb225136d5443e8472d1373125b650424d (diff) | |
download | aports-5fe65558eae7567514f51e0f26fb8d675847134d.tar.bz2 aports-5fe65558eae7567514f51e0f26fb8d675847134d.tar.xz |
community/sigar: move from testing
Diffstat (limited to 'community/sigar/0002-only-enable-the-GNU-libc-strerror_r-on-GNU-libc.patch')
-rw-r--r-- | community/sigar/0002-only-enable-the-GNU-libc-strerror_r-on-GNU-libc.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/community/sigar/0002-only-enable-the-GNU-libc-strerror_r-on-GNU-libc.patch b/community/sigar/0002-only-enable-the-GNU-libc-strerror_r-on-GNU-libc.patch new file mode 100644 index 0000000000..c3e2930f10 --- /dev/null +++ b/community/sigar/0002-only-enable-the-GNU-libc-strerror_r-on-GNU-libc.patch @@ -0,0 +1,29 @@ +From c8f2ab95adb2553741bec8c38b1517c092439f9e Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon, 14 Mar 2016 14:17:29 +0000 +Subject: [PATCH 2/3] only enable the GNU libc strerror_r on GNU libc + +We don't want use the non-standard GNU libc variant of strerror_r on +musl libc, or any libc other than GNU. + +(cherry picked from commit e78f794c22e7825374d1d9bda37f649ed2f725d3) +--- + src/os/linux/sigar_os.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/os/linux/sigar_os.h b/src/os/linux/sigar_os.h +index 29a2ba3..7e1ead7 100644 +--- a/src/os/linux/sigar_os.h ++++ b/src/os/linux/sigar_os.h +@@ -70,7 +70,7 @@ struct sigar_t { + }; + + #define HAVE_STRERROR_R +-#ifndef __USE_XOPEN2K ++#if !defined(__USE_XOPEN2K) && defined(__GLIBC__) + /* use gnu version of strerror_r */ + #define HAVE_STRERROR_R_GLIBC + #endif +-- +2.8.1 + |