From patchwork Sun Oct 21 15:37:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yann Diorcet X-Patchwork-Id: 193029 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [130.225.254.102]) by ozlabs.org (Postfix) with ESMTP id D2BF62C0096 for ; Mon, 22 Oct 2012 02:38:09 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 9D4A540195 for ; Sun, 21 Oct 2012 17:38:08 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com [74.125.82.47]) by hugin.dotsrc.org (Postfix) with ESMTPS id CE1563FD2E for ; Sun, 21 Oct 2012 17:38:07 +0200 (CEST) Received: by mail-wg0-f47.google.com with SMTP id ge7so1153094wgb.16 for ; Sun, 21 Oct 2012 08:38:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=vE1Uy4+VuWr6Ve+AOLGeGEY2h2QpX5CD2noMpqjZB8o=; b=Dk6lxx0uk8Qb/nnVijyYqoPG4SJ6L4MCykVf5jwHUVsSX1s6aJxAeudUALeSbSQVGl jn+MUMBjaTIefcslfpqj2phwipGOR+c7ZcT6T7+tiNzJaaNeaZikjhrVI6Z7TBuIziVw sy4K2lXIvlhS+QPJNbhYD3U7Ukg5zcqzuHludQXPHVvGPfpV65m2GSgXAVOP/vsr1M/k RPw5HXP//rcfyl8MV49asyVblPkJ31h1QGl/Wxldj/qgoR0810ge0zFZ0tRXxdvT4HJX GGsvJ/70edm0AIF98uKJ10lwZfR7EvKfoLKgS5uOSW6+MPtP2yiZ02DQZVoOlMvC3Xpl RX1Q== Received: by 10.180.87.34 with SMTP id u2mr31198499wiz.3.1350833887695; Sun, 21 Oct 2012 08:38:07 -0700 (PDT) Received: from localhost.localdomain (dom38-1-82-236-154-183.fbx.proxad.net. [82.236.154.183]) by mx.google.com with ESMTPS id gm7sm16535929wib.10.2012.10.21.08.38.06 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 21 Oct 2012 08:38:07 -0700 (PDT) From: Yann Diorcet To: dev@oe-lite.org Subject: [PATCH 06/16] libxml2: Add patch for compiling on osx Date: Sun, 21 Oct 2012 17:37:45 +0200 Message-Id: <1350833876-9499-6-git-send-email-diorcet.yann@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1350833876-9499-1-git-send-email-diorcet.yann@gmail.com> References: <1350833876-9499-1-git-send-email-diorcet.yann@gmail.com> Cc: Yann Diorcet X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Yann Diorcet --- .../libxml2-2.9.0/pthread_once_init_fix.patch | 20 ++++++++++++++++++++ recipes/libxml/libxml2_2.9.0.oe | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 recipes/libxml/libxml2-2.9.0/pthread_once_init_fix.patch diff --git a/recipes/libxml/libxml2-2.9.0/pthread_once_init_fix.patch b/recipes/libxml/libxml2-2.9.0/pthread_once_init_fix.patch new file mode 100644 index 0000000..847aa39 --- /dev/null +++ b/recipes/libxml/libxml2-2.9.0/pthread_once_init_fix.patch @@ -0,0 +1,20 @@ +diff -urN libxml2-2.9.0/threads.c libxml2-2.9.0.mod/threads.c +--- libxml2-2.9.0/threads.c 2012-09-11 05:52:46.000000000 +0200 ++++ libxml2-2.9.0.mod/threads.c 2012-10-17 18:00:08.000000000 +0200 +@@ -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; diff --git a/recipes/libxml/libxml2_2.9.0.oe b/recipes/libxml/libxml2_2.9.0.oe index 8c656f1..888a5af 100644 --- a/recipes/libxml/libxml2_2.9.0.oe +++ b/recipes/libxml/libxml2_2.9.0.oe @@ -1,3 +1,5 @@ LICENSE = "MIT" require libxml2.inc + +SRC_URI += "file://pthread_once_init_fix.patch"