diff options
Diffstat (limited to 'ports/utf8proc')
| -rw-r--r-- | ports/utf8proc/CONTROL | 2 | ||||
| -rw-r--r-- | ports/utf8proc/fix-buildsystem.patch | 48 | ||||
| -rw-r--r-- | ports/utf8proc/portfile.cmake | 7 |
3 files changed, 4 insertions, 53 deletions
diff --git a/ports/utf8proc/CONTROL b/ports/utf8proc/CONTROL index 4afe2da7c..56a348e36 100644 --- a/ports/utf8proc/CONTROL +++ b/ports/utf8proc/CONTROL @@ -1,4 +1,4 @@ Source: utf8proc -Version: 2.4.0 +Version: 2.4.0-1 Homepage: https://github.com/JuliaLang/utf8proc Description: Clean C library for processing UTF-8 Unicode data. diff --git a/ports/utf8proc/fix-buildsystem.patch b/ports/utf8proc/fix-buildsystem.patch deleted file mode 100644 index 17af16c9b..000000000 --- a/ports/utf8proc/fix-buildsystem.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index be676ba..7a2b6d8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,9 +13,9 @@ set(SO_MAJOR 2) - set(SO_MINOR 1) - set(SO_PATCH 0) - --add_definitions ( -- -DUTF8PROC_EXPORTS --) -+if(BUILD_SHARED_LIBS) -+ add_definitions(-DUTF8PROC_EXPORTS -DUTF8PROC_SHARED) -+endif() - - if (NOT MSVC) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -std=c99 -pedantic -Wall") -@@ -31,3 +31,10 @@ set_target_properties (utf8proc PROPERTIES - VERSION "${SO_MAJOR}.${SO_MINOR}.${SO_PATCH}" - SOVERSION ${SO_MAJOR} - ) -+ -+install(TARGETS utf8proc -+ RUNTIME DESTINATION bin -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib) -+ -+install(FILES utf8proc.h DESTINATION include) -diff --git a/utf8proc.h b/utf8proc.h -index edf46d4..7b3f11a 100644 ---- a/utf8proc.h -+++ b/utf8proc.h -@@ -120,13 +120,13 @@ typedef bool utf8proc_bool; - #endif - #include <limits.h> - --#ifdef _WIN32 -+#if defined _WIN32 && defined UTF8PROC_SHARED - # ifdef UTF8PROC_EXPORTS - # define UTF8PROC_DLLEXPORT __declspec(dllexport) - # else - # define UTF8PROC_DLLEXPORT __declspec(dllimport) - # endif --#elif __GNUC__ >= 4 -+#elif __GNUC__ >= 4 && defined UTF8PROC_SHARED - # define UTF8PROC_DLLEXPORT __attribute__ ((visibility("default"))) - #else - # define UTF8PROC_DLLEXPORT diff --git a/ports/utf8proc/portfile.cmake b/ports/utf8proc/portfile.cmake index 113f4d6d8..b4dd9f50c 100644 --- a/ports/utf8proc/portfile.cmake +++ b/ports/utf8proc/portfile.cmake @@ -1,12 +1,11 @@ include(vcpkg_common_functions) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JuliaLang/utf8proc REF v2.4.0 - SHA512 2bbd056b488cd30faca26618389d8af84edc39ade9b705e147b676bf39eee65b40239d01c32c46dfc2a289d79e869ed1bb3c347365603dcaab2f69e34427441a) - -vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch) + SHA512 2bbd056b488cd30faca26618389d8af84edc39ade9b705e147b676bf39eee65b40239d01c32c46dfc2a289d79e869ed1bb3c347365603dcaab2f69e34427441a +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} |
