diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/libsigcpp | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/libsigcpp')
| -rw-r--r-- | ports/libsigcpp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libsigcpp/dont-import-symbols.patch | 13 | ||||
| -rw-r--r-- | ports/libsigcpp/portfile.cmake | 20 |
3 files changed, 14 insertions, 21 deletions
diff --git a/ports/libsigcpp/CONTROL b/ports/libsigcpp/CONTROL index c0393066b..617328c7b 100644 --- a/ports/libsigcpp/CONTROL +++ b/ports/libsigcpp/CONTROL @@ -1,3 +1,3 @@ Source: libsigcpp
-Version: 2.10-1
+Version: 2.10-3
Description: Typesafe callback framework for C++
diff --git a/ports/libsigcpp/dont-import-symbols.patch b/ports/libsigcpp/dont-import-symbols.patch deleted file mode 100644 index b031d3baf..000000000 --- a/ports/libsigcpp/dont-import-symbols.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sigc++config.h b/sigc++config.h -index e212700..8d7366e 100644 ---- a/sigc++config.h -+++ b/sigc++config.h -@@ -72,6 +72,8 @@ - - #endif /* !SIGC_MSC */ - -+#undef SIGC_DLL -+ - #ifdef SIGC_DLL - # if defined(SIGC_BUILD) && defined(_WINDLL) - # define SIGC_API __declspec(dllexport) diff --git a/ports/libsigcpp/portfile.cmake b/ports/libsigcpp/portfile.cmake index c98a26717..707e59010 100644 --- a/ports/libsigcpp/portfile.cmake +++ b/ports/libsigcpp/portfile.cmake @@ -1,12 +1,17 @@ include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libsigc++-2.10.0)
+
vcpkg_download_distfile(ARCHIVE
URLS "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-2.10.0.tar.xz"
FILENAME "libsigc++-2.10.0.tar.xz"
- SHA512 5b96df21d6bd6ba41520c7219e77695a86aabc60b7259262c7a9f4b8475ce0e2fd8dc37bcf7c17e24e818ff28c262d682b964c83e215b51bdbe000f3f58794ae)
+ SHA512 5b96df21d6bd6ba41520c7219e77695a86aabc60b7259262c7a9f4b8475ce0e2fd8dc37bcf7c17e24e818ff28c262d682b964c83e215b51bdbe000f3f58794ae
+)
+
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+)
-vcpkg_extract_source_archive(${ARCHIVE})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
@@ -18,10 +23,11 @@ vcpkg_install_cmake() vcpkg_copy_pdbs()
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
- vcpkg_apply_patches(
- SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include
- PATCHES
- ${CMAKE_CURRENT_LIST_DIR}/dont-import-symbols.patch)
+ file(READ ${CURRENT_PACKAGES_DIR}/include/sigc++config.h SIGCPPCONFIG_H)
+ string(REPLACE "endif /* !SIGC_MSC */"
+ "endif /* !SIGC_MSC */
+#undef SIGC_DLL" SIGCPPCONFIG_H "${SIGCPPCONFIG_H}")
+ file(WRITE ${CURRENT_PACKAGES_DIR}/include/sigc++config.h "${SIGCPPCONFIG_H}")
endif()
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libsigcpp)
|