diff options
Diffstat (limited to '0001-Use-.dll.a-as-extension-for-import-libraries.patch')
-rw-r--r-- | 0001-Use-.dll.a-as-extension-for-import-libraries.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/0001-Use-.dll.a-as-extension-for-import-libraries.patch b/0001-Use-.dll.a-as-extension-for-import-libraries.patch new file mode 100644 index 000000000000..cf6f080048b2 --- /dev/null +++ b/0001-Use-.dll.a-as-extension-for-import-libraries.patch @@ -0,0 +1,72 @@ +From f2d760f71d3201219cc342913ecc535f9776946d Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Fri, 27 Jul 2018 12:50:17 +0200 +Subject: [PATCH] Use *.dll.a as extension for import libraries + +--- + src/Makefile.shlib | 2 +- + src/backend/Makefile | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/Makefile.shlib b/src/Makefile.shlib +index d546ed1f31..b2c2bef2d7 100644 +--- a/src/Makefile.shlib ++++ b/src/Makefile.shlib +@@ -85,7 +85,7 @@ else + # Naming convention for dynamically loadable modules + shlib = $(NAME)$(DLSUFFIX) + endif +-stlib = lib$(NAME).a ++stlib = lib$(NAME).dll.a + + ifndef soname + # additional flags for backend modules +diff --git a/src/backend/Makefile b/src/backend/Makefile +index 2640834d5f..51f127f0c9 100644 +--- a/src/backend/Makefile ++++ b/src/backend/Makefile +@@ -80,11 +80,11 @@ ifeq ($(PORTNAME), win32) + LIBS += -lsecur32 + + postgres: $(OBJS) $(WIN32RES) +- $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) -Wl,--stack=$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols -Wl,--out-implib=libpostgres.a $(call expand_subsys,$(OBJS)) $(WIN32RES) $(LIBS) -o $@$(X) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) -Wl,--stack=$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols -Wl,--out-implib=libpostgres.dll.a $(call expand_subsys,$(OBJS)) $(WIN32RES) $(LIBS) -o $@$(X) + +-# libpostgres.a is actually built in the preceding rule, but we need this to ++# libpostgres.dll.a is actually built in the preceding rule, but we need this to + # ensure it's newer than postgres; see notes in src/backend/parser/Makefile +-libpostgres.a: postgres ++libpostgres.dll.a: postgres + touch $@ + + endif # win32 +@@ -241,7 +241,7 @@ endif + endif + ifeq ($(PORTNAME), win32) + ifeq ($(MAKE_DLL), true) +- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' ++ $(INSTALL_DATA) libpostgres.dll.a '$(DESTDIR)$(libdir)/libpostgres.dll.a' + endif + endif + $(MAKE) -C catalog install-data +@@ -299,7 +299,7 @@ endif + endif + ifeq ($(PORTNAME), win32) + ifeq ($(MAKE_DLL), true) +- rm -f '$(DESTDIR)$(libdir)/libpostgres.a' ++ rm -f '$(DESTDIR)$(libdir)/libpostgres.dll.a' + endif + endif + $(MAKE) -C catalog uninstall-data +@@ -324,7 +324,7 @@ ifeq ($(PORTNAME), cygwin) + rm -f postgres.dll libpostgres.a + endif + ifeq ($(PORTNAME), win32) +- rm -f postgres.dll libpostgres.a $(WIN32RES) ++ rm -f postgres.dll libpostgres.dll.a $(WIN32RES) + endif + + distclean: clean +-- +2.18.0 + |