move Fortran library dependencies from cpgplot.pc to pgplot.pc

The Fortran library dependencies were erroneously put in the Libs entry in cpgplot.pc rather than pgplot.pc. This didn't affect the internal tests. However, the result was that -lgfortran was placed before -lpgplot (for example), and on systems which perform single pass symbol lookup during linking (e.g. most recent Linux boxes), the symbols in gfortran which were required by pgplot were never resolved.
djerius · Jun 15, 2022 · 5d43207 · 5d43207
1 parent ae84274
commit 5d43207
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,11 @@
+5.2.2-8
+
+  [BUG FIX]
+
+    * pkg-config files specified out-of-order Fortran libraries which
+      cause links to fail on systems which perform single pass symbol
+      resolution.
+
 5.2.2-7
 
   [BUILD FIXES]

diff --git a/cpgplot.pc.in b/cpgplot.pc.in
@@ -8,5 +8,5 @@ Name: PGplot
 Description: C 2D Graphics library
 Version: ${version}
 Requires: pgplot @PKG_CONFIG_REQUIRES@
-Libs: -L${libdir} -lcpgplot @FLIBS@
+Libs: -L${libdir} -lcpgplot
 Cflags: -I${includedir}
diff --git a/pgplot.pc.in b/pgplot.pc.in
@@ -8,5 +8,5 @@ Name: PGplot
 Description: Fortran 2D Graphics library
 Version: ${version}
 Requires: @PKG_CONFIG_REQUIRES@
-Libs: -L${libdir} -lpgplot @PKG_CONFIG_LIBS@
+Libs: -L${libdir} -lpgplot @FLIBS@ @PKG_CONFIG_LIBS@
 Cflags: -I${includedir}