From patchwork Wed Aug 6 19:17:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yann Diorcet X-Patchwork-Id: 377371 X-Patchwork-Delegate: kiho@prevas.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 [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id C0F9F1400D6 for ; Thu, 7 Aug 2014 05:18:32 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 744B13FD8F for ; Wed, 6 Aug 2014 21:18:31 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by hugin.dotsrc.org (Postfix) with ESMTPS id 8DE413F9B1 for ; Wed, 6 Aug 2014 21:18:29 +0200 (CEST) Received: by mail-wg0-f49.google.com with SMTP id k14so3025061wgh.8 for ; Wed, 06 Aug 2014 12:18:29 -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:in-reply-to:references; bh=kRE/okN4GXt+8vpVwRPOM52st1NZ4GBh+ZdIP/tk1MY=; b=eiaXev8jo2Cx73DB2rn+2FHJB2fvG2q491ICdCiqR8Y4vZ/5lc5pimSfwbC0ss8/cQ K4uWfJ8y/sgBY99bAevIJ2Pnkkh3wmQDzsNE1mpRheOGxK2afQJalfakz66Ai9q6v8+k QMvOuM7kUfnJVQYkC+qFt4TKSUAEZ5/ySYLjpUHYCLSK7ztTx7MzjGib5ROVS4iaBKif bmNDRHsc1FCiHA2w0pPSPaG7f/kAnZnkdFF1ISBLfNgSNRNeU70gRGMzqmW3WKSiCRWu 2ygyvx2Nxj3xf7tC9MUeZNALSO18hroJAI6RFHiXsPVchqod7Nuly1G7QelXzmjaffY4 hOaw== X-Received: by 10.194.77.177 with SMTP id t17mr17821572wjw.55.1407352708995; Wed, 06 Aug 2014 12:18:28 -0700 (PDT) Received: from localhost.localdomain (mut38-h01-31-33-249-220.dsl.sta.abo.bbox.fr. [31.33.249.220]) by mx.google.com with ESMTPSA id b9sm21033538wic.23.2014.08.06.12.18.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Aug 2014 12:18:28 -0700 (PDT) From: Yann Diorcet To: dev@oe-lite.org Subject: [PATCH 09/18] libxml2: (Better) Windows support Date: Wed, 6 Aug 2014 21:17:55 +0200 Message-Id: <1407352684-7837-9-git-send-email-diorcet.yann@gmail.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1407352684-7837-1-git-send-email-diorcet.yann@gmail.com> References: <1407352684-7837-1-git-send-email-diorcet.yann@gmail.com> 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 --- .../libxml/libxml2-2.9.0/pthread_once_init_fix.patch | 20 ++++++++++++++++++++ recipes/libxml/libxml2.inc | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) 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.inc b/recipes/libxml/libxml2.inc index 7c62d07..37374c6 100644 --- a/recipes/libxml/libxml2.inc +++ b/recipes/libxml/libxml2.inc @@ -19,7 +19,7 @@ EXTRA_OECONF = "\ --with-c14n" LDFLAGS_LDL = "-ldl" -LDFLAGS_LDL:TARGET_OS_mingw32 = "" +LDFLAGS_LDL:TARGET_LIBC_mingw = "" export LDFLAGS += "${LDFLAGS_LDL}" PACKAGES =+ "${PN}-utils"