From patchwork Thu Dec 2 07:06: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: 1562551 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=OgOQAwuZ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4J4RrY6Cz7z9sR4 for ; Thu, 2 Dec 2021 18:08:45 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A38413857C7C for ; Thu, 2 Dec 2021 07:08:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A38413857C7C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1638428923; bh=54KZB+JQX9DqdYB9aWoK7ZJUiJhpNK1Tllj2dniTI1Q=; 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=OgOQAwuZ0AWhuFbYUXGpY5tjESsgAS5WmLBCNDauuwb5sGZGflUUMaSO7WZ46xitw k6w9r2FQvqt6XVgVNKYP2UUSIeBztj4lpFP13xy2kB3MefVTqCsBK4qLwA6Lf4k7zb leeNolBGTU+vsrLUICUjyfFKxZRSjX4/1c3Ou9UA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by sourceware.org (Postfix) with ESMTPS id 3C7553857C59 for ; Thu, 2 Dec 2021 07:07:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3C7553857C59 Received: by mail-pj1-x102a.google.com with SMTP id gf14-20020a17090ac7ce00b001a7a2a0b5c3so1683833pjb.5 for ; Wed, 01 Dec 2021 23:07:03 -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=54KZB+JQX9DqdYB9aWoK7ZJUiJhpNK1Tllj2dniTI1Q=; b=GGPJiVJuJCT07/CHMsatJEqLdAZuYUJ1rT4ltNJjOjZCyNxs/Bknxm7kesV+SLWpb9 eS84r5Lcq18iOkCHQYt0WTtP44mT57pjwEN5EkitHv50F2PHq1aWszUmTv4K/SUoHhVY inhVXy4hMDurJLiJcXNdBTN2nng3AATEb7F08cB7RU+7HpmS6pLQAahskSvHyidCUqSU JTOjrxKXu6kA/jnJjJ+n70XSTHNP+Oty6VkCQ+UOknKwyuwrem47660ei/GzZOT/BsGH uUiL99341ZB30em2+IgRYTSFq1fDhKXj6W60d1vCrggZZAW5lnb1idsUO92RDLYPKlrG X9fA== X-Gm-Message-State: AOAM532iz8RMcwUsaZrT2lnxqfQOqoavl6zaL9tk7UkYXck/o2nHVyeN kqRgQSzh3xqZPje6437yjZT46AHJ6hVRsg== X-Google-Smtp-Source: ABdhPJxpRZbkcPFvHhQPN388c9IkEXxNv42PP0pgyMSYOepMtBt5GQCyyu0eFfcPyoM5LQfCFaLq4g== X-Received: by 2002:a17:90a:e00f:: with SMTP id u15mr3965336pjy.123.1638428822038; Wed, 01 Dec 2021 23:07:02 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::ce68]) by smtp.gmail.com with ESMTPSA id r6sm1363064pjz.56.2021.12.01.23.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 23:07:01 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH] sysdeps/gnu/configure.ac: Set libc_cv_rootsbindir only if its empty Date: Wed, 1 Dec 2021 23:06:57 -0800 Message-Id: <20211202070658.2164977-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211202070658.2164977-1-raj.khem@gmail.com> References: <20211202070658.2164977-1-raj.khem@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 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+incoming=patchwork.ozlabs.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 --- 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..37cc983f2a 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 + test -n "$libc_cv_rootsbindir" || libc_cv_rootsbindir=/sbin ;; esac diff --git a/sysdeps/gnu/configure.ac b/sysdeps/gnu/configure.ac index 634fe4de2a..3db1697f4f 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 + test -n "$libc_cv_rootsbindir" || libc_cv_rootsbindir=/sbin ;; esac