summaryrefslogtreecommitdiffstats
path: root/package/motion/0001-Fix-pthread_setname_np-detection.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-12-01 21:56:44 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-12-01 21:56:44 +0100
commit1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7 (patch)
treedd26d5bc619271f8cccf0c9d7abdda9a1749d13f /package/motion/0001-Fix-pthread_setname_np-detection.patch
parent57dcad243e6daefefbe21109e1fc97272053a7a0 (diff)
parent787a31fed42f98a8e2e6a0bd2079376c861436f2 (diff)
downloadbuildroot-1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7.tar.gz
buildroot-1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7.zip
Merge branch 'next'
This merges the next branch accumulated during the 2017.11 release cycle back into the master branch. A few conflicts had to be resolved: - In the DEVELOPERS file, because Fabrice Fontaine was added as a developer for libupnp in master, and for libupnp18 in next. Resolution is simple: add him for both. - linux/Config.in, because we updated the 4.13.x release used by default in master, while we moved to 4.14 in next. Resolution: use 4.14. - package/libupnp/libupnp.hash: a hash for the license file was added in master, while the package was bumped into next. Resolution: keep the hash for the license file, and keep the hash for the newest version of libupnp. - package/linux-headers/Config.in.host: default version of the kernel headers for 4.13 was bumped to the latest 4.13.x in master, but was changed to 4.14 in next. Resolution: use 4.14. - package/samba4/: samba was bumped to 4.6.11 in master for security reasons, but was bumped to 4.7.3 in next. Resolution: keep 4.7.3. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/motion/0001-Fix-pthread_setname_np-detection.patch')
-rw-r--r--package/motion/0001-Fix-pthread_setname_np-detection.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/package/motion/0001-Fix-pthread_setname_np-detection.patch b/package/motion/0001-Fix-pthread_setname_np-detection.patch
new file mode 100644
index 0000000000..dc14232c2b
--- /dev/null
+++ b/package/motion/0001-Fix-pthread_setname_np-detection.patch
@@ -0,0 +1,50 @@
+From 505be2201377fa347a34b6cb4164c856b55e7484 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Thu, 23 Nov 2017 22:47:39 +0100
+Subject: [PATCH] Fix pthread_setname_np detection
+
+Commit 6617c6f2c8aad041d3428bea11206fd2e61763b1 replaced
+AC_LINK_IFELSE with AC_COMPILE_IFELSE. This has broken the
+pthread_setname_np detection as compilation will always succeed even if
+pthread_setname_np is not available (if the function is not found, a
+simple warning will be displayed in config.log).
+
+The correct fix is to put back AC_LINK_IFELSE with -pthread in LIBS
+otherwise compilation will fail on toolchain without pthread_setname_np.
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ configure.ac | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1792b65..21efd2a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -128,17 +128,20 @@ fi
+ if test x$THREADS = xyes; then
+ TEMP_LIBS="$TEMP_LIBS -pthread"
+ TEMP_CFLAGS="${TEMP_CFLAGS} -D_THREAD_SAFE"
+-fi
+
+ ##############################################################################
+ ### Check for pthread_setname_np (nonstandard GNU extension)
+ ##############################################################################
+-AC_MSG_CHECKING([for pthread_setname_np])
+-AC_COMPILE_IFELSE(
++ AC_MSG_CHECKING([for pthread_setname_np])
++ HOLD_LIBS="$LIBS"
++ LIBS="$TEMP_LIBS"
++ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([#include <pthread.h>], [pthread_setname_np(pthread_self(), "name")])],
+ [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP], [1], [Define if you have pthread_setname_np function.])
+ AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])] )
++ LIBS="$HOLD_LIBS"
++fi
+
+ ##############################################################################
+ ### Check for JPG
+--
+2.14.1
+
OpenPOWER on IntegriCloud