mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 17:53:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg, libpq] separate static and shared library installations (#13491)

Browse Source 
* [vcpkg] add missing Makefile flag for install step

Signed-off-by: Andrei Lebedev <lebdron@gmail.com>

* [libpq] add custom Makefile to install only required targets

Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
This commit is contained in:
Andrei Lebedev 2020-09-24 22:29:13 +03:00 committed by GitHub
parent c6fbdb0c5d
commit 8d4fd6df85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libpq/CONTROL
View File

@ -1,6 +1,6 @@
Source: libpq Source: libpq
Version: 12.2 Version: 12.2
Port-Version: 6 Port-Version: 7
Build-Depends: libpq[bonjour] (osx) Build-Depends: libpq[bonjour] (osx)
Supports: !uwp Supports: !uwp
Homepage: https://www.postgresql.org/ Homepage: https://www.postgresql.org/

34
ports/libpq/Makefile Normal file
View File

@ -0,0 +1,34 @@
subdir = .
top_builddir = .
include src/Makefile.global
.NOTPARALLEL:
ifeq ($(LIBPQ_LIBRARY_TYPE), shared)
LIBPQ_LIB_SUFFIX = _shlib
endif
ifeq ($(LIBPQ_LIBRARY_TYPE), static)
LIBPQ_INSTALL_LIBS = install-stlib
endif
.PHONY: all
all:
$(MAKE) -C src/include MAKELEVEL=0
$(MAKE) -C src/common MAKELEVEL=0 libpgcommon$(LIBPQ_LIB_SUFFIX).a
$(MAKE) -C src/port MAKELEVEL=0 libpgport$(LIBPQ_LIB_SUFFIX).a
$(MAKE) -C src/interfaces/libpq MAKELEVEL=0 all-$(LIBPQ_LIBRARY_TYPE)-lib
$(MAKE) -C src/bin/pg_config MAKELEVEL=0
.PHONY: install-stlib
install-stlib:
$(MAKE) -C src/common MAKELEVEL=0 install -o all
rm -f '$(DESTDIR)$(libdir)/libpgcommon_shlib.a'
$(MAKE) -C src/port MAKELEVEL=0 install -o all
rm -f '$(DESTDIR)$(libdir)/libpgport_shlib.a'
.PHONY: install
install: $(LIBPQ_INSTALL_LIBS)
$(MAKE) -C src/include MAKELEVEL=0 install
$(MAKE) -C src/interfaces/libpq MAKELEVEL=0 install-lib-$(LIBPQ_LIBRARY_TYPE) install-lib-pc install -o all -o install-lib
$(MAKE) -C src/bin/pg_config MAKELEVEL=0 install

10
ports/libpq/portfile.cmake
View File

@ -252,6 +252,8 @@ if(VCPKG_TARGET_IS_WINDOWS)
message(STATUS "Cleanup libpq ${TARGET_TRIPLET}... - done") message(STATUS "Cleanup libpq ${TARGET_TRIPLET}... - done")
else() else()
file(COPY ${CMAKE_CURRENT_LIST_DIR}/Makefile DESTINATION ${SOURCE_PATH})
if("${FEATURES}" MATCHES "openssl") if("${FEATURES}" MATCHES "openssl")
list(APPEND BUILD_OPTS --with-openssl) list(APPEND BUILD_OPTS --with-openssl)
endif() endif()
@ -274,11 +276,13 @@ else()
--enable-debug --enable-debug
) )
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(ENV{LIBPQ_LIBRARY_TYPE} shared)
else()
set(ENV{LIBPQ_LIBRARY_TYPE} static)
endif()
vcpkg_install_make() vcpkg_install_make()
# instead?
# make -C src/include install
# make -C src/interfaces install
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

2
scripts/cmake/vcpkg_build_make.cmake
View File

@ -80,7 +80,7 @@ function(vcpkg_build_make)
# Set make command and install command # Set make command and install command
set(MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j ${VCPKG_CONCURRENCY} -f Makefile ${_bc_BUILD_TARGET}) set(MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j ${VCPKG_CONCURRENCY} -f Makefile ${_bc_BUILD_TARGET})
set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j 1 -f Makefile ${_bc_BUILD_TARGET}) set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j 1 -f Makefile ${_bc_BUILD_TARGET})
set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} install DESTDIR=${CURRENT_PACKAGES_DIR}) set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} -f Makefile install DESTDIR=${CURRENT_PACKAGES_DIR})
endif() endif()
# Since includes are buildtype independent those are setup by vcpkg_configure_make # Since includes are buildtype independent those are setup by vcpkg_configure_make