* PATCH: autoconfiscate SPU
@ 2002-01-28 18:50 Nathanael Nerode
2002-01-28 19:26 ` Daniel Jacobowitz
0 siblings, 1 reply; 3+ messages in thread
From: Nathanael Nerode @ 2002-01-28 18:50 UTC (permalink / raw)
To: gdb-patches
This patch autoconfiscates SPU. (Directory src/utils/spu)
It's a pretty basic job, not actually working around any potentially
missing headers, but it works (on i686-linux-gnu, debian woody)
Because 'configure' is new, cvs diff refused to mention it. It's generated
by autoconf 2.50 from configure.in and will need to be committed along
with the patch.
Because of this and the total changes to the other two files, the patch
looks far worse than the three files; if anyone wants me to wrap those up
somehow, I will.
2002-01-28 Nathanael Nerode <neroden@twcny.rr.com>
Autoconfiscation of SPU.
* utils/spu/configure: new file for autoconfiscation
* utils/spu/configure.in: replaced for autoconfiscation
* utils/spu/Makefile.in: replaced for autoconfiscation
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/utils/spu/Makefile.in,v
retrieving revision 1.1.1.1
diff -c -3 -p -r1.1.1.1 Makefile.in
*** Makefile.in 1999/04/16 01:35:29 1.1.1.1
--- Makefile.in 2002/01/29 02:23:52
***************
*** 1,6 ****
! # Copyright 1993, 1994 Free Software Foundation, Inc.
! # This file is part of GNU CC.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
--- 1,6 ----
! # Copyright 1993, 1994, 2002 Free Software Foundation, Inc.
! # This file is part of SPU.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
***************
*** 15,31 ****
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
! prefix = /usr/local
! program_transform_name =
! exec_prefix = $(prefix)
! bindir = $(exec_prefix)/bin
! libdir = $(exec_prefix)/lib
! tooldir = $(libdir)/$(target_alias)
- datadir = $(prefix)/share
- mandir = $(prefix)/man
man1dir = $(mandir)/man1
man2dir = $(mandir)/man2
man3dir = $(mandir)/man3
--- 15,37 ----
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ VPATH = @srcdir@
! SHELL = /bin/sh
! prefix = @prefix@
! exec_prefix = @exec_prefix@
! bindir = @bindir@
! libdir = @libdir@
! datadir = @datadir@
! mandir = @mandir@
! infodir = @infodir@
! includedir = @includedir@
! srcdir = @srcdir@
!
! CC = @CC@
! CFLAGS = @CFLAGS@
man1dir = $(mandir)/man1
man2dir = $(mandir)/man2
man3dir = $(mandir)/man3
*************** man6dir = $(mandir)/man6
*** 35,61 ****
man7dir = $(mandir)/man7
man8dir = $(mandir)/man8
man9dir = $(mandir)/man9
! infodir = $(prefix)/info
! includedir = $(prefix)/include
!
! SHELL = /bin/sh
! INSTALL = install -c
INSTALL_PROGRAM = $(INSTALL)
INSTALL_DATA = $(INSTALL)
- AR = ar
- AR_FLAGS = qv
- RANLIB = ranlib
-
- # Directory containing source files. Don't clean up the spacing,
- # this exact string is matched for by the "configure" script.
- srcdir = .
-
# Where is the "include" directory? Traditionally ../include or ./include
! INCLUDE_DIR = ${srcdir}/../../include
! INCLUDE_DEP = $$(INCLUDE_DIR)
# All the includes used for CFLAGS and for lint.
# -I. for config files.
--- 41,55 ----
man7dir = $(mandir)/man7
man8dir = $(mandir)/man8
man9dir = $(mandir)/man9
! tooldir = $(libdir)/$(target_alias)
! INSTALL = @INSTALL@
INSTALL_PROGRAM = $(INSTALL)
INSTALL_DATA = $(INSTALL)
# Where is the "include" directory? Traditionally ../include or ./include
! INCLUDE_DIR = ${srcdir}/../../include
# All the includes used for CFLAGS and for lint.
# -I. for config files.
*************** INCLUDE_DEP = $$(INCLUDE_DIR)
*** 64,124 ****
INCLUDE_CFLAGS = -I. -I${srcdir} -I${srcdir}/config -I$(INCLUDE_DIR)
- # CFLAGS is specifically reserved for setting from the command line
- # when running make. I.E. "make CFLAGS=-Wmissing-prototypes".
-
- CFLAGS = -g
-
# ALL_CFLAGS is the aggregate of all other *CFLAGS macros.
-
- ALL_CFLAGS = $(CFLAGS) $(INCLUDE_CFLAGS)
-
- # None of the things in CFLAGS will do any harm, and on some systems
- # (e.g. SunOS4) it is important to use the MH_CFLAGS.
-
- LDFLAGS = $(CFLAGS)
! # Where is the "-liberty" library, containing getopt and obstack?
- LIBIBERTY_DIR = ${srcdir}/../../libiberty
- LIBIBERTY = ./../../libiberty${subdir}/libiberty.a
-
- # Host and target-dependent makefile fragments come in here.
- ####
- # End of host and target-dependent makefile fragments
-
- # Prevent Sun make from putting in the machine type. Setting
- # TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1.
-
- .c.o:
- ${CC} -c ${ALL_CFLAGS} $<
-
- OFILES = spu.o
-
all: spu
info:
install:
-
- install-info:
! spu: ${OFILES}
$(CC) $(CFLAGS) -o spu spu.o
! spu.o: spu.c
mostlyclean:
! clean: mostlyclean
rm -f *.o spu
! distclean: clean
! rm -f Makefile config.status
! maintainer-clean realclean: distclean
! Makefile: Makefile.in $(host_makefile_frag) $(target_makefile_frag)
! $(SHELL) config.status
! force:
--- 58,96 ----
INCLUDE_CFLAGS = -I. -I${srcdir} -I${srcdir}/config -I$(INCLUDE_DIR)
# ALL_CFLAGS is the aggregate of all other *CFLAGS macros.
! ALL_CFLAGS = @DEFS@ $(INCLUDE_CFLAGS) $(CFLAGS)
all: spu
info:
install:
! spu: spu.o
$(CC) $(CFLAGS) -o spu spu.o
! # Prevent Sun make from putting in the machine type. Setting
! # TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1.
! spu.o: $(srcdir)/spu.c
! ${CC} -c ${ALL_CFLAGS} $(srcdir)/spu.c
mostlyclean:
! clean: mostlyclean
rm -f *.o spu
+
+ distclean: clean
+ rm -f Makefile config.status config.log
! maintainer-clean realclean: distclean
! Makefile: $(srcdir)/Makefile.in config.status
! ./config.status
! config.status: $(srcdir)/configure
! ./config.status --recheck
! $(srcdir)/configure: $(srcdir)/configure.in
! cd $(srcdir) && autoconf
Index: configure.in
===================================================================
RCS file: /cvs/src/src/utils/spu/configure.in,v
retrieving revision 1.1.1.1
diff -c -3 -p -r1.1.1.1 configure.in
*** configure.in 1999/04/16 01:35:30 1.1.1.1
--- configure.in 2002/01/29 02:23:52
***************
*** 1,13 ****
! # This file is a shell script fragment that supplies the information
! # necessary to tailor a template configure script into the configure
! # script appropriate for this directory. For more information, check
! # any existing configure script.
! srctrigger=spu.c
! srcname="spu"
! # per-host:
! # per-target:
! # post-target:
--- 1,43 ----
! # Process this file with autoconf to produce a configure script.
! # Copyright 2002 Free Software Foundation, Inc.
! # This file is part of SPU.
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2 of the License, or
! # (at your option) any later version.
! #
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! # GNU General Public License for more details.
! #
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
! AC_INIT([spu],[0.5])
! AC_PREREQ([2.50])
! AC_CONFIG_SRCDIR([spu.c])
!
! # Checks for programs.
! AC_PROG_CC
! AC_PROG_INSTALL
!
! # Checks for header files.
! # The program doesn't actually handle failure.
! #AC_HEADER_STDC
! #AC_CHECK_HEADERS([stdlib.h string.h])
!
! # Checks for typedefs, structures, and compiler characteristics.
! AC_C_CONST
!
! # Checks for library functions.
! # The program doesn't actually handle failure.
! #AC_FUNC_MALLOC
! #AC_CHECK_FUNCS([memset strtol])
!
! AC_CONFIG_FILES([Makefile])
! AC_OUTPUT
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: PATCH: autoconfiscate SPU
2002-01-28 18:50 PATCH: autoconfiscate SPU Nathanael Nerode
@ 2002-01-28 19:26 ` Daniel Jacobowitz
2002-01-29 7:35 ` PATCH: autoconfiscate SPU (take two) Nathanael Nerode
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Jacobowitz @ 2002-01-28 19:26 UTC (permalink / raw)
To: gdb-patches; +Cc: Nathanael Nerode
On Mon, Jan 28, 2002 at 09:50:14PM -0500, Nathanael Nerode wrote:
> This patch autoconfiscates SPU. (Directory src/utils/spu)
> It's a pretty basic job, not actually working around any potentially
> missing headers, but it works (on i686-linux-gnu, debian woody)
>
> Because 'configure' is new, cvs diff refused to mention it. It's generated
> by autoconf 2.50 from configure.in and will need to be committed along
> with the patch.
>
> Because of this and the total changes to the other two files, the patch
> looks far worse than the three files; if anyone wants me to wrap those up
> somehow, I will.
>
> 2002-01-28 Nathanael Nerode <neroden@twcny.rr.com>
> Autoconfiscation of SPU.
> * utils/spu/configure: new file for autoconfiscation
> * utils/spu/configure.in: replaced for autoconfiscation
> * utils/spu/Makefile.in: replaced for autoconfiscation
> ! AC_PREREQ([2.50])
No.
The entire remainder of the tree uses autoconf 2.13. It is not yet
autoconf aware. Moving to autoconf 2.5 is a relatively short-term
goal, but for now any configure.in's you add MUST work with 2.13.
Working with 2.5 is a plus.
--
Daniel Jacobowitz Carnegie Mellon University
MontaVista Software Debian GNU/Linux Developer
^ permalink raw reply [flat|nested] 3+ messages in thread
* PATCH: autoconfiscate SPU (take two)
2002-01-28 19:26 ` Daniel Jacobowitz
@ 2002-01-29 7:35 ` Nathanael Nerode
0 siblings, 0 replies; 3+ messages in thread
From: Nathanael Nerode @ 2002-01-29 7:35 UTC (permalink / raw)
To: gdb-patches
This patch autoconfiscates SPU. (Directory src/utils/spu)
It's a pretty basic job, not actually working around any potentially
missing headers, but it works (on i686-linux-gnu, debian woody)
Corrected from previous version to work with autoconf 2.13.
Because 'configure' is new, cvs diff refused to mention it. It's generated
by autoconf 2.13 from configure.in and will need to be committed along
with the patch.
Because of this and the total changes to the other two files, the patch
looks far worse than the three files; if anyone wants me to wrap those up
somehow, I will.
2002-01-28 Nathanael Nerode <neroden@twcny.rr.com>
Autoconfiscation of SPU.
* utils/spu/configure: new file for autoconfiscation
* utils/spu/configure.in: replaced for autoconfiscation
* utils/spu/Makefile.in: replaced for autoconfiscation
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/utils/spu/Makefile.in,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 Makefile.in
1c1
< # Copyright 1993, 1994 Free Software Foundation, Inc.
---
> # Copyright 1993, 1994, 2002 Free Software Foundation, Inc.
3c3
< # This file is part of GNU CC.
---
> # This file is part of SPU.
17a18
> VPATH = @srcdir@
19c20
< prefix = /usr/local
---
> SHELL = /bin/sh
21,25c22,33
< program_transform_name =
< exec_prefix = $(prefix)
< bindir = $(exec_prefix)/bin
< libdir = $(exec_prefix)/lib
< tooldir = $(libdir)/$(target_alias)
---
> prefix = @prefix@
> exec_prefix = @exec_prefix@
> bindir = @bindir@
> libdir = @libdir@
> datadir = @datadir@
> mandir = @mandir@
> infodir = @infodir@
> includedir = @includedir@
> srcdir = @srcdir@
>
> CC = @CC@
> CFLAGS = @CFLAGS@
27,28d34
< datadir = $(prefix)/share
< mandir = $(prefix)/man
38,41c44
< infodir = $(prefix)/info
< includedir = $(prefix)/include
<
< SHELL = /bin/sh
---
> tooldir = $(libdir)/$(target_alias)
43c46
< INSTALL = install -c
---
> INSTALL = @INSTALL@
47,54d49
< AR = ar
< AR_FLAGS = qv
< RANLIB = ranlib
<
< # Directory containing source files. Don't clean up the spacing,
< # this exact string is matched for by the "configure" script.
< srcdir = .
<
57,58c52
< INCLUDE_DIR = ${srcdir}/../../include
< INCLUDE_DEP = $$(INCLUDE_DIR)
---
> INCLUDE_DIR = ${srcdir}/../../include
67,71d60
< # CFLAGS is specifically reserved for setting from the command line
< # when running make. I.E. "make CFLAGS=-Wmissing-prototypes".
<
< CFLAGS = -g
<
74,96c63
< ALL_CFLAGS = $(CFLAGS) $(INCLUDE_CFLAGS)
<
< # None of the things in CFLAGS will do any harm, and on some systems
< # (e.g. SunOS4) it is important to use the MH_CFLAGS.
<
< LDFLAGS = $(CFLAGS)
<
< # Where is the "-liberty" library, containing getopt and obstack?
<
< LIBIBERTY_DIR = ${srcdir}/../../libiberty
< LIBIBERTY = ./../../libiberty${subdir}/libiberty.a
<
< # Host and target-dependent makefile fragments come in here.
< ####
< # End of host and target-dependent makefile fragments
<
< # Prevent Sun make from putting in the machine type. Setting
< # TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1.
<
< .c.o:
< ${CC} -c ${ALL_CFLAGS} $<
<
< OFILES = spu.o
---
> ALL_CFLAGS = @DEFS@ $(INCLUDE_CFLAGS) $(CFLAGS)
104,106c71
< install-info:
<
< spu: ${OFILES}
---
> spu: spu.o
109c74,77
< spu.o: spu.c
---
> # Prevent Sun make from putting in the machine type. Setting
> # TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1.
> spu.o: $(srcdir)/spu.c
> ${CC} -c ${ALL_CFLAGS} $(srcdir)/spu.c
113c81
< clean: mostlyclean
---
> clean: mostlyclean
116,117c84,87
< distclean: clean
< rm -f Makefile config.status
---
> distclean: clean
> rm -f Makefile config.status config.log config.cache
>
> maintainer-clean realclean: distclean
119c89,90
< maintainer-clean realclean: distclean
---
> Makefile: $(srcdir)/Makefile.in config.status
> ./config.status
121,122c92,93
< Makefile: Makefile.in $(host_makefile_frag) $(target_makefile_frag)
< $(SHELL) config.status
---
> config.status: $(srcdir)/configure
> ./config.status --recheck
124c95,96
< force:
---
> $(srcdir)/configure: $(srcdir)/configure.in
> cd $(srcdir) && autoconf
Index: configure.in
===================================================================
RCS file: /cvs/src/src/utils/spu/configure.in,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 configure.in
1,4c1
< # This file is a shell script fragment that supplies the information
< # necessary to tailor a template configure script into the configure
< # script appropriate for this directory. For more information, check
< # any existing configure script.
---
> # Process this file with autoconf to produce a configure script.
6,7c3
< srctrigger=spu.c
< srcname="spu"
---
> # Copyright 2002 Free Software Foundation, Inc.
9c5
< # per-host:
---
> # This file is part of SPU.
11c7,19
< # per-target:
---
> # This program is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
> # the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful,
> # but WITHOUT ANY WARRANTY; without even the implied warranty of
> # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> # GNU General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
> # along with this program; if not, write to the Free Software
> # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
13c21,40
< # post-target:
---
> AC_INIT([spu.c])
>
> # Checks for programs.
> AC_PROG_CC
> AC_PROG_INSTALL
>
> # Checks for header files.
> # The program doesn't actually handle failure.
> #AC_HEADER_STDC
> #AC_CHECK_HEADERS([stdlib.h string.h])
>
> # Checks for typedefs, structures, and compiler characteristics.
> AC_C_CONST
>
> # Checks for library functions.
> # The program doesn't actually handle failure.
> #AC_FUNC_MALLOC
> #AC_CHECK_FUNCS([memset strtol])
>
> AC_OUTPUT([Makefile])
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2002-01-29 15:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-01-28 18:50 PATCH: autoconfiscate SPU Nathanael Nerode
2002-01-28 19:26 ` Daniel Jacobowitz
2002-01-29 7:35 ` PATCH: autoconfiscate SPU (take two) Nathanael Nerode
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox