[packages/f2c.git] / f2c-20031027.patch

--- f2c-19991109/libf2c/f2c.h0.tim	Wed Jun 19 07:04:28 1996
+++ f2c-19991109/libf2c/f2c.h0	Wed Jul 28 12:27:07 1999
@@ -7,6 +7,26 @@
 #ifndef F2C_INCLUDE
 #define F2C_INCLUDE
 
+#ifdef __alpha__
+
+typedef int integer;
+typedef unsigned int uinteger;
+typedef char *address;
+typedef short int shortint;
+typedef float real;
+typedef double doublereal;
+typedef struct { real r, i; } complex;
+typedef struct { doublereal r, i; } doublecomplex;
+typedef int logical;
+typedef short int shortlogical;
+typedef char logical1;
+typedef char integer1;
+
+
+
+#else
+
+
 typedef long int integer;
 typedef unsigned long int uinteger;
 typedef char *address;
@@ -26,6 +46,8 @@
 #define qbit_set(a,b)	((a) |  ((ulongint)1 << (b)))
 #endif
 
+#endif /* __alpha__ */
+
 #define TRUE_ (1)
 #define FALSE_ (0)
 
@@ -42,9 +64,21 @@
 typedef short ftnlen;
 typedef short ftnint;
 #else
+
+#ifdef __alpha__
+
+typedef int flag;
+typedef int ftnlen;
+typedef int ftnint;
+
+#else
+
 typedef long int flag;
 typedef long int ftnlen;
 typedef long int ftnint;
+
+#endif /* __alpha__ */
+
 #endif
 
 /*external read, write*/
--- f2c-19991109/libf2c/makefile.u.tim	Mon May 17 15:40:48 1999
+++ f2c-19991109/libf2c/makefile.u	Wed Jul 28 12:30:27 1999
@@ -13,15 +13,17 @@
 # to the CFLAGS = line below.
 
 .SUFFIXES: .c .o
-CC = cc
+CC = gcc
 SHELL = /bin/sh
