From patchwork Mon Jan 14 22:33:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1024800 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tsLBUpS3"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43dpDM3wpzz9sBQ for ; Tue, 15 Jan 2019 09:34:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 15BCF86132; Mon, 14 Jan 2019 22:34:07 +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 gDSGXL4gdPqx; Mon, 14 Jan 2019 22:34:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 37F34857B2; Mon, 14 Jan 2019 22:34:03 +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 536F91BF291 for ; Mon, 14 Jan 2019 22:34:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 50998221AF for ; Mon, 14 Jan 2019 22:34:02 +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 Ng8cN8NKiW-a for ; Mon, 14 Jan 2019 22:34:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by silver.osuosl.org (Postfix) with ESMTPS id C552C22179 for ; Mon, 14 Jan 2019 22:33:59 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id y20so977577edw.9 for ; Mon, 14 Jan 2019 14:33:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=hKLx0N9R5aBOmOmF2CC93dCQvJ3pu7QHTa7ayVFGpZc=; b=tsLBUpS3PUAB0CnWoMLByucukHbGwEYRb1LG3pBinLl2T4pLRYH2EPXPWWaZpVfr1w EXekCe1qfs8HEBNQlkbeG1gRizuMW81/5J5NIkGgj093BnDlYWdjfXNAB9AXNgTPAubU uGapfQsLxfDVxm+x9RLrwXc/Nkjk7sKza7GkH97v3Nfx2kaIalgimrmGchmQPpFECyaB UDiQTgNUgQCIaDgbLZajgUmwBJd1AGel8pDg/+C2TC8GCIfRnPuGDPKAgJQLJqexhCmz Ofjiq3BcxAilwkNy2x3Srjga3LxeCfLljPl4C+Tl+9KNYEQL9FvTVFfBagrqRrhB6Ivb 4mhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=hKLx0N9R5aBOmOmF2CC93dCQvJ3pu7QHTa7ayVFGpZc=; b=Ci2OA31lzbBIWbRPLc4+gO7yTy+VPlvv+YSESJTsCdDpos3Fxx1aJilWqEzbZ9XUHp H5m4xourx66jqcd1nkU0uBa3JPd00lSrTWAKmTY2kHwWZl73aH9fCO/AIfPewJ++HNmH +o1VetdERoqowoX9k1rVBiAiyvSkBjXe3bJXlBUZwH5D0USRdJNi38hWR24VpomIXxsG hq0IrVC66UjEJDRxSFDZ6vU20fsJe2tklzxNthFOiLSr/OlTeIHO77Km4sM1sN1Tgf5s o+aKZYj6kW1f/FeaWL6W85Fh5nVYtpKgixH39Q6jSTp2o7TB/84i3JykYtoazE1jfCxT eGoQ== X-Gm-Message-State: AJcUukc5w0EriPgLsTNs4dL+EDki5KvkZcmOadSbtY+7+nI6EtkD4vL5 ARE+BwNi/c3rmazhwcZrNKgdyYAY X-Google-Smtp-Source: ALg8bN55MVGrSbcuxpPS1AsatLvbgXq3e8K3jRXDcd0JX9xGfsltQlXOHlkcGX1yWzvyIUiSPR6ZYw== X-Received: by 2002:aa7:c605:: with SMTP id h5mr1020133edq.9.1547505237636; Mon, 14 Jan 2019 14:33:57 -0800 (PST) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id j23sm4315167edr.89.2019.01.14.14.33.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 14:33:56 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.89) (envelope-from ) id 1gjAnm-0001qo-Oe; Mon, 14 Jan 2019 23:33:50 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Mon, 14 Jan 2019 23:33:49 +0100 Message-Id: <20190114223349.7071-1-peter@korsgaard.com> X-Mailer: git-send-email 2.11.0 Subject: [Buildroot] [PATCH] tpm2-tss: fix build with BR2_FORTIFY_SOURCE_1 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: Peter Korsgaard MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The configure script passes -U FORTIFY_SOURCE -D FORTIFY_SOURCE=2 by default, which conflicts with BR2_FORTIFY_SOURCE_1 as -Werror is used: -gcc .. -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 .. -D_FORTIFY_SOURCE=1 :0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] Disable this so the FORTIFY_SOURCE flags in TARGET_CFLAGS (if any) are used instead. Signed-off-by: Peter Korsgaard --- package/tpm2-tss/tpm2-tss.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index f005e5d6b8..5b57973c6e 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -16,4 +16,10 @@ TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc # libssp is missing. TPM2_TSS_CONF_ENV = ax_cv_check_cflags___________Wall__Werror_______fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) +# configure.ac uses FORTIFY_SOURCE=2 by default. Disable that so the +# BR2_FORTIFY_SOURCE_* options in CFLAGS are used instead +sTPM2_TSS_CONF_ENV += \ + ax_cv_check_ccppflags___________Wall__Werror_______U_FORTIFY_SOURCE=no \ + ax_cv_check_ccppflags___________Wall__Werror_______D_FORTIFY_SOURCE_2=no + $(eval $(autotools-package))