The right way to fix a problem with config files

Patch:    ivtools-031019-johnston-081
For:      ivtools-1.0.7
Author:   [email protected]
Subject:  The right way to fix a problem with config files
Requires:

This is an intermediate patch to ivtools-1.0.7.  To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:

	patch -p0 <ThisFile

Summary of Changes:

- the cpp bundled with gcc-3.3 has a bug, and gets confused by
back-slashed commas in macro arguments (it thinks they start a new
argument, which they don't).  This introduced a problem to long stable
config files, but a workaround is here.

- this also fixes things so FreeBSD can configure on alpha architectures.

Index: config_ivtools/arch.def
diff -c config_ivtools/arch.def:1.1 config_ivtools/arch.def:1.2
*** config_ivtools/arch.def:1.1	Fri Sep 13 09:54:32 2002
--- config/arch.def	Sun Oct 19 12:13:26 2003
***************
*** 430,436 ****
   #define MacroFile InterViews/iv-stratus.cf
   #endif

! #if defined(__alpha) && !defined(__linux__)
   #undef ALPHA
   #undef alpha
   #define AlphaArchitecture
--- 430,436 ----
   #define MacroFile InterViews/iv-stratus.cf
   #endif

! #if defined(__alpha) && !defined(__linux__) && !defined(__FreeBSD__)
   #undef ALPHA
   #undef alpha
   #define AlphaArchitecture
Index: config_ivtools/rules.def
diff -c config_ivtools/rules.def:1.3 config_ivtools/rules.def:1.4
*** config_ivtools/rules.def:1.3	Fri Jul 18 12:16:36 2003
--- config/rules.def	Sun Oct 19 12:13:26 2003
***************
*** 731,737 ****
   	@echo "building $@"						@@\
   	$(RM) $@~							@@\
   	$(RM) Concat(lib,libname.so)					@@\
! 
	SharedLibraryCmdSun(ldobjs,/*-Wl\,-soname=Concat(lib\,libname.so.rev)*/) 
@@\
   	$(RM) $@							@@\
   	$(MV) $@~ $@							@@\
   	$(LN) $@ Concat(lib,libname.so)					@@\
--- 731,737 ----
   	@echo "building $@"						@@\
   	$(RM) $@~							@@\
   	$(RM) Concat(lib,libname.so)					@@\
! 
	SharedLibraryCmd(ldobjs,/*-Wl\,-soname=Concat(lib\,libname.so.rev)*/) 
@@\
   	$(RM) $@							@@\
   	$(MV) $@~ $@							@@\
   	$(LN) $@ Concat(lib,libname.so)					@@\
*** /dev/null	 Sun Oct 19 12:13:35 PDT 2003
--- patches/ivtools-031019-johnston-081
*************** patches/ivtools-031019-johnston-081
*** 0 ****
--- 1 ----
+ ivtools-031019-johnston-081


-------------------------------------------------------
This SF.net email sponsored by: Enterprise Linux Forum Conference & Expo
The Event For Linux Datacenter Solutions & Strategies in The Enterprise 
Linux in the Boardroom; in the Front Office; & in the Server Room 
http://www.enterpriselinuxforum.com