From patchwork Sat Jul 9 10:52:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 646667 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rmp8t2R9vz9sCk for ; Sat, 9 Jul 2016 20:52:29 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=VvYN0R5U; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DF8EA31A3E; Sat, 9 Jul 2016 10:52:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X6m5x0JxU5XV; Sat, 9 Jul 2016 10:52:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C849231684; Sat, 9 Jul 2016 10:52:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 716E01C2BC9 for ; Sat, 9 Jul 2016 10:52:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6A97587AD1 for ; Sat, 9 Jul 2016 10:52:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id W0pZCW7v-2Dg for ; Sat, 9 Jul 2016 10:52:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 3ABA287A88 for ; Sat, 9 Jul 2016 10:52:21 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id x83so9768446wma.3 for ; Sat, 09 Jul 2016 03:52:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MNXzd389DcL6xhMJhJEsm5MYEO1OGi62hYMbvbmxBU4=; b=VvYN0R5ULoEinZVePqUUAZr1I/plooxFPLZp1HONHOw9eZJalsJLC7wojwjTSg+5RS 1mUJz2+/4xvttek2y4eho5UdHkTTQDfyjT0ovtd7sXSJXxY4sCI2QCd1H0Dha/c1IyqP sgkaERVWqQZOLYiXS3DdJi0v8Be6/pmZq0ML2YksdsRUgs0rPQbnQpf57xK4b2bVug6c P0u5p9N9ViGMSGU+Ff5Pdov0g1AMNPWKDlEdCep6BKW2qOBCyYcquhv+M9wF2KR2Rz7f zgl2BDm1eshoKOJ4Oq6AD/xt4b6rajApvANurvGI1gNRxuuNJjunSjS4jYTVlgLykh1U v61A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=MNXzd389DcL6xhMJhJEsm5MYEO1OGi62hYMbvbmxBU4=; b=Mag0d76P2edMGrKBHo08YtPOZjhMusuRTD30kG6l7FoSDRCsog0zwJlwyJWO5x4jw0 +Mct0SZLNLWa8/oCqUaTDFm/YYpT0kyPITpZLpdAL8t8JRyIkQ4UWe+dmZlDZMmnEcS4 S6DQsDQ+kYf+JwbtZBS7bWUhxzKvqccQX99pzxlidlatgMqcZ7LzmMJ49ORwZoGKsyYj G9PJdmC8OigoxOLJApgTK0DyaevH27jIYUx0WmQq/dYjANCTUKQwwMAv0otkTMn3oxYF aUo8xIkq7sKruZJW4TZgdI0E7UGtvIr24qBDXAqaPgkr7ZfYC+lk5S7w3UJi4/jiwi3C PJpg== X-Gm-Message-State: ALyK8tJbFwzlk8pgE3s2oj6M3NQ4fBw/oh5gS79eiH4F42zXvF0v/yGlbZmHqm3Ltg2TRg== X-Received: by 10.194.85.198 with SMTP id j6mr8976815wjz.85.1468061539605; Sat, 09 Jul 2016 03:52:19 -0700 (PDT) Received: from gourin.bzh.lan (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id r6sm7368810wme.14.2016.07.09.03.52.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 09 Jul 2016 03:52:18 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 9 Jul 2016 12:52:14 +0200 Message-Id: <1468061534-26225-1-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Cc: Thomas Petazzoni , Romain Naour , "Yann E. MORIN" Subject: [Buildroot] [PATCH] package/libgpg-error: fix no-thread build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Including the pthreads header was not properly guarded; fix that. Disable building tests, as they are too not properly guarding against missing pthreads. Note that autoreconfiguring is very noisy and spits out a lot of git errors as their configure.ac expects, and even *requires* to be run from a git clone. Although reported as fatal errors, it's just git whining. We can ignore them. Fixes: http://autobuild.buildroot.org/results/049/0495d60556139de8f3f6df420d9a226ee8a432a0/ http://autobuild.buildroot.org/results/0d1/0d12423877b4aac2a18fac651063de98774b5108/ [...] Signed-off-by: "Yann E. MORIN" Cc: Maxime Hadjinlian Cc: Thomas Petazzoni Cc: Romain Naour Cc: Jörg Krause Cc: Vicente Olivert Riera Cc: Arnout Vandecappelle --- First patch will be sent upstream shortly; second patch will be reworked in an upstreamable solution. --- ...-posix-lock-obj-fix-build-without-threads.patch | 34 ++++++++++++++++++++++ package/libgpg-error/0002-tests-do-not-build.patch | 29 ++++++++++++++++++ package/libgpg-error/libgpg-error.mk | 3 ++ 3 files changed, 66 insertions(+) create mode 100644 package/libgpg-error/0001-gen-posix-lock-obj-fix-build-without-threads.patch create mode 100644 package/libgpg-error/0002-tests-do-not-build.patch diff --git a/package/libgpg-error/0001-gen-posix-lock-obj-fix-build-without-threads.patch b/package/libgpg-error/0001-gen-posix-lock-obj-fix-build-without-threads.patch new file mode 100644 index 0000000..0f3504e --- /dev/null +++ b/package/libgpg-error/0001-gen-posix-lock-obj-fix-build-without-threads.patch @@ -0,0 +1,34 @@ +From 05ccf08a84e4ab671dae1c04c383c660a78d91d9 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sat, 9 Jul 2016 12:28:43 +0200 +Subject: [PATCH 1/2] gen-posix-lock-obj: fix build without threads + +Although ./configure checks for thread support, gen-posix-lock-obj still +includes pthreads.h unconditionally. + +Guard that inclusion using the same condition as all other uses of +pthreads-related code. + +Signed-off-by: "Yann E. MORIN" +--- + src/gen-posix-lock-obj.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/gen-posix-lock-obj.c b/src/gen-posix-lock-obj.c +index e32a3cd..e6f33ae 100644 +--- a/src/gen-posix-lock-obj.c ++++ b/src/gen-posix-lock-obj.c +@@ -29,7 +29,9 @@ + #include + #include + #include +-#include ++#ifdef USE_POSIX_THREADS ++# include ++#endif + + #include "posix-lock-obj.h" + +-- +2.7.4 + diff --git a/package/libgpg-error/0002-tests-do-not-build.patch b/package/libgpg-error/0002-tests-do-not-build.patch new file mode 100644 index 0000000..5eded5f --- /dev/null +++ b/package/libgpg-error/0002-tests-do-not-build.patch @@ -0,0 +1,29 @@ +From 9694693d4d35a433509a4da61341e1cb5b0143d0 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sat, 9 Jul 2016 12:30:40 +0200 +Subject: [PATCH 2/2] tests: do not build + +Building tests fails without thread support. Forcefulyl disable tests, +which we don't care much about for Buildroot. + +Signed-off-by: "Yann E. MORIN" +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index baeba14..dc959e4 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -39,7 +39,7 @@ else + doc = + endif + +-SUBDIRS = m4 src $(doc) tests po $(lang_subdirs) ++SUBDIRS = m4 src $(doc) po $(lang_subdirs) + + + dist-hook: gen-ChangeLog +-- +2.7.4 + diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index b074ff6..92754e5 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -11,6 +11,9 @@ LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB LIBGPG_ERROR_INSTALL_STAGING = YES LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config +# 0002-tests-do-not-build.patch touches Makefile.am +LIBGPG_ERROR_AUTORECONF = YES + define LIBGPG_ERROR_FIX_CROSS_COMPILATION cd $(@D)/src/syscfg && \ ln -s lock-obj-pub.$(call qstrip, $(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG)).h \