From c76164ea02aa3aebeff59d7d633a6107cb753772 Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Thu, 10 Feb 2022 13:44:05 -0500 Subject: [PATCH] Use gendef instead of pexports for building windows .def files Modern msys systems lack pexports but have gendef instead, so use that. Discussion: https://postgr.es/m/3ccde7a9-e4f9-e194-30e0-0936e6ad68ba@dunslane.net Backpatch to release 9.4 to enable building with perl on older branches. Before that pexports is not used for plperl. --- src/pl/plperl/GNUmakefile | 2 +- src/pl/plpython/Makefile | 2 +- src/pl/tcl/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile index 97a94c727ef..02f015f339c 100644 --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile @@ -57,7 +57,7 @@ lib$(perlwithver).a: $(perlwithver).def dlltool --dllname $(perlwithver).dll --def $(perlwithver).def --output-lib lib$(perlwithver).a $(perlwithver).def: $(PERLDLL) - pexports $^ > $@ + gendef - $^ > $@ endif # win32 diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile index 03de9af0b3e..957b44a2519 100644 --- a/src/pl/plpython/Makefile +++ b/src/pl/plpython/Makefile @@ -74,7 +74,7 @@ libpython${pytverstr}.a: python${pytverstr}.def dlltool --dllname python${pytverstr}.dll --def python${pytverstr}.def --output-lib libpython${pytverstr}.a python${pytverstr}.def: - pexports $(PYTHONDLL) > $@ + gendef - $(PYTHONDLL) > $@ endif # win32 diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index 2ab2a2791bb..5a68ea815c1 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -61,7 +61,7 @@ lib$(tclwithver).a: $(tclwithver).def dlltool --dllname $(tclwithver).dll --def $(tclwithver).def --output-lib lib$(tclwithver).a $(tclwithver).def: $(TCLDLL) - pexports $^ > $@ + gendef - $^ > $@ endif # win32