From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23756 invoked by alias); 12 Nov 2002 04:37:04 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 23730 invoked from network); 12 Nov 2002 04:37:02 -0000 Received: from unknown (HELO mailout5-0.nyroc.rr.com) (24.92.226.169) by sources.redhat.com with SMTP; 12 Nov 2002 04:37:02 -0000 Received: from doctormoo (syr-24-24-16-193.twcny.rr.com [24.24.16.193]) by mailout5-0.nyroc.rr.com (8.11.6/RoadRunner 1.20) with ESMTP id gAC4avF19938; Mon, 11 Nov 2002 23:36:57 -0500 (EST) Received: from neroden by doctormoo with local (Exim 3.36 #1 (Debian)) id 18BSnD-00028r-00; Mon, 11 Nov 2002 23:36:51 -0500 Date: Mon, 11 Nov 2002 20:37:00 -0000 To: gcc-patches@gcc.gnu.org Cc: dj@redhat.com, binutils@sources.redhat.com, gdb-patches@sources.redhat.com Subject: top level patch: even MORE autoconfiness Message-ID: <20021112043650.GA8233@doctormoo> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4i From: Nathanael Nerode X-SW-Source: 2002-11/txt/msg00718.txt.bz2 This converts some variable settings to be subsituted in a more autoconf-friendly manner. (They were previously echoed to a "prologue file" to the Makefile.) It also simplifies one particular sed in a way which eliminates two temporary files. (It was irritating me.) I was originally concerned about setting the shell variable enable_version_specific_runtime_libs to 'no' when it was blank, but I found that it isn't used subsequent to this line in configure or configure.in, except in ways which don't distinguish between '' and 'no'. So it's OK. The change from ">>" to ">" down at the bottom is because only the *first* sed should append to the "prolog file", which I haven't quite eliminated yet. I'll tackle some more of its contents in a day or two. Tested on i686-pc-linux-gnu; no change in generated Makefile except relocation of variable settings by a few lines. If approved, this will go into gcc 3.4bib, and will not hit src until gcc 3.3 is released. * configure: Substitute more variables in a more autoconf-friendly way. Simplify slightly. * Makefile.tpl: Make more variables substitutable in an autoconf-friendly way. * Makefile.in: Regenerate. Index: Makefile.in =================================================================== RCS file: /cvs/gcc/gcc/Makefile.in,v retrieving revision 1.111.4.6 diff -u -r1.111.4.6 Makefile.in --- Makefile.in 9 Nov 2002 22:15:06 -0000 1.111.4.6 +++ Makefile.in 12 Nov 2002 04:26:54 -0000 @@ -26,6 +26,13 @@ NOTPARALLEL = .NOTPARALLEL $(NOTPARALLEL): +enable_shared = @enable_shared@ +enable_threads = @enable_threads@ +enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@ +# The file containing GCC's version number. +gcc_version_trigger = @gcc_version_trigger@ +gcc_version = @gcc_version@ + srcdir = @srcdir@ prefix = @prefix@ Index: Makefile.tpl =================================================================== RCS file: /cvs/gcc/gcc/Makefile.tpl,v retrieving revision 1.5.2.4 diff -u -r1.5.2.4 Makefile.tpl --- Makefile.tpl 9 Nov 2002 22:10:17 -0000 1.5.2.4 +++ Makefile.tpl 12 Nov 2002 04:26:56 -0000 @@ -29,6 +29,13 @@ NOTPARALLEL = .NOTPARALLEL $(NOTPARALLEL): +enable_shared = @enable_shared@ +enable_threads = @enable_threads@ +enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@ +# The file containing GCC's version number. +gcc_version_trigger = @gcc_version_trigger@ +gcc_version = @gcc_version@ + srcdir = @srcdir@ prefix = @prefix@ Index: configure =================================================================== RCS file: /cvs/gcc/gcc/configure,v retrieving revision 1.46.6.3 diff -u -r1.46.6.3 configure --- configure 10 Nov 2002 21:14:18 -0000 1.46.6.3 +++ configure 12 Nov 2002 04:26:58 -0000 @@ -1326,33 +1326,29 @@ echo site_makefile_frag = ${site_makefile_frag} >>${Makefile} fi - echo enable_shared = ${enable_shared} >> ${Makefile} - echo enable_threads = ${enable_threads} >> ${Makefile} + # record if we want to rumtime library stuff installed in libsubdir. + # Blank means no. if test -z "${enable_version_specific_runtime_libs}"; then - echo enable_version_specific_runtime_libs = no >> ${Makefile} - else - echo enable_version_specific_runtime_libs = ${enable_version_specific_runtime_libs} >> ${Makefile} + enable_version_specific_runtime_libs=no fi - # Emit a macro which describes the file containing gcc's - # version number. - echo gcc_version_trigger = ${gcc_version_trigger} >> ${Makefile} - # And emit a macro defining gcc's version number. - echo gcc_version = ${gcc_version} >> ${Makefile} + # Real copy now in Makefile.tem + # Prologue in Makefile. + + sed -e "s|@enable_shared@|${enable_shared}|" \ + -e "s|@enable_threads@|${enable_threads}|" \ + -e "s|@enable_version_specific_runtime_libs@|${enable_version_specific_runtime_libs}|" \ + -e "s|@gcc_version_trigger@|${gcc_version_trigger}|" \ + -e "s|@gcc_version@|${gcc_version}|" \ + ./Makefile.tem >> ${Makefile} + mv -f ${Makefile} ./Makefile.tem + # Real copy now in Makefile.tem; no prologue. # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS, # remove any form feeds. - rm -f ./Makefile.tm2 - sedtemp=sed.$$ - cat >$sedtemp < ./Makefile.tm2 - rm -f $sedtemp - rm -f ./Makefile.tem - mv ./Makefile.tm2 ./Makefile.tem - sed -e "s|@prefix@|${prefix}|" \ + sed -e "s|@configdirs@|${configdirs}|" \ + -e "s|@prefix@|${prefix}|" \ -e "s|@exec_prefix@|${exec_prefix}|" \ -e "s|@bindir@|${bindir}|" \ -e "s|@sbindir@|${sbindir}|" \ @@ -1404,7 +1400,7 @@ -e "s:@DEFAULT_YACC@:${DEFAULT_YACC}:" \ -e "s:@DEFAULT_LEX@:${DEFAULT_LEX}:" \ -e "s:@DEFAULT_M4@:${DEFAULT_M4}:" \ - ./Makefile.tem >> ${Makefile} + ./Makefile.tem > ${Makefile} sed -e "s:@GDB_TK@:${GDB_TK}:" ${Makefile} >${Makefile}.tem mv -f ${Makefile}.tem ${Makefile}