-CFLAGS = -O
+CFLAGS = $(RPM_OPT_FLAGS) -DNON_UNIX_STDIO
+SHARED = libf2c.so.0.22
 
 # compile, then strip unnecessary symbols
 .c.o:
 	$(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c
-	ld -r -x -o $*.xxx $*.o
-	mv $*.xxx $*.o
+%.o : %.c \
+	$(CC) -c $(CFLAGS) $(CPPFLAGS) -f -o $@ $<
+
 ## Under Solaris (and other systems that do not understand ld -x),
 ## omit -x in the ld line above.
 ## If your system does not have the ld command, comment out
@@ -69,11 +71,21 @@
 OFILES = $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \
 	$(HALF) $(CMP) $(EFL) $(CHAR) $(I77) $(TIME)
 
-all: f2c.h signal1.h sysdep1.h libf2c.a
+all: f2c.h signal1.h sysdep1.h libf2c.a $(SHARED)
 
 libf2c.a: $(OFILES)
-	ar r libf2c.a $?
-	-ranlib libf2c.a
+	ar r $@ $? 
+	-ranlib $@
+
+
+SHAREDOBJ = $(patsubst %.o,%.o,$(MISC) $(POW) $(CX) $(DCX) \
+	$(REAL) $(DBL) $(INT) $(HALF) $(CMP) $(EFL) $(CHAR) $(I77) $(TIME))
+
+$(SHARED): $(SHAREDOBJ)
+	$(CC) -shared -Wl,-soname,libf2c.so.0 -o $@ *.o -lm -lc
+
+
+
 
 ## Shared-library variant: the following rule works on Linux
 ## systems.  Details are system-dependent.  Under Linux, -fPIC
@@ -122,8 +134,8 @@
 	-ranlib $(LIBDIR)/libf2c.a
 
 clean:
-	rm -f libf2c.a *.o arith.h signal1.h sysdep1.h
-
+	rm -f libf2c.a *.o $(SHARED) arith.h signal1.h sysdep1.h
+	
 backspac.o:	fio.h
 close.o:	fio.h
 dfe.o:		fio.h
--- f2c-19991109/src/f2c.1t.tim	Tue Sep  8 10:16:48 1998
+++ f2c-19991109/src/f2c.1t	Wed Jul 28 12:27:07 1999
@@ -353,11 +353,8 @@
 .F /usr/include/f2c.h
 header file
 .TP
-.F /usr/lib/libF77.a
-intrinsic function library
-.TP
-.F /usr/lib/libI77.a
-Fortran I/O library
+.F /usr/lib/libf2c.a
+f2c function library
 .TP
 .F /lib/libc.a
 C library, see section 3
--- f2c-19991109/src/f2c.h.tim	Wed Jun 19 07:04:27 1996
+++ f2c-19991109/src/f2c.h	Wed Jul 28 12:27:07 1999
@@ -7,6 +7,28 @@
 #ifndef F2C_INCLUDE
 #define F2C_INCLUDE
 
+#ifdef __alpha__
+
+typedef int integer;
+typedef unsigned int uinteger;
+typedef char *address;
+typedef short int shortint;
+typedef float real;
+typedef double doublereal;
+typedef struct { real r, i; } complex;
+typedef struct { doublereal r, i; } doublecomplex;
+typedef int logical;
+typedef short int shortlogical;
+typedef char logical1;
+typedef char integer1;
+
+
+
+#else
+
+
+
+
 typedef long int integer;
 typedef unsigned long int uinteger;
 typedef char *address;
@@ -26,6 +48,8 @@
 #define qbit_set(a,b)	((a) |  ((ulongint)1 << (b)))
 #endif
 
+#endif /* __alpha__ */
+
 #define TRUE_ (1)
 #define FALSE_ (0)
 
@@ -41,10 +65,23 @@
 typedef short flag;
 typedef short ftnlen;
 typedef short ftnint;
+
 #else
+
+#ifdef __alpha__
+
+typedef int flag;
+typedef int ftnlen;
+typedef int ftnint;
+
+#else
+
 typedef long int flag;
 typedef long int ftnlen;
 typedef long int ftnint;
+
+#endif /* __alpha__ */
+
 #endif
 
 /*external read, write*/
--- f2c-19991109/src/makefile.u.tim	Wed Feb 25 08:18:04 1998
+++ f2c-19991109/src/makefile.u	Wed Jul 28 12:27:07 1999
@@ -1,8 +1,8 @@
 #	Makefile for f2c, a Fortran 77 to C converter
 
 .SUFFIXES: .c .o
-CC = cc
-CFLAGS = -O
+CC = gcc
+CFLAGS = $(RPM_OPT_FLAGS)
 SHELL = /bin/sh
 YACC = yacc
 YFLAGS =
--- f2c-19991109/f2c.h.tim	Wed Jul 28 11:01:39 1999
+++ f2c-19991109/f2c.h	Wed Jul 28 12:27:07 1999
@@ -7,6 +7,25 @@
 #ifndef F2C_INCLUDE
 #define F2C_INCLUDE
 
+#ifdef __alpha__
+
+typedef int integer;
+typedef unsigned int uinteger;
+typedef char *address;
+typedef short int shortint;
+typedef float real;
+typedef double doublereal;
+typedef struct { real r, i; } complex;
+typedef struct { doublereal r, i; } doublecomplex;
+typedef int logical;
+typedef short int shortlogical;
+typedef char logical1;
+typedef char integer1;
+
+
+
+#else
+
 typedef long int integer;
 typedef unsigned long int uinteger;
 typedef char *address;
@@ -26,6 +45,8 @@
 #define qbit_set(a,b)	((a) |  ((ulongint)1 << (b)))
 #endif
 
+#endif /* __alpha__ */
+
 #define TRUE_ (1)
 #define FALSE_ (0)
 
@@ -42,9 +63,21 @@
 typedef short ftnlen;
 typedef short ftnint;
 #else
+
+#ifdef __alpha__
+
+typedef int flag;
+typedef int ftnlen;
+typedef int ftnint;
+
+#else
+
 typedef long int flag;
 typedef long int ftnlen;
 typedef long int ftnint;
+
+#endif /* __alpha__ */
+
 #endif
 
 /*external read, write*/
Commit	Line	Data
97471d16	1	--- f2c-19991109/libf2c/f2c.h0.tim Wed Jun 19 07:04:28 1996
	2	+++ f2c-19991109/libf2c/f2c.h0 Wed Jul 28 12:27:07 1999
	3	@@ -7,6 +7,26 @@
	4	#ifndef F2C_INCLUDE
	5	#define F2C_INCLUDE
	6
	7	+#ifdef __alpha__
	8	+
	9	+typedef int integer;
	10	+typedef unsigned int uinteger;
	11	+typedef char *address;
	12	+typedef short int shortint;
	13	+typedef float real;
	14	+typedef double doublereal;
	15	+typedef struct { real r, i; } complex;
	16	+typedef struct { doublereal r, i; } doublecomplex;
	17	+typedef int logical;
	18	+typedef short int shortlogical;
	19	+typedef char logical1;
	20	+typedef char integer1;
	21	+
	22	+
	23	+
	24	+#else
	25	+
	26	+
	27	typedef long int integer;
	28	typedef unsigned long int uinteger;
	29	typedef char *address;
	30	@@ -26,6 +46,8 @@
	31	#define qbit_set(a,b) ((a) \| ((ulongint)1 << (b)))
	32	#endif
	33
	34	+#endif /* __alpha__ */
	35	+
	36	#define TRUE_ (1)
	37	#define FALSE_ (0)
	38
	39	@@ -42,9 +64,21 @@
	40	typedef short ftnlen;
	41	typedef short ftnint;
	42	#else
	43	+
	44	+#ifdef __alpha__
	45	+
	46	+typedef int flag;
	47	+typedef int ftnlen;
	48	+typedef int ftnint;
	49	+
	50	+#else
	51	+
	52	typedef long int flag;
	53	typedef long int ftnlen;
	54	typedef long int ftnint;
	55	+
	56	+#endif /* __alpha__ */
	57	+
	58	#endif
	59
	60	/external read, write/
	61	--- f2c-19991109/libf2c/makefile.u.tim Mon May 17 15:40:48 1999
	62	+++ f2c-19991109/libf2c/makefile.u Wed Jul 28 12:30:27 1999
	63	@@ -13,15 +13,17 @@
	64	# to the CFLAGS = line below.
65
66	.SUFFIXES: .c .o
67	-CC = cc
68	+CC = gcc
69	SHELL = /bin/sh
70	-CFLAGS = -O
71	+CFLAGS = $(RPM_OPT_FLAGS) -DNON_UNIX_STDIO
72	+SHARED = libf2c.so.0.22
73
74	# compile, then strip unnecessary symbols
75	.c.o:
76	$(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c
77	- ld -r -x -o $.xxx $.o
78	- mv $.xxx $.o
79	+%.o : %.c \
80	+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -f -o $@ $<
81	+
82	## Under Solaris (and other systems that do not understand ld -x),
83	## omit -x in the ld line above.
84	## If your system does not have the ld command, comment out
85	@@ -69,11 +71,21 @@
86	OFILES = $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \
87	$(HALF) $(CMP) $(EFL) $(CHAR) $(I77) $(TIME)
88
89	-all: f2c.h signal1.h sysdep1.h libf2c.a
90	+all: f2c.h signal1.h sysdep1.h libf2c.a $(SHARED)
91
92	libf2c.a: $(OFILES)
93	- ar r libf2c.a $?
94	- -ranlib libf2c.a
95	+ ar r $@ $?
96	+ -ranlib $@
97	+
98	+
99	+SHAREDOBJ = $(patsubst %.o,%.o,$(MISC) $(POW) $(CX) $(DCX) \
100	+ $(REAL) $(DBL) $(INT) $(HALF) $(CMP) $(EFL) $(CHAR) $(I77) $(TIME))
101	+
102	+$(SHARED): $(SHAREDOBJ)
103	+ $(CC) -shared -Wl,-soname,libf2c.so.0 -o $@ *.o -lm -lc
104	+
105	+
106	+
107
108	## Shared-library variant: the following rule works on Linux
109	## systems. Details are system-dependent. Under Linux, -fPIC
110	@@ -122,8 +134,8 @@
111	-ranlib $(LIBDIR)/libf2c.a
112
113	clean:
114	- rm -f libf2c.a *.o arith.h signal1.h sysdep1.h
115	-
116	+ rm -f libf2c.a *.o $(SHARED) arith.h signal1.h sysdep1.h
117	+
118	backspac.o: fio.h
119	close.o: fio.h
120	dfe.o: fio.h
121	--- f2c-19991109/src/f2c.1t.tim Tue Sep 8 10:16:48 1998
122	+++ f2c-19991109/src/f2c.1t Wed Jul 28 12:27:07 1999
123	@@ -353,11 +353,8 @@
124	.F /usr/include/f2c.h
125	header file
126	.TP
127	-.F /usr/lib/libF77.a
128	-intrinsic function library
129	-.TP
130	-.F /usr/lib/libI77.a
131	-Fortran I/O library
132	+.F /usr/lib/libf2c.a
133	+f2c function library
134	.TP
135	.F /lib/libc.a
136	C library, see section 3
137	--- f2c-19991109/src/f2c.h.tim Wed Jun 19 07:04:27 1996
138	+++ f2c-19991109/src/f2c.h Wed Jul 28 12:27:07 1999
139	@@ -7,6 +7,28 @@
140	#ifndef F2C_INCLUDE
141	#define F2C_INCLUDE
142
143	+#ifdef __alpha__
144	+
145	+typedef int integer;
146	+typedef unsigned int uinteger;
147	+typedef char *address;
148	+typedef short int shortint;
149	+typedef float real;
150	+typedef double doublereal;
151	+typedef struct { real r, i; } complex;
152	+typedef struct { doublereal r, i; } doublecomplex;
153	+typedef int logical;
154	+typedef short int shortlogical;
155	+typedef char logical1;
156	+typedef char integer1;
157	+
158	+
159	+
160	+#else
161	+
162	+
163	+
164	+
165	typedef long int integer;
166	typedef unsigned long int uinteger;
167	typedef char *address;
168	@@ -26,6 +48,8 @@
169	#define qbit_set(a,b) ((a) \| ((ulongint)1 << (b)))
170	#endif
171
172	+#endif /* __alpha__ */
173	+
174	#define TRUE_ (1)
175	#define FALSE_ (0)
176
177	@@ -41,10 +65,23 @@
178	typedef short flag;
179	typedef short ftnlen;
180	typedef short ftnint;
181	+
182	#else
183	+
184	+#ifdef __alpha__
185	+
186	+typedef int flag;
187	+typedef int ftnlen;
188	+typedef int ftnint;
189	+
190	+#else
191	+
192	typedef long int flag;
193	typedef long int ftnlen;
194	typedef long int ftnint;
195	+
196	+#endif /* __alpha__ */
197	+
198	#endif
199
200	/external read, write/
201	--- f2c-19991109/src/makefile.u.tim Wed Feb 25 08:18:04 1998
202	+++ f2c-19991109/src/makefile.u Wed Jul 28 12:27:07 1999
203	@@ -1,8 +1,8 @@
204	# Makefile for f2c, a Fortran 77 to C converter
205
206	.SUFFIXES: .c .o
207	-CC = cc
208	-CFLAGS = -O
209	+CC = gcc
210	+CFLAGS = $(RPM_OPT_FLAGS)
211	SHELL = /bin/sh
212	YACC = yacc
213	YFLAGS =
214	--- f2c-19991109/f2c.h.tim Wed Jul 28 11:01:39 1999
215	+++ f2c-19991109/f2c.h Wed Jul 28 12:27:07 1999
216	@@ -7,6 +7,25 @@
217	#ifndef F2C_INCLUDE
218	#define F2C_INCLUDE
219
220	+#ifdef __alpha__
221	+
222	+typedef int integer;
223	+typedef unsigned int uinteger;
224	+typedef char *address;
225	+typedef short int shortint;
226	+typedef float real;
227	+typedef double doublereal;
228	+typedef struct { real r, i; } complex;
229	+typedef struct { doublereal r, i; } doublecomplex;
230	+typedef int logical;
231	+typedef short int shortlogical;
232	+typedef char logical1;
233	+typedef char integer1;
234	+
235	+
236	+
237	+#else
238	+
239	typedef long int integer;
240	typedef unsigned long int uinteger;
241	typedef char *address;
242	@@ -26,6 +45,8 @@
243	#define qbit_set(a,b) ((a) \| ((ulongint)1 << (b)))
244	#endif
245
246	+#endif /* __alpha__ */
247	+
248	#define TRUE_ (1)
249	#define FALSE_ (0)
250
251	@@ -42,9 +63,21 @@
252	typedef short ftnlen;
253	typedef short ftnint;
254	#else
255	+
256	+#ifdef __alpha__
257	+
258	+typedef int flag;
259	+typedef int ftnlen;
260	+typedef int ftnint;
261	+
262	+#else
263	+
264	typedef long int flag;
265	typedef long int ftnlen;
266	typedef long int ftnint;
267	+
268	+#endif /* __alpha__ */
269	+
270	#endif
271
272	/external read, write/