Files
f2c/f2c-20110801.patch
Petr Vanek 3d4a26544b Accepting request 630749 from home:mcalabkova:branches:devel:languages:misc
- update to version 0.23
  * new patches and libraries and updated specfile according to 
    Fedora version 20160102
- removed patches
  * removing obsolete patches f2c-integer.diff, f2c-malloccheck.diff
    f2c.diff, tmpfile-fix.patch and yyparse.patch and usefull, yet 
    inconsistent f2c-optflags.patch
- added patches
  * patches f2c-20110801.patch to use shared library libf2c.so.0.23 
    and libf2c-20110801.patch to use less memory copied from Fedora 
    repository
  * patch f2c-20180821.patch released to fix optflags parsing

OBS-URL: https://build.opensuse.org/request/show/630749
OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/f2c?expand=0&rev=7
2018-09-10 09:41:44 +00:00

69 lines
1.9 KiB
Diff

--- a/libf2c/makefile.u 2009-12-03 18:18:51.000000000 -0800
+++ b/libf2c/makefile.u 2009-12-03 18:17:43.000000000 -0800
@@ -16,12 +16,14 @@
CC = cc
SHELL = /bin/sh
CFLAGS = -O
+SHARED = libf2c.so.@SOVER@
# 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) -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,12 @@
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 $@
+
## Shared-library variant: the following rule works on Linux
## systems. Details are system-dependent. Under Linux, -fPIC
@@ -85,8 +88,8 @@
## instead of "$(CC) -shared", and when running programs linked against libf2c.so,
## arrange for $DYLD_LIBRARY_PATH to include the directory containing libf2c.so.
-libf2c.so: $(OFILES)
- $(CC) -shared -o libf2c.so $(OFILES)
+$(SHARED): $(OFILES)
+ $(CC) -shared -Wl,-soname,libf2c.so.0 -o $@ $(OFILES) -lm -lc
### If your system lacks ranlib, you don't need it; see README.
@@ -126,7 +129,7 @@
-ranlib $(LIBDIR)/libf2c.a
clean:
- rm -f libf2c.a *.o arith.h signal1.h sysdep1.h
+ rm -f libf2c.a *.o arith.h signal1.h sysdep1.h $(SHARED)
backspac.o: fio.h
close.o: fio.h
--- a/src/f2c.h 1999-09-07 19:46:24.000000000 +0200
+++ b/src/f2c.h 2011-12-14 00:53:19.503602011 +0100
@@ -7,8 +7,8 @@
#ifndef F2C_INCLUDE
#define F2C_INCLUDE
-typedef long int integer;
-typedef unsigned long int uinteger;
+typedef int integer;
+typedef unsigned int uinteger;
typedef char *address;
typedef short int shortint;
typedef float real;