From patchwork Thu Dec 9 20:35:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 48727 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 27703385801B for ; Thu, 9 Dec 2021 20:37:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 27703385801B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1639082235; bh=CwF9MWwJ6Dc6LXvEq85O9RBAE+OhOGambkXnmbJ4C9I=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=vaSUMoEVoMrxpoV5LJiW869npZrYLHERSNWf0sOstOQaH0NnGxoflxZqEGcuSgNC8 nFHi5Bj9s9RmTwxg+4vWPNciSqdLFUqiXaFP799gG4EnYIcqtCSVZ3kz7EgU0DPWe6 yFuCUi9TILuwduQcEaQJBdvcxa9duXi459QLdbIQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by sourceware.org (Postfix) with ESMTPS id 17FFE3858C27 for ; Thu, 9 Dec 2021 20:36:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 17FFE3858C27 Received: by mail-pj1-x102f.google.com with SMTP id v23so5299728pjr.5 for ; Thu, 09 Dec 2021 12:36:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CwF9MWwJ6Dc6LXvEq85O9RBAE+OhOGambkXnmbJ4C9I=; b=nOdHXoQ3Cr4tPPIPP1q0YDiCE6YjrATkkKzLm9mqOlyCq3tHqNx7NN/ec/yfeHSYi5 +N3wJdgf1rut06V7GNLMqCXFpNxt9tOvKJyugDD7OqYCDQjetE5WAQmRnSwOGT88KlPE oyga3iHQmIVzda8lej2ipODfuaZuJkXtDRk5JDDK76fXep1PUu888pmhEXcGVCLp+TTV H0Fv28hTemyYXnMPUQ3/8/tmunn+XuPICgi2kjpqYuH+Vd/1ILyOIEGskY10rUr4PkRL rwq/2JCVIcD66FuVj7xvpfy3IFgTFth6qqyV0QNKJRx9I7biUMTRWDZj+c1QyRngnU5Y qx7Q== X-Gm-Message-State: AOAM533Bb24Ku8IU6nAcOGesv82bcWY6hgYnKWY9RHwep1vzx+Ndkbbl KuJGn6/9kn5gn06LcpRcQz8HyKeNJcW1vw== X-Google-Smtp-Source: ABdhPJyPm84tSeD7IF05Jv7Fwws/z8dqhPt9OaGi3PTvnYCbKVMOUJ0j9kpz2dq/nHeT17nYmv8poA== X-Received: by 2002:a17:90b:30c4:: with SMTP id hi4mr18568601pjb.12.1639082172015; Thu, 09 Dec 2021 12:36:12 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::ce68]) by smtp.gmail.com with ESMTPSA id h5sm582598pfc.113.2021.12.09.12.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Dec 2021 12:36:11 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 2/2] sysdeps/gnu/configure.ac: Set libc_cv_rootsbindir only if its empty Date: Thu, 9 Dec 2021 12:35:57 -0800 Message-Id: <20211209203557.1318333-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211209203557.1318333-1-raj.khem@gmail.com> References: <20211209203557.1318333-1-raj.khem@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Khem Raj via Libc-alpha From: Khem Raj Reply-To: Khem Raj Cc: Matthieu Crapet Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This ensures that it can be set in build environment Signed-off-by: Matthieu Crapet Signed-off-by: Khem Raj --- v2: Improve setting Default variable value for libc_cv_rootsbindir sysdeps/gnu/configure | 2 +- sysdeps/gnu/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/gnu/configure b/sysdeps/gnu/configure index c15d1087e8..d30d6e37ae 100644 --- a/sysdeps/gnu/configure +++ b/sysdeps/gnu/configure @@ -32,6 +32,6 @@ case "$prefix" in else libc_cv_localstatedir=$localstatedir fi - libc_cv_rootsbindir=/sbin + libc_cv_rootsbindir=${libc_cv_rootsbindir:=/sbin} ;; esac diff --git a/sysdeps/gnu/configure.ac b/sysdeps/gnu/configure.ac index 634fe4de2a..492112e0fd 100644 --- a/sysdeps/gnu/configure.ac +++ b/sysdeps/gnu/configure.ac @@ -21,6 +21,6 @@ case "$prefix" in else libc_cv_localstatedir=$localstatedir fi - libc_cv_rootsbindir=/sbin + libc_cv_rootsbindir=${libc_cv_rootsbindir:=/sbin} ;; esac