diff options
| -rw-r--r-- | ports/pango/0001-fix-static-symbols-export.diff | 28 | ||||
| -rw-r--r-- | ports/pango/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | ports/pango/portfile.cmake | 12 |
3 files changed, 38 insertions, 7 deletions
diff --git a/ports/pango/0001-fix-static-symbols-export.diff b/ports/pango/0001-fix-static-symbols-export.diff new file mode 100644 index 000000000..c09544f5d --- /dev/null +++ b/ports/pango/0001-fix-static-symbols-export.diff @@ -0,0 +1,28 @@ +From 9e7d3a6ea06e1fb661e0aa4b60c6efa9a5684d9d Mon Sep 17 00:00:00 2001 +From: Mikhail Paulyshka <me@mixaill.tk> +Date: Sat, 29 Apr 2017 21:28:12 +0300 +Subject: [PATCH] do not use dllexport for static build + +--- + config.h.win32 | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/config.h.win32 b/config.h.win32 +index 31b330f..e25b5d8 100644 +--- a/config.h.win32 ++++ b/config.h.win32 +@@ -147,7 +147,11 @@ + + /* defines how to decorate public symbols while building */ + #ifdef _MSC_VER ++#ifdef _WINDLL + #define _PANGO_EXTERN __declspec(dllexport) extern + #else ++#define _PANGO_EXTERN extern ++#endif ++#else + #define _PANGO_EXTERN __attribute__((visibility("default"))) __declspec(dllexport) extern + #endif +-- +2.11.0.windows.1 + diff --git a/ports/pango/CMakeLists.txt b/ports/pango/CMakeLists.txt index 4cbf6822e..f6145dc4c 100644 --- a/ports/pango/CMakeLists.txt +++ b/ports/pango/CMakeLists.txt @@ -25,7 +25,10 @@ find_path(CAIRO_INCLUDE_DIR cairo.h) if(CMAKE_BUILD_TYPE STREQUAL Debug) set(CAIRO_SUFFIX d) endif() -find_library(CAIRO_LIBRARY cairo${CAIRO_SUFFIX}) +find_library(CAIRO_LIBRARY + NAMES + cairo${CAIRO_SUFFIX} + cairo-static${CAIRO_SUFFIX}) find_library(CAIRO_GOBJECT_LIBRARY cairo-gobject${CAIRO_SUFFIX}) set(CAIRO_LIBRARIES ${CAIRO_LIBRARY} ${CAIRO_GOBJECT_LIBRARY}) diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index 3fa54f5a1..0f454a4e5 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -1,9 +1,3 @@ -
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
- message(STATUS "Warning: Static building not supported. Building dynamic.")
- set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
include(vcpkg_common_functions)
set(PANGO_VERSION 1.40.5)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/pango-${PANGO_VERSION})
@@ -15,12 +9,18 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+vcpkg_apply_patches(
+ SOURCE_PATH ${SOURCE_PATH}
+ PATCHES
+ ${CMAKE_CURRENT_LIST_DIR}/0001-fix-static-symbols-export.diff)
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS_DEBUG
-DPANGO_SKIP_HEADERS=ON)
+vcpkg_build_cmake()
vcpkg_install_cmake()
vcpkg_copy_pdbs()
|
