From patchwork Sat Sep 11 08:46:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 32758 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2E23527BBE3; Sat, 11 Sep 2021 09:47:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E3B9727BBE1 for ; Sat, 11 Sep 2021 09:47:18 +0100 (BST) Received: from localhost ([::1]:45554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOyfN-0000FR-Ss for patchwork@mira.cbaines.net; Sat, 11 Sep 2021 04:47:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47414) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOyf8-0000FH-2c for guix-patches@gnu.org; Sat, 11 Sep 2021 04:47:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56237) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mOyf7-0003Yz-Rm for guix-patches@gnu.org; Sat, 11 Sep 2021 04:47:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mOyf7-0000eB-QF for guix-patches@gnu.org; Sat, 11 Sep 2021 04:47:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50517] [PATCH core-updates-frozen] gnu: psm: Fix building with GCC 10. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Sep 2021 08:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50517 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50517@debbugs.gnu.org Cc: Felix Gruber X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16313500172469 (code B ref -1); Sat, 11 Sep 2021 08:47:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Sep 2021 08:46:57 +0000 Received: from localhost ([127.0.0.1]:39550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mOyf2-0000dl-Ue for submit@debbugs.gnu.org; Sat, 11 Sep 2021 04:46:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:48962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mOyf1-0000de-9p for submit@debbugs.gnu.org; Sat, 11 Sep 2021 04:46:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOyf1-0000F4-1f for guix-patches@gnu.org; Sat, 11 Sep 2021 04:46:55 -0400 Received: from mout02.posteo.de ([185.67.36.66]:48657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOyey-0003PD-Lo for guix-patches@gnu.org; Sat, 11 Sep 2021 04:46:54 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 977F4240104 for ; Sat, 11 Sep 2021 10:46:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1631350009; bh=lWqwhEk+6jgy6/tJwqwTq1/YKeh60th7v7TMiruXx54=; h=From:To:Cc:Subject:Date:From; b=MA4fb3hjJvm4OVsZAAqiuVV04rz0TcOoGLVwX0h9GXlAisKZUMaRtbB3kTGnp9x7P S14SysTqGc+UKv4A6Dnwb+sQ6fPDvuRi6fSSOrDJwCFJarhuCyAPDhZRA/L7G2OeF5 RGubP8QPRVyTNNh9/WDZF/XIbhnw7qFtR5GgEAXu/4OohkwpfnvhfnaBlYKdYd7GhB VJyIxQtPuuC8bvUe/bCiDMg6gFJXWZuB+OQudIe5hcD0sV8PG8g725amhGZClXRfNY FVxalTO4zuTd1tLidX+S/brBGsDz9hDX7wDp2eNfc2cyPDooJZuQr+++LHUU508osP DwNud+H9H8fTw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4H65vX1s01z6tm9; Sat, 11 Sep 2021 10:46:47 +0200 (CEST) From: Felix Gruber Date: Sat, 11 Sep 2021 08:46:34 +0000 Message-Id: <20210911084634.6997-1-felgru@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=felgru@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (psm)[arguments]: Pass '-fcommon' to CFLAGS. I had to copy all the CFLAGS that were originally defined by the Makefile as they were otherwise all replaced by '-fcommon'. --- gnu/packages/linux.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1305a80f56..122c2773fb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -56,6 +56,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -7256,6 +7257,11 @@ libraries, which are often integrated directly into libfabric.") (arguments '(#:make-flags `("PSM_USE_SYS_UUID=1" "CC=gcc" "WERROR=" ,(string-append "INSTALL_PREFIX=" %output) + ,(string-append "CFLAGS=-Wall -fpic -fPIC -D_GNU_SOURCE" + " -funwind-tables -O3 -g3" + " -DPSM_USE_SYS_UUID" + " -Wno-strict-aliasing -DNVALGRIND" + " -fcommon") ,(string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) #:tests? #f #:phases (modify-phases %standard-phases