From patchwork Sat Sep 15 13:23:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 970231 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=micronovasrl.com Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=micronovasrl.com header.i=@micronovasrl.com header.b="ri6VZP2g"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42CClh36nGz9sCR for ; Sat, 15 Sep 2018 23:24:16 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 90A8D21519; Sat, 15 Sep 2018 13:24:14 +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 DrlLe4Ok3rpV; Sat, 15 Sep 2018 13:24:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A068821526; Sat, 15 Sep 2018 13:24:13 +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 6E3861C2CD3 for ; Sat, 15 Sep 2018 13:24:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6BA9986167 for ; Sat, 15 Sep 2018 13:24:13 +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 m2fVfe4jnob7 for ; Sat, 15 Sep 2018 13:24:13 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.micronovasrl.com (mail.micronovasrl.com [212.103.203.10]) by hemlock.osuosl.org (Postfix) with ESMTP id AEA2E86147 for ; Sat, 15 Sep 2018 13:24:12 +0000 (UTC) Received: from mail.micronovasrl.com (mail.micronovasrl.com [127.0.0.1]) by mail.micronovasrl.com (Postfix) with ESMTP id DB42EB00980 for ; Sat, 15 Sep 2018 15:24:10 +0200 (CEST) Authentication-Results: mail.micronovasrl.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=micronovasrl.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=micronovasrl.com; h=x-mailer:message-id:date:date:subject:subject:to:from:from; s=dkim; t=1537017850; x=1537881851; bh=2u8KBcgTHGlUwUjdl6VsGFF6 K+wQBcxL+De4wVCmjME=; b=ri6VZP2gqJo6tzm8K7iSlpyAju+z5/T+OT8D+Wl9 U6EKaEoSOAvL1XUOoVigYuHWdJb8lriVbExB5IGXKG0yGi9vO7Rt6vBgqLsoa02/ iUupAbSeu6yfIp2wC9L1ZfyDpaczBkFEGwTOQghoWPp+cA88i2K4SL6yuVBU0SDm xAc= X-Virus-Scanned: Debian amavisd-new at mail.micronovasrl.com Received: from mail.micronovasrl.com ([127.0.0.1]) by mail.micronovasrl.com (mail.micronovasrl.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Q6oLiIyswOYu for ; Sat, 15 Sep 2018 15:24:10 +0200 (CEST) Received: from ubuntu.localdomain (5-157-103-91.v4.ngi.it [5.157.103.91]) by mail.micronovasrl.com (Postfix) with ESMTPSA id D8A89B001B4; Sat, 15 Sep 2018 15:24:09 +0200 (CEST) From: Giulio Benetti To: buildroot@buildroot.org Date: Sat, 15 Sep 2018 15:23:59 +0200 Message-Id: <20180915132359.85323-1-giulio.benetti@micronovasrl.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH v2] gpm: fix major() build failure due to glibc 2.28 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Giulio Benetti , Julien Boibessot MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" glibc 2.28 no longer includes from , and therefore must be included explicitly when major() is used. This commit adds a patch to directly include into open_console.c file where major() macro is used. Patch has been taken from gpm upstream commit: https://github.com/telmich/gpm/commit/b350aee4ea5785a75cb6ad770f6b768c506ebb70 Fixes: http://autobuild.buildroot.net/results/f53/f5373a567de619375746f1dcfe312971b85bb810/ http://autobuild.buildroot.net/results/227/227a7edf9304d85645d3e7fa0f930fe2e9b6e752/ Signed-off-by: Giulio Benetti --- .../gpm/0005-fix-building-w-newer-glibc.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/gpm/0005-fix-building-w-newer-glibc.patch diff --git a/package/gpm/0005-fix-building-w-newer-glibc.patch b/package/gpm/0005-fix-building-w-newer-glibc.patch new file mode 100644 index 0000000000..b451d975e0 --- /dev/null +++ b/package/gpm/0005-fix-building-w-newer-glibc.patch @@ -0,0 +1,32 @@ +From b350aee4ea5785a75cb6ad770f6b768c506ebb70 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Mon, 14 Mar 2016 15:39:54 -0400 +Subject: [PATCH] fix building w/newer glibc + +Linux C libraries are looking to disentangle sysmacros.h from the +sys/types.h include, so make sure we pull in the header when it is +found. + +Signed-off-by: Giulio Benetti +--- + src/daemon/open_console.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c +index 4d6c0af..6dd43e6 100644 +--- a/src/daemon/open_console.c ++++ b/src/daemon/open_console.c +@@ -24,6 +24,10 @@ + #include /* major() */ + #include /* ioctl */ + ++#ifdef HAVE_SYS_SYSMACROS_H ++#include /* major() w/newer glibc */ ++#endif ++ + /* Linux specific (to be outsourced in gpm2 */ + #include /* for serial console check */ + #include /* for serial console check */ +-- +2.17.1 +