From eec7c640fe5022b19b2dd82f739dc0c2c54cdbb8 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 919d46453f..a2e6410f53 100644 --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile @@ -48,7 +48,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 9e95285af8..a83ae8865c 100644 --- a/src/pl/plpython/Makefile +++ b/src/pl/plpython/Makefile @@ -69,7 +69,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 1e7740da3f..25e65189b6 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -46,7 +46,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