From patchwork Tue Oct 15 19:17:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: DJ Delorie X-Patchwork-Id: 1997643 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Hi7TiT2Z; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XSkQY0Nz4z1xsc for ; Wed, 16 Oct 2024 06:18:13 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BA3373858D20 for ; Tue, 15 Oct 2024 19:18:10 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id C87133858D20 for ; Tue, 15 Oct 2024 19:17:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C87133858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C87133858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729019877; cv=none; b=Oj55vrBkXAB/tJy0rUIfvo8eFz58z1yjhao0OofHq2ZodQQQBHO5TZBsgsl8T9WueM3L5GaENgrcSr0gQ8uJaDMJrQeMZQ0I4M1q1Ob2yRfbYlJkgOl+XSmCmvGdzkIsGQJe5JUjU/YZQ3R1enhOLhLgCLy5ElNq3ho7X4gY0oU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729019877; c=relaxed/simple; bh=MWEH4UeTKQBC4sA+OlL28ae2OstWYhlCd0QQlYLkK1E=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=f/iFKTbEYXPbF7FCZGBUn+2WDTr7LuO66OAjrbVjKXrDYP2gCdnpSsLCuXId9/HI76XtTr6GxZj/ksdyPjJdhDtIZfBEfOxbz8ALNw7bUsP2rkOChanzIxmDfEklEDGpvsh+sO2mNXP5Mj6CQglnIkrnMKUmXSHAI34zg7Vcfe8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729019875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to; bh=FMD08nqrUd9jJEgQ5mGuBXrFuuk4Q+367/5uhOhKios=; b=Hi7TiT2ZxXYa9H83gPFentb0083EZGjyRXjUPr1NBiqYWLqBK3Q0/WQGbzBhkqpmLqwrVL dQuP0fbsu+o7B5w6TQZiorMdaz1XWmI9IWzV3A64B9KO0ewO6mxnjBzAWkivZibsskpZ+Q PQb15CPhJzWGVmXNX1IojoIUkOR2z7U= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-307-z6LXRIklNzy9n-BYvQlRAA-1; Tue, 15 Oct 2024 15:17:54 -0400 X-MC-Unique: z6LXRIklNzy9n-BYvQlRAA-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 538B71955EE9; Tue, 15 Oct 2024 19:17:53 +0000 (UTC) Received: from greed.delorie.com (unknown [10.22.8.53]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D8A1819560AE; Tue, 15 Oct 2024 19:17:52 +0000 (UTC) Received: from greed.delorie.com.redhat.com (localhost [127.0.0.1]) by greed.delorie.com (8.16.1/8.16.1) with ESMTP id 49FJHokt238532; Tue, 15 Oct 2024 15:17:50 -0400 From: DJ Delorie To: Andreas Schwab Cc: libc-alpha@sourceware.org Subject: [patch v2] configure: default to --prefix=/usr on GNU/Linux In-Reply-To: <871q0lu9t0.fsf@igel.home> (message from Andreas Schwab on Sat, 12 Oct 2024 08:14:51 +0200) Date: Tue, 15 Oct 2024 15:17:50 -0400 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SBL_CSS, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org Andreas Schwab writes: >> +ac_default_prefix=/usr > > AC_PREFIX_DEFAULT([/usr]) Fixed: I'm getting tired of always typing --prefix=/usr so making it the default. diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure old mode 100644 new mode 100755 index 4d642e953b..8cda8e9451 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -1,3 +1,4 @@ +ac_default_prefix=/usr # This file is generated from configure.ac by Autoconf. DO NOT EDIT! # Local configure fragment for sysdeps/unix/sysv/linux. @@ -116,7 +117,9 @@ if test -n "$sysheaders"; then CPPFLAGS=$OLD_CPPFLAGS fi -if test "$prefix" = "/usr/local" -o "$prefix" = "/usr/local/" -o "$prefix" = "NONE"; then + + +if test "$prefix" = "/usr/local" -o "$prefix" = "/usr/local/"; then if test $enable_sanity = yes; then echo "\ *** On GNU/Linux systems the GNU C Library should not be installed into diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac index c177e082a9..4c43cda877 100644 --- a/sysdeps/unix/sysv/linux/configure.ac +++ b/sysdeps/unix/sysv/linux/configure.ac @@ -71,7 +71,9 @@ if test -n "$sysheaders"; then CPPFLAGS=$OLD_CPPFLAGS fi -if test "$prefix" = "/usr/local" -o "$prefix" = "/usr/local/" -o "$prefix" = "NONE"; then +AC_PREFIX_DEFAULT([/usr]) + +if test "$prefix" = "/usr/local" -o "$prefix" = "/usr/local/"; then if test $enable_sanity = yes; then echo "\ *** On GNU/Linux systems the GNU C Library should not be installed into