diff options
| author |   Eli Schwartz <eschwartz93@gmail.com> | 2024-03-10 18:09:20 -0400 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-03-11 14:22:44 +0000 |
| commit | 288ba058cbf295db82b4f62a600ef36bec37c008 (patch) | |
| tree | 5616a6a9ccb9bbb5cd9d7659a6ace4ef96211139 /dev-libs/libf2c/files | |
| parent | dev-lang/f2c: mark as LTO-unsafe, strict-aliasing unsafe (diff) | |
| download | gentoo-288ba058cbf295db82b4f62a600ef36bec37c008.tar.gz gentoo-288ba058cbf295db82b4f62a600ef36bec37c008.tar.bz2 gentoo-288ba058cbf295db82b4f62a600ef36bec37c008.zip | |
dev-libs/libf2c: add 20240130
Fix up a couple old patches to apply, and drop one that doesn't. There's
been a bit of development since 2009, after all.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-libs/libf2c/files')
| -rw-r--r-- | dev-libs/libf2c/files/20240130-link-shared-libf2c-correctly.patch | 13 | ||||
| -rw-r--r-- | dev-libs/libf2c/files/libf2c-20240130-fix-buildsystem.patch | 66 |
2 files changed, 79 insertions, 0 deletions
diff --git a/dev-libs/libf2c/files/20240130-link-shared-libf2c-correctly.patch b/dev-libs/libf2c/files/20240130-link-shared-libf2c-correctly.patch new file mode 100644 index 000000000000..9b58139b91a9 --- /dev/null +++ b/dev-libs/libf2c/files/20240130-link-shared-libf2c-correctly.patch @@ -0,0 +1,13 @@ +diff --git a/makefile.u b/makefile.u +index a1cb700..6d5fb78 100644 +--- a/makefile.u ++++ b/makefile.u +@@ -88,7 +88,7 @@ libf2c.a: $(OFILES) + ## arrange for $DYLD_LIBRARY_PATH to include the directory containing libf2c.so. + + libf2c.so: $(OFILES) +- $(CC) $(LDFLAGS) -shared -o libf2c.so $(OFILES) ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,libf2c.so.2 -o libf2c.so.2 -lm $(OFILES) + + ### If your system lacks ranlib, you don't need it; see README. + diff --git a/dev-libs/libf2c/files/libf2c-20240130-fix-buildsystem.patch b/dev-libs/libf2c/files/libf2c-20240130-fix-buildsystem.patch new file mode 100644 index 000000000000..1398c843507b --- /dev/null +++ b/dev-libs/libf2c/files/libf2c-20240130-fix-buildsystem.patch @@ -0,0 +1,66 @@ +From c398f9cc0504c33de034e68a8d402a5ad301c19f Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sun, 10 Mar 2024 17:54:11 -0400 +Subject: [PATCH] import libf2c-20130927-fix-buildsystem.patch and fix up + +--- + makefile.u | 18 +++++++----------- + 1 file changed, 7 insertions(+), 11 deletions(-) + +diff --git a/makefile.u b/makefile.u +index a271e5c..e8c8485 100644 +--- a/makefile.u ++++ b/makefile.u +@@ -12,16 +12,12 @@ + # -fPIC + # to the CFLAGS = line below. + +-.SUFFIXES: .c .o +-CC = cc + SHELL = /bin/sh +-CFLAGS = -O + + # compile, then strip unnecessary symbols + .c.o: +- $(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c +- ld -r -x -o $*.xxx $*.o +- mv $*.xxx $*.o ++ $(CC) -c $(CPPFLAGS) $(CFLAGS) -DSkip_f2c_Undefs $< -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 +@@ -72,8 +68,8 @@ OFILES = $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \ + all: f2c.h signal1.h sysdep1.h libf2c.a + + libf2c.a: $(OFILES) +- ar r libf2c.a $? +- -ranlib libf2c.a ++ $(AR) r libf2c.a $? ++ $(RANLIB) libf2c.a + + ## Shared-library variant: the following rule works on Linux + ## systems. Details are system-dependent. Under Linux, -fPIC +@@ -126,7 +122,7 @@ fio.h: fio.h0 sysdep1.h + + install: libf2c.a + cp libf2c.a $(LIBDIR) +- -ranlib $(LIBDIR)/libf2c.a ++ $(RANLIB) $(LIBDIR)/libf2c.a + + clean: + rm -f libf2c.a *.o arith.h signal1.h sysdep1.h +@@ -186,8 +182,8 @@ xwsne.o: lio.h + xwsne.o: fmt.h + + arith.h: arithchk.c +- $(CC) $(CFLAGS) -DNO_FPINIT arithchk.c -lm ||\ +- $(CC) -DNO_LONG_LONG $(CFLAGS) -DNO_FPINIT arithchk.c -lm ++ $(CC) $(CPPFLAGS) $(CFLAGS) -DNO_FPINIT arithchk.c -lm ||\ ++ $(CC) -DNO_LONG_LONG $(CPPFLAGS) $(CFLAGS) -DNO_FPINIT arithchk.c -lm + ./a.out >arith.h + rm -f a.out arithchk.o + +-- +2.43.2 + |