From patchwork Mon Nov 23 19:17: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: 1404998 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.136; helo=silver.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=c6usoScD; 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 4Cfxkk6fn0z9sRK for ; Tue, 24 Nov 2020 06:18:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0C7EF204C3; Mon, 23 Nov 2020 19:18:04 +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 e5qPJF+QDo1k; Mon, 23 Nov 2020 19:18:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 5974620013; Mon, 23 Nov 2020 19:18:01 +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 D190A1BF3F3 for ; Mon, 23 Nov 2020 19:17:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B90FE20013 for ; Mon, 23 Nov 2020 19:17:59 +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 FMiN3NKfgSbB for ; Mon, 23 Nov 2020 19:17:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by silver.osuosl.org (Postfix) with ESMTPS id 698451FEE0 for ; Mon, 23 Nov 2020 19:17:58 +0000 (UTC) Received: by mail-wm1-f49.google.com with SMTP id x22so232584wmc.5 for ; Mon, 23 Nov 2020 11:17:58 -0800 (PST) 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=FXXHduzKRYeZsm1jDdyVYEBDU5J3CBMOLxx4ppbWzAk=; b=c6usoScDyzk+0W8qgvZGsYgQF99itRxB/2JIx3L+Zug/xgRLnzDBAUuglVNbbJxq3T xkXe436Es/4U4kCUUchMWXo30++3TEA2Q4Bm3nhxkJzwVTe5WV8RXL/gGTnY25sJJjRQ Q7MULD7aChrae3DeZnoM40VugFR9yp+3ab0TNSDUARzJPPs7Wp29GL7rJ/zieTerxoSw zH1uN3ZQBUMQXkJiSsDJ6u2L3RXmVRT/m41wMZYbgNij6C5Z3dQJyRIxWg72N64hy4Kc YgPTjO9zbWn6pk6V09xeTTrMDE0+muCjbkDjVnHYmZ3lTpEfo69IlcKNe0y8CmVAs+2A TByA== 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=FXXHduzKRYeZsm1jDdyVYEBDU5J3CBMOLxx4ppbWzAk=; b=slH9fqRJz1NUPKWpiuKej2JqaD4j3JHgb+pMjG8HA/G9YOTTtbupUORcVHfihmfX8d gHmD/L4khFs5lfYQ9d3VobqZxNKDcRG5Te58JmTo/Hs2QQsftYQPqVhH2KawhiBAQc30 US2I20TOEBADwdZyU4xlAcDYne4FWuh6HDUPBqzC0beiXFK9HR0WSXHLVvSjpP24s7Hh QP1SYfYkmz1mf3OfsTP6rpitvGt5DSprG+rHuLj+4XEQlqLQ3uxI3ZO/NDIQJH/PoOxQ bwLJwj2uIs2YTztHT+BF6dOn37XaGAoMd3rnUK7pI/Y5WZGf1gUBG3hQ1mmMYZilbxGI UpDQ== X-Gm-Message-State: AOAM5334Np2yvX61h0VjWjalWHkw5DlBGfHd0AF/K/hK63yCsn8NMqjJ 7WorQ7onhXwuczTGWTORR+bD1o8i7zkC1Q== X-Google-Smtp-Source: ABdhPJy9fyoBaRycZ35YfI56C9BvLJaZJDHCPL/xnQbiNFqKXX0S3bpuXNRNkWTJL7QMt7Kdixshfw== X-Received: by 2002:a1c:b787:: with SMTP id h129mr375625wmf.67.1606159076249; Mon, 23 Nov 2020 11:17:56 -0800 (PST) Received: from t450s.fritz.box (ip5b426f26.dynamic.kabel-deutschland.de. [91.66.111.38]) by smtp.gmail.com with ESMTPSA id d13sm23350448wrb.39.2020.11.23.11.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:17:55 -0800 (PST) From: Heiko Thiery To: buildroot@buildroot.org Date: Mon, 23 Nov 2020 20:17:27 +0100 Message-Id: <20201123191729.2557-1-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/openrc: fix build 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 , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?b?ZWs=?= , mscdex@mscdex.net Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - https://bugs.busybox.net/show_bug.cgi?id=13331 Cc: mscdex@mscdex.net Signed-off-by: Heiko Thiery --- ...r.h-fix-build-failure-against-gcc-10.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 package/openrc/0006-src-rc-rc-logger.h-fix-build-failure-against-gcc-10.patch diff --git a/package/openrc/0006-src-rc-rc-logger.h-fix-build-failure-against-gcc-10.patch b/package/openrc/0006-src-rc-rc-logger.h-fix-build-failure-against-gcc-10.patch new file mode 100644 index 0000000000..9fded3ca90 --- /dev/null +++ b/package/openrc/0006-src-rc-rc-logger.h-fix-build-failure-against-gcc-10.patch @@ -0,0 +1,52 @@ +From 375ef42393f3dc6edbaa2cb70c79b2366072db38 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sun, 19 Jan 2020 15:24:20 +0000 +Subject: [PATCH] src/rc/rc-logger.h: fix build failure against gcc-10 + +On gcc-10 (and gcc-9 -fno-common) build fails as: + +``` +cc -L../librc -L../libeinfo -O2 -g -std=c99 -Wall -Wextra -Wimplicit -Wshadow \ + -Wformat=2 -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn \ + -Wmissing-format-attribute -Wnested-externs -Winline -Wwrite-strings \ + -Wcast-align -Wcast-qual -Wpointer-arith -Wdeclaration-after-statement \ + -Wsequence-point -Werror=implicit-function-declaration \ + -Wl,-rpath=/lib -o openrc rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o -lutil -lrc -leinfo -Wl,-Bdynamic -ldl +ld: rc-logger.o:/home/slyfox/dev/git/openrc/src/rc/rc-logger.h:16: + multiple definition of `rc_logger_pid'; rc.o:openrc/src/rc/rc-logger.h:16: first defined here +ld: rc-logger.o:/home/slyfox/dev/git/openrc/src/rc/rc-logger.h:17: + multiple definition of `rc_logger_tty'; rc.o:openrc/src/rc/rc-logger.h:17: 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. + +This fixes #348. + +[Patch taken from upstream: +https://github.com/OpenRC/openrc/commit/375ef42393f3dc6edbaa2cb70c79b2366072db38] +Signed-off-by: Heiko Thiery +--- + src/rc/rc-logger.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/rc/rc-logger.h b/src/rc/rc-logger.h +index bf6e3e57..1da294b0 100644 +--- a/src/rc/rc-logger.h ++++ b/src/rc/rc-logger.h +@@ -13,8 +13,8 @@ + #ifndef RC_LOGGER_H + #define RC_LOGGER_H + +-pid_t rc_logger_pid; +-int rc_logger_tty; ++extern pid_t rc_logger_pid; ++extern int rc_logger_tty; + extern bool rc_in_logger; + + void rc_logger_open(const char *runlevel); +-- +2.20.1 +