From patchwork Tue Oct 3 12:14:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 820873 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cyls4EG2"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y5ydZ6dSQz9sRW for ; Tue, 3 Oct 2017 23:14:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B646C834D7; Tue, 3 Oct 2017 12:14:39 +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 aVXKtEcBwMrI; Tue, 3 Oct 2017 12:14:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9B9A582350; Tue, 3 Oct 2017 12:14:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id DB2511C097A for ; Tue, 3 Oct 2017 12:14:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C8F142FB1A for ; Tue, 3 Oct 2017 12:14:36 +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 ULFD+aAUxiaG for ; Tue, 3 Oct 2017 12:14:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by silver.osuosl.org (Postfix) with ESMTPS id 8794A2F6EC for ; Tue, 3 Oct 2017 12:14:35 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id i195so1125032pgd.3 for ; Tue, 03 Oct 2017 05:14:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0rzwXOPbF0VzwTtiPuQpbfkf7n3fujDPRNuW8WwfnZQ=; b=cyls4EG20y4+KfD1Kq4BX1cPPgOcovjRYQ4FSOF1RSJwY0JdKulIiUQgnzGhrkc8jw J2AWihoSohkHlGOyRnXgKQ+3P24vRsXdQ7UUUg0pIHD1U+QnJUnNX16ZeTCXlVEBVNiG y8duTRUmT+yrnMzTY440FNgBRotgdzt9XKWv/3ddlDQsxBiyrgkr6CneKwdQtZBfKkE/ RIxO0OlCu++98QpvrqAab2Vji9pZHdwmhMANrjtCcRTXCvxxlvPChiWq57xhTLNOdjzy Bb0soHS1Lvvu5cy9P8pJQhYG0bBZfdMClrlcUVR8j8uir8yfRJCjZyspyZiEveOignl4 yuKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=0rzwXOPbF0VzwTtiPuQpbfkf7n3fujDPRNuW8WwfnZQ=; b=fjeCbTDk3cCkxtU7JFLs+BZlCTrDeFb8ssOa56G7J0m8zutJQrsPTI0fV2CYdOQdrg QcyFZ2U3Ol8NkWiZjJIUVoc8WHAbUVm5YvuA0Nw2SzoeoB/TFSUkesvGod0MzcjDlLzI MFWQJRUVYXl5frr2Jkv981Cgnq34Xrcu8Sfo70v1vc6Z6Cwx8ZffEAD4zq+xgjS+7VLa dso/25iOQbpHQX/0+dp4DDBb3q5rp00wFfF0+ZloFqyve6E33UvkuJJrx809MIiC61QU 1810Ifz6gcjbvNNJRGy6VQR/mtrwAmbkayx/yi+4EO/i+bf717qV9FNeW/8h6819+WEM dRhQ== X-Gm-Message-State: AHPjjUj5gBfWRGzOdvwhtYgwiFlVC8DYYH5OjXIBgoSqZv3UryfTvSwK 44cTfDki/8rYkqNr+Aao/gvlD7CF X-Google-Smtp-Source: AOwi7QA0VPhz+p+fSG/piHl5ChI8ka+/sRi21lTU7cHcL0xgS6pefsunHpOmaCrFgzr2iMh2sNYEOw== X-Received: by 10.101.83.143 with SMTP id x15mr15563739pgq.425.1507032874661; Tue, 03 Oct 2017 05:14:34 -0700 (PDT) Received: from aurora.jms.id.au ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id z9sm21043993pgc.85.2017.10.03.05.14.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Oct 2017 05:14:33 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 03 Oct 2017 22:44:26 +1030 From: Joel Stanley To: buildroot@buildroot.org Date: Tue, 3 Oct 2017 22:44:25 +1030 Message-Id: <20171003121425.28490-1-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 MIME-Version: 1.0 Cc: Thomas Petazzoni , Alistair Popple Subject: [Buildroot] [PATCH v2] pdbg: bump version to latest 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" I got this error when attempting to build: aclocal: error: couldn't open directory 'm4': No such file or directory So we now have the post patch hook to ensure the m4 directory is present. In addition, the package now sets a variable with the Git SHA1 so that the binary contains the expected output for --version. Specific configurations of uClibc cause a build failure in pdbg. This commit adds a patch to remove the definition of the offending macro (it is unused in the source). In file included from usr/include/stdio.h:71:0, from libpdbg/fake.c:17: include/bits/uClibc_stdio.h:149:16: error: expected identifier or ‘(’ before ‘;’ token void *__unused; /* Placeholder for codeset binding. */ Signed-off-by: Joel Stanley --- v2: - Use $() and not ${} when referencing make variables - Fix building with uClibc. I've also sent the patch upstream ...bg-Remove-unused-__unused-from-compiler.h.patch | 39 ++++++++++++++++++++++ package/pdbg/pdbg.hash | 2 +- package/pdbg/pdbg.mk | 9 ++++- 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 package/pdbg/0001-libpdbg-Remove-unused-__unused-from-compiler.h.patch diff --git a/package/pdbg/0001-libpdbg-Remove-unused-__unused-from-compiler.h.patch b/package/pdbg/0001-libpdbg-Remove-unused-__unused-from-compiler.h.patch new file mode 100644 index 000000000000..e778f283d76e --- /dev/null +++ b/package/pdbg/0001-libpdbg-Remove-unused-__unused-from-compiler.h.patch @@ -0,0 +1,39 @@ +From 5a85b8c78846b342bdeba37caed03b64b1dd2864 Mon Sep 17 00:00:00 2001 +From: Joel Stanley +Date: Tue, 3 Oct 2017 21:37:46 +1030 +Subject: [PATCH] libpdbg: Remove unused __unused from compiler.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The compiler.h header contains a macro that defines __unused. When +building against uClibc this collides with uClibc_stdio.h: + +In file included from /usr/include/stdio.h:71:0, + from libpdbg/fake.c:17: +/usr/include/bits/uClibc_stdio.h:149:16: error: expected identifier or ‘(’ before ‘;’ token + void *__unused; /* Placeholder for codeset binding. */ + ^ + +As it is unused in pdbg, remove it. + +Signed-off-by: Joel Stanley +--- + libpdbg/compiler.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/libpdbg/compiler.h b/libpdbg/compiler.h +index 35bf16525761..86bd9673ac36 100644 +--- a/libpdbg/compiler.h ++++ b/libpdbg/compiler.h +@@ -24,7 +24,6 @@ + /* Macros for various compiler bits and pieces */ + #define __packed __attribute__((packed)) + #define __align(x) __attribute__((__aligned__(x))) +-#define __unused __attribute__((unused)) + #define __used __attribute__((used)) + #define __section(x) __attribute__((__section__(x))) + #define __noreturn __attribute__((noreturn)) +-- +2.14.1 + diff --git a/package/pdbg/pdbg.hash b/package/pdbg/pdbg.hash index 16bf58024c61..2aec71817770 100644 --- a/package/pdbg/pdbg.hash +++ b/package/pdbg/pdbg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 8edabb9ae98ce3b1892b768f2ee5e779a00476b63cdcc6f905e8464a0b7d96a3 pdbg-90a7370a11e727f1482dea6ff2bd6aec20c64805.tar.gz +sha256 e0b81fc65eb83692c5c07d7ae109882cefebf663444b7ea804d0544451c1a72f pdbg-77158819158d1d7053a737ac090d04fdfbfe9265.tar.gz diff --git a/package/pdbg/pdbg.mk b/package/pdbg/pdbg.mk index 184de8650d37..1a3a6b7422a9 100644 --- a/package/pdbg/pdbg.mk +++ b/package/pdbg/pdbg.mk @@ -4,10 +4,17 @@ # ################################################################################ -PDBG_VERSION = 90a7370a11e727f1482dea6ff2bd6aec20c64805 +PDBG_VERSION = 77158819158d1d7053a737ac090d04fdfbfe9265 PDBG_SITE = $(call github,open-power,pdbg,$(PDBG_VERSION)) PDBG_LICENSE = Apache-2.0 PDBG_LICENSE_FILES = COPYING PDBG_AUTORECONF = YES +PDBG_MAKE_OPTS = "GIT_SHA1=\"$(PDBG_VERSION)\"" + +define PDBG_PATCH_M4 + mkdir -p $(@D)/m4 +endef +PDBG_POST_PATCH_HOOKS += PDBG_PATCH_M4 + $(eval $(autotools-package))