From patchwork Sun Jan 9 02:48:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allan McRae X-Patchwork-Id: 2011 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [2a01:4f9:c010:3052::1] by patchwork.archlinux.org with IMAP (fetchmail-6.4.25) for (single-drop); Sun, 09 Jan 2022 02:48:22 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id ePGrOvVM2mFi6QsAK+/4rw (envelope-from ) for ; Sun, 09 Jan 2022 02:48:21 +0000 Received: from lists.archlinux.org (lists.archlinux.org [IPv6:2a01:4f9:c010:9eb4::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.archlinux.org (Postfix) with ESMTPS id 680BCC02D8D; Sun, 9 Jan 2022 02:48:20 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id 1600FB8F76C; Sun, 9 Jan 2022 02:48:20 +0000 (UTC) X-Original-To: pacman-dev@lists.archlinux.org Delivered-To: pacman-dev@lists.archlinux.org Received: from mail.archlinux.org (mail.archlinux.org [95.216.189.61]) by lists.archlinux.org (Postfix) with ESMTPS id 99517B8F75D for ; Sun, 9 Jan 2022 02:48:17 +0000 (UTC) From: Allan McRae DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-rsa; t=1641696497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vhaeHuIUXzL9R155nZ5E9p8kdMiLgjatLGM4+CSscSg=; b=o93K1Mz6mYY+Oe4ZkF7a9Ky02KtmeNdVgsBwe/r6BWv1eLXuC+/8a083i0+A/qRDPXBMoe c7mj0qWTlqy7xXFdJqaW56cwHcwUlOBFMtsRQJFZCmvftzW1oyfgRMRcdGH9gbcfhfr0jz K86Rz9+kHsyPC72QyPHJr4ZY/X25dN36mMA2G1VJ1A04Q6gI6/ZO4W5njY9lbnfGeKqAj5 ypZqwIk6qHDSuqQWP085AeEoGShFrmUyW2Eeg5mwi7H+rNj3FUSmfQl4tewX5w17KQHmqp rjbLr9ECild5N6h6MYq4ZTgsy+mxVRJZ0gn2vKL+oJNnZyxoUrSMZLEE3JlSpGyJxigeUm PDfXaRCa0rhr2KWxtGd9R0oOclbpddSZT3y2SqWozXO/uCwyhu2rwRL7YT5zAyvjkL6QQu 1NDjDd1J652XxXk7shWtkKZR+CI1cH+C1YnjUZqQWQ9xyqJ+324t2RyeWiaRNEUfam/OUe TZkrwH22YGFCl14tF9NoHAvn8V+he+YGMGJjyHu+JQI11/N4z0HBPdE236iuwFJVy95VwD qjbd4ECDLd2oFqcSrfqePzal2/4z88C7JWdNZ2EL1u8ZzpLOtCRoHfOlVpAEQrWV5ocWMM 3kG3FV3fdcglpEP7DDFNdzCmlq5aayg0KHQwmL8n8ca+srCVKptR0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-ed25519; t=1641696497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vhaeHuIUXzL9R155nZ5E9p8kdMiLgjatLGM4+CSscSg=; b=i5btNfX3b32WdGcxdau71xgCyJ6BHpwgSomK5JlM2LY5o35ENqQnd2zqGnSl4KAQmoUyQZ Hxtu3yK5d0u/VxBg== To: pacman-dev@lists.archlinux.org Subject: [PATCH] libmakepkg: add extra buildflags only when buildflags is not disabled Date: Sun, 9 Jan 2022 12:48:07 +1000 Message-Id: <20220109024807.184112-1-allan@archlinux.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: pacman-dev@lists.archlinux.org X-Mailman-Version: 2.1.39 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-dev-bounces@lists.archlinux.org Sender: "pacman-dev" Authentication-Results: mail.archlinux.org; dkim=pass header.d=archlinux.org header.s=dkim-rsa header.b=o93K1Mz6; dkim=pass header.d=archlinux.org header.s=dkim-ed25519 header.b=i5btNfX3; dmarc=pass (policy=none) header.from=archlinux.org; spf=pass (mail.archlinux.org: domain of pacman-dev-bounces@lists.archlinux.org designates 2a01:4f9:c010:9eb4::1 as permitted sender) smtp.mailfrom=pacman-dev-bounces@lists.archlinux.org X-Rspamd-Queue-Id: 680BCC02D8D X-Spamd-Result: default: False [-2.61 / 15.00]; DWL_DNSWL_MED(-2.00)[archlinux.org:dkim]; MID_CONTAINS_FROM(1.00)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; R_MISSING_CHARSET(0.50)[]; RCVD_IN_DNSWL_MED(-0.40)[95.216.189.61:received,2a01:4f9:c010:9eb4::1:from]; R_DKIM_ALLOW(-0.20)[archlinux.org:s=dkim-rsa,archlinux.org:s=dkim-ed25519]; MAILLIST(-0.20)[mailman]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f9:c010:9eb4::1:c]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; MIME_TRACE(0.00)[0:+]; NEURAL_HAM(-0.00)[-0.997]; ASN(0.00)[asn:24940, ipnet:2a01:4f9::/32, country:DE]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[archlinux.org:+]; TO_DN_NONE(0.00)[]; FROM_NEQ_ENVFROM(0.00)[allan@archlinux.org,pacman-dev-bounces@lists.archlinux.org]; RCPT_COUNT_ONE(0.00)[1]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org This means options=('!buildflags') will disable the addition of CFLAG etc for LTO and debug building. Signed-off-by: Allan McRae --- Question... There seems to be a strong opinion that LTO should be disabled by !buildflags as it is expected that option removes all buildflags. Should that apply to debug flags too? scripts/libmakepkg/buildenv/debugflags.sh.in | 2 +- scripts/libmakepkg/buildenv/lto.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in index 84ca7b71..1cb58613 100644 --- a/scripts/libmakepkg/buildenv/debugflags.sh.in +++ b/scripts/libmakepkg/buildenv/debugflags.sh.in @@ -29,7 +29,7 @@ source "$LIBRARY/util/option.sh" buildenv_functions+=('buildenv_debugflags') buildenv_debugflags() { - if check_option "debug" "y"; then + if check_option "debug" "y" && ! check_option "buildflags" "n"; then DEBUG_CFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" DEBUG_CXXFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" DEBUG_RUSTFLAGS+=" --remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}" diff --git a/scripts/libmakepkg/buildenv/lto.sh.in b/scripts/libmakepkg/buildenv/lto.sh.in index 081d5648..6e500eab 100644 --- a/scripts/libmakepkg/buildenv/lto.sh.in +++ b/scripts/libmakepkg/buildenv/lto.sh.in @@ -30,7 +30,7 @@ build_options+=('lto') buildenv_functions+=('buildenv_lto') buildenv_lto() { - if check_option "lto" "y"; then + if check_option "lto" "y" && ! check_option "buildflags" "n"; then CFLAGS+=" -flto" CXXFLAGS+=" -flto" LDFLAGS+=" -flto"