libcap-ng: fix compilation without pthread.h
PATCH 1/1 libcap-ng: fix compilation without pthread.h
Fixes:
- http://autobuild.buildroot.net/results/6132f33fb282fda3c39deb292784b9006c9e7872
--- .../0001-Fix-compilation-without-pthread.h.patch | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/libcap-ng/0001-Fix-compilation-without-pthread.h.patch
package/libcap-ng/0001-Fix-compilation-without-pthread.h.patch new file +47 -0
@@ -0,0 +1,47 @@ +From 1d28cf070933568db8006ce45411723c5369e145 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Tue, 10 Apr 2018 19:54:50 +0200 +Subject: [PATCH] Fix compilation without pthread.h + +Commit 7759e6f8469eb33aef1a1d5eba5d300c3a8fcb63 broke compilation on +systems without pthread.h. So add a call to AC_CHECK_HEADERS in +configure.ac and put include <pthread.h> under HAVE_PTHREAD_H define + +Fixes: + - http://autobuild.buildroot.net/results/6132f33fb282fda3c39deb292784b9006c9e7872 + +Signed-off-by: Fabrice Fontaine <[email protected]> +--- + configure.ac | 1 + + src/cap-ng.c | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 7a99c72..4d6afee 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,6 +56,7 @@ AC_CHECK_HEADERS(sys/xattr.h, [], [ + AC_CHECK_HEADERS(attr/xattr.h, [], [AC_MSG_WARN(attr/xattr.h not found, disabling file system capabilities.)]) + ]) + AC_CHECK_HEADERS(linux/securebits.h, [], []) ++AC_CHECK_HEADERS(pthread.h, [], [AC_MSG_WARN(pthread.h not found, disabling pthread_atfork.)]) + + AC_C_CONST + AC_C_INLINE +diff --git a/src/cap-ng.c b/src/cap-ng.c +index db647fd..240d2ba 100644 +--- a/src/cap-ng.c ++++ b/src/cap-ng.c +@@ -34,7 +34,9 @@ + #include <errno.h> + #include <fcntl.h> + #include <byteswap.h> ++#ifdef HAVE_PTHREAD_H + #include <pthread.h> // For pthread_atfork ++#endif + #ifdef HAVE_SYSCALL_H + #include <sys/syscall.h> + #endif +-- +2.14.1 +
Signature · 1 line
2.14.1
PATCH 1/1 libcap-ng: fix compilation without pthread.h
Hi Fabrice,
Quoted 18 lines · Fabrice Fontaine
Fixes:
- http://autobuild.buildroot.net/results/6132f33fb282fda3c39deb292784b9006c9e7872Signed-off-by Fabrice Fontaine <[email protected]>--- .../0001-Fix-compilation-without-pthread.h.patch | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/libcap-ng/0001-Fix-compilation-without-pthread.h.patchpackage/libcap-ng/0001-Fix-compilation-without-pthread.h.patch new file +3
-0@@ -0,0 +1,47 @@ +From 1d28cf070933568db8006ce45411723c5369e145 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Tue, 10 Apr 2018 19:54:50 +0200
package/libcap-ng/0001-Fix-compilation-without-pthread.h.patch line 13
Quoted 10 lines
package/libcap-ng/0001-Fix-compilation-without-pthread.h.patch new file +10
-0+Subject: [PATCH] Fix compilation without pthread.h + +Commit 7759e6f8469eb33aef1a1d5eba5d300c3a8fcb63 broke compilation on +systems without pthread.h. So add a call to AC_CHECK_HEADERS in +configure.ac and put include <pthread.h> under HAVE_PTHREAD_H define + +Fixes: + - http://autobuild.buildroot.net/results/6132f33fb282fda3c39deb292784b9006c9e7872 + +Signed-off-by: Fabrice Fontaine <[email protected]>
Upstream status: https://github.com/stevegrubb/libcap-ng/pull/4
Quoted 23 lines
package/libcap-ng/0001-Fix-compilation-without-pthread.h.patch new file +23
-0+--- + configure.ac | 1 + + src/cap-ng.c | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 7a99c72..4d6afee 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,6 +56,7 @@ AC_CHECK_HEADERS(sys/xattr.h, [], [ + AC_CHECK_HEADERS(attr/xattr.h, [], [AC_MSG_WARN(attr/xattr.h not found, disabling file system capabilities.)]) + ]) + AC_CHECK_HEADERS(linux/securebits.h, [], []) ++AC_CHECK_HEADERS(pthread.h, [], [AC_MSG_WARN(pthread.h not found, disabling pthread_atfork.)]) + + AC_C_CONST + AC_C_INLINE +diff --git a/src/cap-ng.c b/src/cap-ng.c +index db647fd..240d2ba 100644 +--- a/src/cap-ng.c ++++ b/src/cap-ng.c +@@ -34,7 +34,9 @@ + #include <errno.h>
package/libcap-ng/0001-Fix-compilation-without-pthread.h.patch line 46
Quoted 10 lines
package/libcap-ng/0001-Fix-compilation-without-pthread.h.patch new file +10
-0+ #include <fcntl.h> + #include <byteswap.h> ++#ifdef HAVE_PTHREAD_H + #include <pthread.h> // For pthread_atfork ++#endif + #ifdef HAVE_SYSCALL_H + #include <sys/syscall.h> + #endif +-- +2.14.1
baruch
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -PATCH 1/1 libcap-ng: fix compilation without pthread.h
In reply to Fabrice FontaineHello,
Quoted 8 lines · Fabrice Fontaine
Fixes:
- http://autobuild.buildroot.net/results/6132f33fb282fda3c39deb292784b9006c9e7872Signed-off-by Fabrice Fontaine <[email protected]>--- .../0001-Fix-compilation-without-pthread.h.patch | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/libcap-ng/0001-Fix-compilation-without-pthread.h.patch
You're now patching configure.ac, so autoreconf is needed. I've added that and applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com