From dfbb3893754c8b992970189d5a28cd7f95121672 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 17 Nov 2010 07:27:11 +0100 Subject: libglib2: ensure atomic ops patch gets applied Closes #2809 Signed-off-by: Peter Korsgaard --- CHANGES | 10 +++++++++ ....0-fix-compilation-with-no-builtin-atomic.patch | 25 ---------------------- ...b2-fix-compilation-with-no-builtin-atomic.patch | 25 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 25 deletions(-) delete mode 100644 package/libglib2/libglib-2.26.0-fix-compilation-with-no-builtin-atomic.patch create mode 100644 package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch diff --git a/CHANGES b/CHANGES index bc3e94498..bee6f3381 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,13 @@ +2010.11, Not yet released: + + Fixes all over the tree. + + Updated/fixed packages: libglib2 + + Issues resolved (http://bugs.uclibc.org): + + #2809: failed to compile libglib2 + 2010.11-rc1, Released November 8th, 2010: Fixes all over the tree and new features. diff --git a/package/libglib2/libglib-2.26.0-fix-compilation-with-no-builtin-atomic.patch b/package/libglib2/libglib-2.26.0-fix-compilation-with-no-builtin-atomic.patch deleted file mode 100644 index 39c051078..000000000 --- a/package/libglib2/libglib-2.26.0-fix-compilation-with-no-builtin-atomic.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 58096320ea0888c4fbbff318839017a4d2e82703 Mon Sep 17 00:00:00 2001 -From: Lionel Landwerlin -Date: Sat, 6 Nov 2010 14:56:15 +0100 -Subject: [PATCH] glib: fix compilation with no builtin atomic operations compilers - -Signed-off-by: Lionel Landwerlin ---- - glib/gatomic.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/glib/gatomic.c b/glib/gatomic.c -index 845c866..01468ce 100644 ---- a/glib/gatomic.c -+++ b/glib/gatomic.c -@@ -881,6 +881,7 @@ g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomi - #endif /* DEFINE_WITH_WIN32_INTERLOCKED */ - - #ifdef DEFINE_WITH_MUTEXES -+# include "gthread.h" - /* We have to use the slow, but safe locking method */ - static GMutex *g_atomic_mutex; - --- -1.7.2.3 - diff --git a/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch b/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch new file mode 100644 index 000000000..39c051078 --- /dev/null +++ b/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch @@ -0,0 +1,25 @@ +From 58096320ea0888c4fbbff318839017a4d2e82703 Mon Sep 17 00:00:00 2001 +From: Lionel Landwerlin +Date: Sat, 6 Nov 2010 14:56:15 +0100 +Subject: [PATCH] glib: fix compilation with no builtin atomic operations compilers + +Signed-off-by: Lionel Landwerlin +--- + glib/gatomic.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/glib/gatomic.c b/glib/gatomic.c +index 845c866..01468ce 100644 +--- a/glib/gatomic.c ++++ b/glib/gatomic.c +@@ -881,6 +881,7 @@ g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomi + #endif /* DEFINE_WITH_WIN32_INTERLOCKED */ + + #ifdef DEFINE_WITH_MUTEXES ++# include "gthread.h" + /* We have to use the slow, but safe locking method */ + static GMutex *g_atomic_mutex; + +-- +1.7.2.3 + -- cgit v1.2.3-55-g7522