Commit c6fb7802 authored by Diego Fernando Nieto's avatar Diego Fernando Nieto Committed by Jean-Baptiste Kempf
Browse files

contrib: workaround libxml 2.9.0 threads error for OSX


Modified-by: Edward Wang's avatarEdward Wang <edward.c.wang@compdigitec.com>
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 00c5b9f8
--- libxml2-2.9.0/threads.c.orig 2012-11-10 08:11:05.000000000 -0500
+++ libxml2-2.9.0/threads.c 2012-11-10 08:12:30.000000000 -0500
@@ -146,6 +146,7 @@
static pthread_key_t globalkey;
static pthread_t mainthread;
static pthread_once_t once_control = PTHREAD_ONCE_INIT;
+static pthread_once_t once_control_init = PTHREAD_ONCE_INIT;
static pthread_mutex_t global_init_lock = PTHREAD_MUTEX_INITIALIZER;
#elif defined HAVE_WIN32_THREADS
#if defined(HAVE_COMPILER_TLS)
@@ -915,7 +916,7 @@
#ifdef HAVE_PTHREAD_H
if ((libxml_is_threaded) && (pthread_key_delete != NULL))
pthread_key_delete(globalkey);
- once_control = PTHREAD_ONCE_INIT;
+ once_control = once_control_init;
#elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
if (globalkey != TLS_OUT_OF_INDEXES) {
xmlGlobalStateCleanupHelperParams *p;
...@@ -17,6 +17,9 @@ XMLCONF = --with-minimal --with-catalog --with-reader --with-tree --with-push -- ...@@ -17,6 +17,9 @@ XMLCONF = --with-minimal --with-catalog --with-reader --with-tree --with-push --
libxml2: libxml2-$(LIBXML2_VERSION).tar.gz .sum-libxml2 libxml2: libxml2-$(LIBXML2_VERSION).tar.gz .sum-libxml2
$(UNPACK) $(UNPACK)
ifdef HAVE_MACOSX
$(APPLY) $(SRC)/libxml2/osx-threads.patch
endif
$(APPLY) $(SRC)/libxml2/no-tests.patch $(APPLY) $(SRC)/libxml2/no-tests.patch
$(APPLY) $(SRC)/libxml2/pthread.patch $(APPLY) $(SRC)/libxml2/pthread.patch
$(MOVE) $(MOVE)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment