From patchwork Thu May 8 18:28:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 849 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx21.g.dreamhost.com (peon2454.g.dreamhost.com [208.113.200.127]) by wilcox.dreamhost.com (Postfix) with ESMTP id 0B14C36001D for ; Thu, 8 May 2014 11:28:51 -0700 (PDT) Received: by homiemail-mx21.g.dreamhost.com (Postfix, from userid 14307373) id B56BF160D839; Thu, 8 May 2014 11:28:51 -0700 (PDT) X-Original-To: glibc@patchwork.siddhesh.in Delivered-To: x14307373@homiemail-mx21.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx21.g.dreamhost.com (Postfix) with ESMTPS id 30C95160D823 for ; Thu, 8 May 2014 11:28:51 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; q= dns; s=default; b=E94hk9EvzDNoGUs8sv84UDkUDkrVREOtM060Qg9ugMuM5M UtJjGPPzzL3YqfvTYCD1bO2Oz/+xZjns4w8snVQ+gpPVEJLkEIj/u30QrBuRluGZ Ww+XBqoLLmfb/qSR910129LPXZZTEuAQNFO3RTABLo4CRbDPG/UcCh4CDvoXc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; s= default; bh=JtGeZnqov4WZcmJgqDMfhp27kAU=; b=F8lWSk39l3hCBRQHEt+V 1oNhwp2F2+dNUSNAzR2uIOJTJAxaYkIDg609cQfb2MUSLZZUIOfCr2Dk0xNvDIeI l6jypKl/rT6L4Ai5oLBITowPaIWtzOitxVxdgh4iJV71S/nCFik78mALZc8/jvrW uS51OQ2Qd9LU9X6KpWEuksM= Received: (qmail 628 invoked by alias); 8 May 2014 18:28:48 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 564 invoked by uid 89); 8 May 2014 18:28:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] Some configure-related decrufting. Message-Id: <20140508182842.7CF3D2C39B1@topped-with-meat.com> Date: Thu, 8 May 2014 11:28:42 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=J405smXS c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=Ierv-OZlAYgA:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=KxCdLAcCJMBFcGeOwjgA:9 a=CjuIK1q_8ugA:10 X-DH-Original-To: glibc@patchwork.siddhesh.in * Makeconfig ($(common-objpfx)config.status): Fix patsubst uses to look for %.ac rather than %.in. * sysdeps/mach/hurd/configure.ac (inhibit_glue): Remove variable. * sysdeps/unix/sysv/linux/configure.ac: Likewise. * sysdeps/mach/hurd/configure: Regenerated. * sysdeps/unix/sysv/linux/configure: Regenerated. --- a/Makeconfig +++ b/Makeconfig @@ -86,12 +86,12 @@ $(common-objpfx)config.make: $(common-objpfx)config.status \ $(common-objpfx)config.status: $(..)version.h $(..)configure \ $(foreach dir,$(sysdirs),\ $(wildcard $(dir)/Implies) \ - $(patsubst %.in,%,\ + $(patsubst %.ac,%,\ $(firstword $(wildcard \ $(addprefix $(dir)/,configure configure.ac))))) \ - $(patsubst %.in,%,\ + $(patsubst %.ac,%,\ $(wildcard $(..)sysdeps/*/preconfigure $(..)sysdeps/*/preconfigure.ac)) \ - $(patsubst %.in,%,\ + $(patsubst %.ac,%,\ $(foreach add-on,$(add-ons),\ $(firstword $(wildcard \ $(addprefix $(firstword $(filter /%,$(add-on)) $(..)$(add-on))/,\ --- a/sysdeps/mach/hurd/configure +++ b/sysdeps/mach/hurd/configure @@ -3,10 +3,6 @@ $as_echo "#define NO_HIDDEN 1" >>confdefs.h -# Don't bother trying to generate any glue code to be compatible with the -# existing system library, because we are the only system library. -inhibit_glue=yes - case "$machine" in i386*) # The default oldest ABI is 2.2.6. --- a/sysdeps/mach/hurd/configure.ac +++ b/sysdeps/mach/hurd/configure.ac @@ -3,10 +3,6 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. dnl We need this setting because of the need for PLT calls in ld.so. AC_DEFINE([NO_HIDDEN]) -# Don't bother trying to generate any glue code to be compatible with the -# existing system library, because we are the only system library. -inhibit_glue=yes - case "$machine" in i386*) # The default oldest ABI is 2.2.6. --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -32,10 +32,6 @@ $as_echo "$ac_res" >&6; } # This file is generated from configure.ac by Autoconf. DO NOT EDIT! # Local configure fragment for sysdeps/unix/sysv/linux. -# Don't bother trying to generate any glue code to be compatible with the -# existing system library, because we are the only system library. -inhibit_glue=yes - if test -n "$sysheaders"; then OLD_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $SYSINCLUDES" --- a/sysdeps/unix/sysv/linux/configure.ac +++ b/sysdeps/unix/sysv/linux/configure.ac @@ -1,10 +1,6 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # Local configure fragment for sysdeps/unix/sysv/linux. -# Don't bother trying to generate any glue code to be compatible with the -# existing system library, because we are the only system library. -inhibit_glue=yes - define([LIBC_LINUX_VERSION],[2.6.32])dnl if test -n "$sysheaders"; then OLD_CPPFLAGS=$CPPFLAGS