From patchwork Sat Sep 16 13:37:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sergio Prado X-Patchwork-Id: 814506 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=e-labworks-com.20150623.gappssmtp.com header.i=@e-labworks-com.20150623.gappssmtp.com header.b="xRri6EXe"; 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 3xvYHG408Nz9sPk for ; Sat, 16 Sep 2017 23:37:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 18FCF88D4F; Sat, 16 Sep 2017 13:37:44 +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 rEYq8QYBjX4i; Sat, 16 Sep 2017 13:37:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0E43D88D54; Sat, 16 Sep 2017 13:37:43 +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 D20321C3F99 for ; Sat, 16 Sep 2017 13:37:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CDEA988D54 for ; Sat, 16 Sep 2017 13:37:41 +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 h-GySXNAV79N for ; Sat, 16 Sep 2017 13:37:41 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by fraxinus.osuosl.org (Postfix) with ESMTPS id EB6F888D4F for ; Sat, 16 Sep 2017 13:37:40 +0000 (UTC) Received: by mail-qk0-f194.google.com with SMTP id o77so3040304qke.2 for ; Sat, 16 Sep 2017 06:37:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=e-labworks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gFf6CAABOOHRWhbmKThhkleF5EA6NiqZr1NUuj1QMFU=; b=xRri6EXeLnFN13ckTXQ6mBclGv+8ykUTsaLyOuCiuLV43qR+9z6iYKT2s422/a6r5K YxQiHzIx/rJyl8TXd/icBZTLyRYEVJSLrkie5TmN8jHmbgUzR4tORun1DKKM7WjyntnI K8ylXUC0z6A9LJUsT9PNHAFsFTQK5txZGQ1B6f60v2ZRJEGLC1+Ovtloth4JRvsQRbRK Z9UkCMODDymh987ehU23DLKkLY1oswHEkpP07JtYSQfKKMGY002hpmEFBFntFmKESnQU /dEaozwAp0Vu8XkLLwdJoZdCqGG6/Owmh/6XlmTcuR5WEq/0TYyxjyAJav7jhhKK10u2 ZLGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gFf6CAABOOHRWhbmKThhkleF5EA6NiqZr1NUuj1QMFU=; b=K9Oc2u8we7b9w6+nnSonRkUnoXTFd5K76sFtGtTS80z2cN3qbQueSx3WAvmAP9mwJt LD8uXEGeFsJGuLSz5C87rhzu2YN2OU9a2FNSxf1+o2rGfzwoh35ioVPpp31bHfW7gBXR sAzQzD72phCC1DdFkmAPf7CAQMbQoyq9vMQFljeYS6yeuIYcPQtMTyX7shgCLLaEUGbH NXAKfmg87UAc3hgxuKM4nXm59s5EX8Xjz9p/Z9JNxbZZer1M8/3svZVl9kyyyNrE41VW BnhnKBHE1W1lUS/bV/+3re8tloZYTARkBqQ8sPMQwZfFJ8XcbiRJTMut5vPoS4PVTPvn VSGQ== X-Gm-Message-State: AHPjjUjkpbFmgJFoh3cXHmk0qSioqB/19iDUgktw8DEZUVvs8HgBt4hX D0saprHZBTCI2Hy+w+I= X-Google-Smtp-Source: AOwi7QBi4xHVFPMQODeEG3CoFk4/voTWb9YBLmU1DViHbbo64UYy4RuVOrj452EUku4tLEBlzjeaYA== X-Received: by 10.233.221.199 with SMTP id r190mr12488003qkf.174.1505569059606; Sat, 16 Sep 2017 06:37:39 -0700 (PDT) Received: from localhost.localdomain ([179.209.34.144]) by smtp.gmail.com with ESMTPSA id a12sm2154719qta.3.2017.09.16.06.37.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 16 Sep 2017 06:37:39 -0700 (PDT) From: Sergio Prado To: buildroot@buildroot.org Date: Sat, 16 Sep 2017 10:37:09 -0300 Message-Id: <1505569029-28935-1-git-send-email-sergio.prado@e-labworks.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Cc: Sergio Prado Subject: [Buildroot] [PATCH] stella: fix error when building with uClibc-ng 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" The uClibc-ng C library defines a type called R0 that conflits with a global variable called R0 from PaddleReader.cxx. src/emucore/tia/PaddleReader.cxx:25:3: error: ‘constexpr const double R0’ redeclared as different kind of symbol R0 = 1.5e3, ^ /home/sprado/workspace/build/buildroot/build/stella_uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:42:3:note: previous declaration ‘ R0’ R0 = 0, ^~ So let's redefine R0 as a private member of the PaddleReader class. This patch has already been accepted upstream [1] and should be removed in the next version bump. [1] https://github.com/stella-emu/stella/commit/391601d2386e41372d6fa198fbe40287d2e87542 Fixes: http://autobuild.buildroot.net/results/9ab5772f01236eaa7def66a2f443f13efca8c34c http://autobuild.buildroot.net/results/5a4a194fe85e04ab31b146367c5a45e4f7688fca http://autobuild.buildroot.net/results/31f6bb3f5879d056fe152ca19b6b0367cc636212 ... Signed-off-by: Sergio Prado --- ...03-Fix-error-when-building-with-uClibc-ng.patch | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch diff --git a/package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch b/package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch new file mode 100644 index 000000000000..ffbc83187bc1 --- /dev/null +++ b/package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch @@ -0,0 +1,54 @@ +From 36d5c8bc3592b4dffbec222a179c3956787a0694 Mon Sep 17 00:00:00 2001 +From: Sergio Prado +Date: Sat, 9 Sep 2017 15:04:58 -0300 +Subject: [PATCH] Fix error when building with uClibc-ng +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The uClibc-ng C library defines a type called R0 that conflits with a +global variable called R0 from PaddleReader.cxx. + +src/emucore/tia/PaddleReader.cxx:25:3: error: ‘constexpr const double R0’ redeclared as different kind of symbol + R0 = 1.5e3, + ^ +/home/sprado/workspace/build/buildroot/build/stella_uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:42:3: note: previous declaration ‘ R0’ + R0 = 0, + ^~ + +So let's redefine R0 as a private member of the PaddleReader class. + +Signed-off-by: Sergio Prado +--- + src/emucore/tia/PaddleReader.cxx | 1 - + src/emucore/tia/PaddleReader.hxx | 2 ++ + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/emucore/tia/PaddleReader.cxx b/src/emucore/tia/PaddleReader.cxx +index 69c828ea6c5c..27ff828200ee 100644 +--- a/src/emucore/tia/PaddleReader.cxx ++++ b/src/emucore/tia/PaddleReader.cxx +@@ -22,7 +22,6 @@ + static constexpr double + C = 68e-9, + RPOT = 1e6, +- R0 = 1.5e3, + USUPP = 5; + + static constexpr double TRIPPOINT_LINES = 379; +diff --git a/src/emucore/tia/PaddleReader.hxx b/src/emucore/tia/PaddleReader.hxx +index 00238a4fe5b5..0032e6efd015 100644 +--- a/src/emucore/tia/PaddleReader.hxx ++++ b/src/emucore/tia/PaddleReader.hxx +@@ -65,6 +65,8 @@ class PaddleReader : public Serializable + + bool myIsDumped; + ++ static constexpr double R0 = 1.5e3; ++ + private: + PaddleReader(const PaddleReader&) = delete; + PaddleReader(PaddleReader&&) = delete; +-- +1.9.1 +