zstd: install *.pc file for mingw

see: https://github.com/facebook/zstd/pull/1203
closes #2164
This commit is contained in:
Tony Theodore 2018-07-02 08:12:24 +10:00
parent e65f683f84
commit 38d301e913
2 changed files with 34 additions and 10 deletions

33
src/zstd-1-fixes.patch Normal file
View File

@ -0,0 +1,33 @@
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Mon, 2 Jul 2018 08:03:47 +1000
Subject: [PATCH 1/1] install .pc file on mingw
see: https://github.com/facebook/zstd/pull/1203
diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
index 1111111..2222222 100644
--- a/build/cmake/lib/CMakeLists.txt
+++ b/build/cmake/lib/CMakeLists.txt
@@ -154,7 +154,7 @@ IF (ZSTD_BUILD_STATIC)
OUTPUT_NAME ${STATIC_LIBRARY_BASE_NAME})
ENDIF (ZSTD_BUILD_STATIC)
-IF (UNIX)
+IF (UNIX OR MINGW)
# pkg-config
SET(PREFIX "${CMAKE_INSTALL_PREFIX}")
SET(LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
@@ -167,7 +167,7 @@ IF (UNIX)
COMMENT "Creating pkg-config file")
INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/libzstd.pc" DESTINATION "${LIBDIR}/pkgconfig")
-ENDIF (UNIX)
+ENDIF (UNIX OR MINGW)
# install target
INSTALL(FILES

View File

@ -18,18 +18,9 @@ define $(PKG)_BUILD
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
$(MAKE) -C '$(BUILD_DIR)' -j 1 install
# create pkg-config files
$(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
(echo 'Name: $(PKG)'; \
echo 'Version: $($(PKG)_VERSION)'; \
echo 'Description: $($(PKG)_DESCR)'; \
echo 'Libs: -L$(PREFIX)/$(TARGET)/lib -l$(PKG)'; \
echo 'Cflags: -I$(PREFIX)/$(TARGET)/include';) \
> '$(PREFIX)/$(TARGET)/lib/pkgconfig/$(PKG).pc'
# compile test
'$(TARGET)-gcc' \
-W -Wall -Werror -ansi -pedantic \
'$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
`'$(TARGET)-pkg-config' $(PKG) --cflags --libs`
`'$(TARGET)-pkg-config' lib$(PKG) --cflags --libs`
endef