diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-02-28 14:30:23 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-02-28 14:30:23 +0100 |
| commit | b108fdcb83d457e5d43298fb93dbfd805d076f24 (patch) | |
| tree | 7fbd64a13fc915f5cea93708419cb3c6aa1b40ea /package/libatomic_ops/libatomic_ops-nothread-build-failure-fix.patch | |
| parent | a6cfaea44e5105cb66e4e797042f64335f5e7c01 (diff) | |
| parent | 9e40a1005f51d10784db295797ed270a130d79d5 (diff) | |
| download | buildroot-b108fdcb83d457e5d43298fb93dbfd805d076f24.tar.gz buildroot-b108fdcb83d457e5d43298fb93dbfd805d076f24.zip | |
Merge branch 'next'
Conflicts:
Makefile
package/dmraid/Config.in
package/gdb/Config.in.host
package/linux-headers/linux-headers.mk
package/python/python.mk
package/python3/python3.mk
package/rt-tests/Config.in
package/sdl/sdl.mk
package/systemd/systemd-01-fix-getty-unit.patch
package/systemd/systemd-02-fix-page-size.patch
package/systemd/systemd-03-uclibc-fix.patch
package/udev/Config.in
package/udisks/Config.in
package/vlc/vlc.mk
system/Config.in
Quite some merge conflicts, hopefully I didn't screw up anything.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/libatomic_ops/libatomic_ops-nothread-build-failure-fix.patch')
| -rw-r--r-- | package/libatomic_ops/libatomic_ops-nothread-build-failure-fix.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/package/libatomic_ops/libatomic_ops-nothread-build-failure-fix.patch b/package/libatomic_ops/libatomic_ops-nothread-build-failure-fix.patch deleted file mode 100644 index cc14b1e2e9..0000000000 --- a/package/libatomic_ops/libatomic_ops-nothread-build-failure-fix.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7e940ce34ff4de254d460344f1a1a486a14fb045 Mon Sep 17 00:00:00 2001 -From: Gilles Talis <gilles.talis@gmail.com> -Date: Wed, 22 May 2013 16:21:26 -0700 -Subject: [PATCH] Fix build failure seen when using toolchain without threads support - -Signed-off-by: Gilles Talis <gilles.talis@gmail.com> ---- - src/atomic_ops.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/atomic_ops.c b/src/atomic_ops.c -index b6731a2..5769643 100644 ---- a/src/atomic_ops.c -+++ b/src/atomic_ops.c -@@ -48,7 +48,9 @@ - - #undef AO_REQUIRE_CAS - -+#if defined(AO_USE_PTHREAD_DEFS) - #include <pthread.h> -+#endif - - #ifndef AO_USE_NO_SIGNALS - # include <signal.h> -@@ -72,11 +74,13 @@ - # include "atomic_ops/sysdeps/standard_ao_double_t.h" - #endif - -+#if defined(AO_USE_PTHREAD_DEFS) - /* - * Lock for pthreads-based implementation. - */ - - pthread_mutex_t AO_pt_lock = PTHREAD_MUTEX_INITIALIZER; -+#endif - - /* - * Out of line compare-and-swap emulation based on test and set. --- -1.7.4.1 - |
