diff options
Diffstat (limited to 'package/libatomic_ops')
| -rw-r--r-- | package/libatomic_ops/libatomic_ops-nothread-build-failure-fix.patch | 41 | ||||
| -rw-r--r-- | package/libatomic_ops/libatomic_ops.mk | 10 |
2 files changed, 51 insertions, 0 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 new file mode 100644 index 0000000000..cc14b1e2e9 --- /dev/null +++ b/package/libatomic_ops/libatomic_ops-nothread-build-failure-fix.patch @@ -0,0 +1,41 @@ +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 + diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk index 8f66f88ddd..10db2722e5 100644 --- a/package/libatomic_ops/libatomic_ops.mk +++ b/package/libatomic_ops/libatomic_ops.mk @@ -7,6 +7,16 @@ LIBATOMIC_OPS_VERSION = 7.2 LIBATOMIC_OPS_SOURCE = libatomic_ops-$(LIBATOMIC_OPS_VERSION).tar.gz LIBATOMIC_OPS_SITE = http://www.hpl.hp.com/research/linux/atomic_ops/download + +# From doc/LICENSING.txt: "Our intent is to make it easy to use +# libatomic_ops, in both free and proprietary software. Hence most +# code that we expect to be linked into a client application is +# covered by an MIT-style license. A few library routines are covered +# by the GNU General Public License. These are put into a separate +# library, libatomic_ops_gpl.a." +LIBATOMIC_OPS_LICENSE = MIT (main library) / GPLv2+ (gpl extension) +LIBATOMIC_OPS_LICENSE_FILES = doc/LICENSING.txt doc/COPYING + LIBATOMIC_OPS_INSTALL_STAGING = YES $(eval $(autotools-package)) |
