mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-23 02:07:51 +08:00
2f56fdad4b
* [libpq] Install msys2 autoconf-archive * Install msys2 zic tool * Fix zstd patching * Always build as if cross compiling * Enable feature client for non-windows * Cleanup (WIP) * Cleanup (WIP) * Update portfile.cmake * WIP * WIP * WIP * WIP * [libxslt] Fix pc files * WIP * WIP: Test libpq[all] * WIP * Update to 15.3 * Move patches * Revert "WIP: Test libpq[all]" * Fix install * Skip import libs for plugins * Full CI
57 lines
1.6 KiB
Diff
57 lines
1.6 KiB
Diff
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
|
|
index 551023c..16255d7 100644
|
|
--- a/src/Makefile.shlib
|
|
+++ b/src/Makefile.shlib
|
|
@@ -260,10 +260,14 @@ endif
|
|
|
|
.PHONY: all-lib all-static-lib all-shared-lib
|
|
|
|
+ifndef LIBPQ_LIBRARY_TYPE
|
|
all-lib: all-shared-lib
|
|
ifdef soname
|
|
# no static library when building a dynamically loadable module
|
|
all-lib: all-static-lib
|
|
+endif
|
|
+else
|
|
+all-lib: all-$(LIBPQ_LIBRARY_TYPE)-lib
|
|
all-lib: lib$(NAME).pc
|
|
endif
|
|
|
|
@@ -417,9 +421,13 @@ endif # PORTNAME == cygwin || PORTNAME == win32
|
|
##
|
|
|
|
.PHONY: install-lib install-lib-static install-lib-shared installdirs-lib
|
|
+ifndef LIBPQ_LIBRARY_TYPE
|
|
install-lib: install-lib-shared
|
|
ifdef soname
|
|
install-lib: install-lib-static
|
|
+endif
|
|
+else
|
|
+install-lib: install-lib-$(LIBPQ_LIBRARY_TYPE)
|
|
install-lib: install-lib-pc
|
|
endif
|
|
|
|
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
|
|
index 8abdb09..185461e 100644
|
|
--- a/src/interfaces/libpq/Makefile
|
|
+++ b/src/interfaces/libpq/Makefile
|
|
@@ -115,6 +115,7 @@ backend_src = $(top_srcdir)/src/backend
|
|
# Also skip the test on platforms where libpq infrastructure may be provided
|
|
# by statically-linked libraries, as we can't expect them to honor this
|
|
# coding rule.
|
|
+ifeq ($(LIBPQ_LIBRARY_TYPE), shared)
|
|
libpq-refs-stamp: $(shlib)
|
|
ifneq ($(enable_coverage), yes)
|
|
ifeq (,$(filter aix solaris,$(PORTNAME)))
|
|
@@ -124,6 +125,10 @@ ifeq (,$(filter aix solaris,$(PORTNAME)))
|
|
endif
|
|
endif
|
|
touch $@
|
|
+else
|
|
+.PHONY: libpq-refs-stamp
|
|
+libpq-refs-stamp:
|
|
+endif
|
|
|
|
# Make dependencies on pg_config_paths.h visible in all builds.
|
|
fe-connect.o: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h
|