diff options
| author | Tetsuya Hayashi <tetsu.h@gmail.com> | 2021-02-21 14:19:24 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-20 21:19:24 -0800 |
| commit | 82167226dd336de19009f9a6acccc83ebd045db5 (patch) | |
| tree | a2851de766340a99001f92634f9130d0fb0a2d2c | |
| parent | 5c1731cf74fbd61bdce95c1daa8440b05c0df353 (diff) | |
| download | vcpkg-82167226dd336de19009f9a6acccc83ebd045db5.tar.gz vcpkg-82167226dd336de19009f9a6acccc83ebd045db5.zip | |
[jsonnet] Added 0004-incorporate-md5.patch to incorporate md5.cpp into libjsonnet (#16335)
* [jsonnet] Added a patch file to incorporate md5.cpp into libjsonnet
* [jsonnet] increment port version
* [jsonnet] update version record
| -rw-r--r-- | ports/jsonnet/0004-incorporate-md5.patch | 42 | ||||
| -rw-r--r-- | ports/jsonnet/CONTROL | 2 | ||||
| -rw-r--r-- | ports/jsonnet/portfile.cmake | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/j-/jsonnet.json | 5 |
5 files changed, 50 insertions, 2 deletions
diff --git a/ports/jsonnet/0004-incorporate-md5.patch b/ports/jsonnet/0004-incorporate-md5.patch new file mode 100644 index 000000000..2f62c13f9 --- /dev/null +++ b/ports/jsonnet/0004-incorporate-md5.patch @@ -0,0 +1,42 @@ +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index d4e77a8..5d36314 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -15,7 +15,8 @@ set(LIBJSONNET_HEADERS + static_error.h + string_utils.h + unicode.h +- vm.h) ++ vm.h ++ ../third_party/md5/md5.h) + + set(LIBJSONNET_SOURCE + desugarer.cpp +@@ -26,12 +27,13 @@ set(LIBJSONNET_SOURCE + pass.cpp + static_analysis.cpp + string_utils.cpp +- vm.cpp) ++ vm.cpp ++ ../third_party/md5/md5.cpp) + + if (BUILD_SHARED_BINARIES) + add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) +-add_dependencies(libjsonnet md5 stdlib) +-target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json) ++add_dependencies(libjsonnet stdlib) ++target_link_libraries(libjsonnet nlohmann_json::nlohmann_json) + + file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/../include/libjsonnet.h JSONNET_VERSION_DEF + REGEX "[#]define[ \t]+LIB_JSONNET_VERSION[ \t]+") +@@ -54,8 +56,8 @@ endif() + if (BUILD_STATIC_LIBS) + # Static library for jsonnet command-line tool. + add_library(libjsonnet_static STATIC ${LIBJSONNET_SOURCE}) +- add_dependencies(libjsonnet_static md5 stdlib) +- target_link_libraries(libjsonnet_static md5 nlohmann_json::nlohmann_json) ++ add_dependencies(libjsonnet_static stdlib) ++ target_link_libraries(libjsonnet_static nlohmann_json::nlohmann_json) + set_target_properties(libjsonnet_static PROPERTIES OUTPUT_NAME jsonnet) + install(TARGETS libjsonnet_static DESTINATION "${CMAKE_INSTALL_LIBDIR}") + endif() diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL index b069a6b1b..070822531 100644 --- a/ports/jsonnet/CONTROL +++ b/ports/jsonnet/CONTROL @@ -1,6 +1,6 @@ Source: jsonnet Version: 0.16.0 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/google/jsonnet Description: Jsonnet - The data templating language Build-Depends: nlohmann-json diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake index b2769cd85..6542aba75 100644 --- a/ports/jsonnet/portfile.cmake +++ b/ports/jsonnet/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( 001-enable-msvc.patch 002-fix-dependency-and-install.patch 0003-use-upstream-nlohmann-json.patch + 0004-incorporate-md5.patch ) if(VCPKG_TARGET_IS_WINDOWS) diff --git a/versions/baseline.json b/versions/baseline.json index ffe9a8198..f6ef7510d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2686,7 +2686,7 @@ }, "jsonnet": { "baseline": "0.16.0", - "port-version": 1 + "port-version": 2 }, "jwt-cpp": { "baseline": "0.4.0", diff --git a/versions/j-/jsonnet.json b/versions/j-/jsonnet.json index 6af3ca65d..29ee5da44 100644 --- a/versions/j-/jsonnet.json +++ b/versions/j-/jsonnet.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "53efaebae6e8131ee43960d0d58a5f110298a9c1", + "version-string": "0.16.0", + "port-version": 2 + }, + { "git-tree": "77e5fa13bd74db46bf2626d82e8b9f88805031b6", "version-string": "0.16.0", "port-version": 1 |