From patchwork Thu Jul 16 18:45:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1330504 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=nrsA8fdZ; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B739T0LsWz9sT6 for ; Fri, 17 Jul 2020 04:45:47 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CFBD284540; Thu, 16 Jul 2020 18:45:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qk319UBGPEG1; Thu, 16 Jul 2020 18:45:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D0DFE856F4; Thu, 16 Jul 2020 18:45:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 0F1501BF2F1 for ; Thu, 16 Jul 2020 18:45:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0C0BF86F12 for ; Thu, 16 Jul 2020 18:45:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id myepPRqm2+oj for ; Thu, 16 Jul 2020 18:45:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id 1940386F1B for ; Thu, 16 Jul 2020 18:45:43 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id z2so8172075wrp.2 for ; Thu, 16 Jul 2020 11:45:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uaT0cQagHzIKI9G9etG3R1Kcavqfp9gHW4z8M4L6fUo=; b=nrsA8fdZ22GtakrTcAd+kSfNlY64UP7UkVWFW0xPMNnNKjKkTp693sjxs3Ur7KhPRG JMxNTIIW6vNdPSDrVt4DDcx0COJkzk2iyitAVIJiXzXv/trrdhxGDU8pC5VIa+s96mXB oe5On2iwudg1SadhQRWn3ASBjqQ2xNo0/LGsgyCwHq11rvoXbgWdJ9Ymq3zZFk9su8Ay gM1fOxkedrQ4J+vYsSAI4zNNFe3rvm59dMlit8rzNvqwja1Nv+Fl1Ozakw/9779mVzOB b7R///PC/bGKbZeTxgzSPXb36CMk58Z5WTduBHosx7CL2MXQFhHtLtOcvNqWEl8xOj0V 2tAQ== 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=uaT0cQagHzIKI9G9etG3R1Kcavqfp9gHW4z8M4L6fUo=; b=gV/9RQg1rORirT84uez9IsnQTxYWLNOB/dPKepYt6epZ3bIfuRtdghmO/yfbmc4V95 rjOl3A8Qu0vjJ4znqDsARuSr58CCp85MKfYlBq35X0Oblpf6PaNElnvBhDZn2Oo78TI+ 7ydWsYeQJaoqDfDbakCac7bOxQKCBQTNN03oWM7pR6zGorv8uDmrmdsr5tFcNl/xQzcK ANCirir1OgEyD2dG+9GeCfxU4P+/AJZMgw3NAN6V64bDd1Si0+wm1a+AQrd4a6h1istO 3Grmw7z5w81ex0ioyhOuoMsm7LQfPqWeYIGuHNlpUwDgCNFwu3tZkDWnhXCKJW3HiSrq P3Tw== X-Gm-Message-State: AOAM533wLiXUkoGShwHNm1XTrDrayWiY5fgmgA5+W7VXwBc3zF8OhPOw zTeLK8TdG8OgctpzkOXe0YX+isvH X-Google-Smtp-Source: ABdhPJxP+C1EvaNYJ+lySVApgzCMYU8kDjqvy2PYwlgMlEBe7D76+WkybpSxFJ+LeRtrI1N7FeJ2aQ== X-Received: by 2002:a5d:4991:: with SMTP id r17mr6234276wrq.1.1594925141020; Thu, 16 Jul 2020 11:45:41 -0700 (PDT) Received: from t450s.fritz.box (ip5b426f84.dynamic.kabel-deutschland.de. [91.66.111.132]) by smtp.gmail.com with ESMTPSA id i6sm10417569wrp.92.2020.07.16.11.45.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2020 11:45:40 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org Date: Thu, 16 Jul 2020 20:45:27 +0200 Message-Id: <20200716184528.25630-1-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/gpm: fix build failure with gcc 10 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Thiery , Julien Boibessot Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add a patch from upstream [1] to fix -fno-common build failure [1] https://github.com/telmich/gpm/commit/f04f24dd5ca5c1c13608b144ab66e2ccd47f106a Signed-off-by: Heiko Thiery --- ...on.h-avoid-redefinition-of-last_sele.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch diff --git a/package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch b/package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch new file mode 100644 index 0000000000..d976834a0d --- /dev/null +++ b/package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch @@ -0,0 +1,42 @@ +From f04f24dd5ca5c1c13608b144ab66e2ccd47f106a Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sun, 19 Jan 2020 19:53:41 +0000 +Subject: [PATCH] src/headers/daemon.h: avoid redefinition of + 'last_selection_time' + +Noticed build failure on gcc-10 as: + +``` +gcc -L/home/slyfox/dev/git/gpm/src -o gpm mice.o ... report.o tools.o -lm +ld: twiddler.o:gpm/src/headers/daemon.h:183: + multiple definition of `last_selection_time'; mice.o:gpm/src/headers/daemon.h:183: first defined here +ld: synaptics.o:git/gpm/src/headers/daemon.h:183: + multiple definition of `last_selection_time'; mice.o:git/gpm/src/headers/daemon.h:183: first defined here +``` + +gcc-10 will change the default from -fcommon to fno-common: +https://gcc.gnu.org/PR85678. + +The error also happens if CFLAGS=-fno-common passed explicitly. + +Signed-off-by: Sergei Trofimovich +--- + src/headers/daemon.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/headers/daemon.h b/src/headers/daemon.h +index a8936ad..24a1a97 100644 +--- a/src/headers/daemon.h ++++ b/src/headers/daemon.h +@@ -180,7 +180,7 @@ extern struct mouse_features mouse_table[3], + extern Gpm_Type mice[]; + extern Gpm_Type *repeated_type; + +-time_t last_selection_time; ++extern time_t last_selection_time; + + + +-- +2.20.1 +