pyrox.dev
1From 7a0c8ca8872a73c6886940448ba9b3203b13268d Mon Sep 17 00:00:00 2001
2From: John Ericson <git@JohnEricson.me>
3Date: Mon, 21 Jul 2025 11:42:13 -0400
4Subject: [PATCH] libgfortran: Force regular include/lib dir
5
6---
7 libgfortran/Makefile.am | 13 +++++--------
8 1 file changed, 5 insertions(+), 8 deletions(-)
9
10diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
11index 21b35c76a06..3d38cde5b42 100644
12--- a/libgfortran/Makefile.am
13+++ b/libgfortran/Makefile.am
14@@ -42,14 +42,13 @@ extra_darwin_ldflags_libgfortran += -Wc,-nodefaultrpaths
15 extra_darwin_ldflags_libgfortran += -Wl,-rpath,@loader_path
16 endif
17
18-gfor_c_HEADERS = ISO_Fortran_binding.h
19-gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
20+include_HEADERS = ISO_Fortran_binding.h
21
22 LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \
23 $(lt_host_flags)
24
25-toolexeclib_LTLIBRARIES = libgfortran.la
26-toolexeclib_DATA = libgfortran.spec
27+lib_LTLIBRARIES = libgfortran.la
28+toolexeclib_DATA = libgfortran.spec # needs "exec" in name
29 libgfortran_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS)
30 libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
31 $(LTLDFLAGS) $(LIBQUADLIB) ../libbacktrace/libbacktrace.la \
32@@ -58,16 +57,14 @@ libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
33 $(version_arg) -Wc,-shared-libgcc
34 libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP)
35
36-cafexeclib_LTLIBRARIES = libcaf_single.la
37-cafexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
38+lib_LTLIBRARIES += libcaf_single.la
39 libcaf_single_la_SOURCES = caf/single.c
40 libcaf_single_la_LDFLAGS = -static
41 libcaf_single_la_DEPENDENCIES = caf/libcaf.h
42 libcaf_single_la_LINK = $(LINK) $(libcaf_single_la_LDFLAGS)
43
44 if IEEE_SUPPORT
45-fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude
46-nodist_finclude_HEADERS = ieee_arithmetic.mod ieee_exceptions.mod ieee_features.mod
47+nodist_include_HEADERS = ieee_arithmetic.mod ieee_exceptions.mod ieee_features.mod
48 endif
49
50 ## io.h conflicts with a system header on some platforms, so
51--
522.47.2
53