From 1c18a4d14afa82729eeaa8b05ec5eb7a06e7a6bc Mon Sep 17 00:00:00 2001 From: Serge Lamikhov-Center Date: Thu, 24 Feb 2022 18:16:53 +0200 Subject: [PATCH 1/2] [elfio] Update elfio from 3.9 to 3.10 --- ports/elfio/portfile.cmake | 4 ++-- ports/elfio/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/elfio.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/elfio/portfile.cmake b/ports/elfio/portfile.cmake index cee90231bbd68a..50cb00c3553de6 100644 --- a/ports/elfio/portfile.cmake +++ b/ports/elfio/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO serge1/ELFIO - REF Release_3.9 - SHA512 479c4132ac3575940bd1e8190ba5253e54ae57f38319d7bca75ea85ee2f744f5d5b460d2d4ceb17eca0d0561c6e281673f050bbdab2f5ff526c031c220876bf1) + REF Release_3.10 + SHA512 f609fe5162d1609d1d65f441dbf01011ca5ae36195d8b3a74dec2b72891e9f8f90d3fdbc9bf893f7186494071606e898e5519fda18665fc88ae9781c504cd4a9) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/elfio/vcpkg.json b/ports/elfio/vcpkg.json index c49ffbe49529fc..a8c3290a056672 100644 --- a/ports/elfio/vcpkg.json +++ b/ports/elfio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "elfio", - "version": "3.9", + "version": "3.10", "description": "A header-only C++ library intended for reading and generating files in the ELF binary format.", "homepage": "https://github.com/serge1/ELFIO" } diff --git a/versions/baseline.json b/versions/baseline.json index fb07913cbcd95f..a7d7760251c962 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2009,7 +2009,7 @@ "port-version": 0 }, "elfio": { - "baseline": "3.9", + "baseline": "3.10", "port-version": 0 }, "elfutils": { diff --git a/versions/e-/elfio.json b/versions/e-/elfio.json index fb92088639bf54..94cf5c20e080e6 100644 --- a/versions/e-/elfio.json +++ b/versions/e-/elfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f6155d4bd5e835d929353d097d788d4c0bf39d7", + "version": "3.10", + "port-version": 0 + }, { "git-tree": "4c3c450c25f313eba1565d93542dbe2caa17aec4", "version": "3.9", From 43bfddb375ec8af63921c7db5c6f6f0f62bb50ef Mon Sep 17 00:00:00 2001 From: Serge Lamikhov-Center Date: Fri, 25 Feb 2022 09:13:53 +0200 Subject: [PATCH 2/2] [elfio] substitute depricated functions --- ports/elfio/portfile.cmake | 7 +++---- ports/elfio/vcpkg.json | 13 ++++++++++++- versions/e-/elfio.json | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ports/elfio/portfile.cmake b/ports/elfio/portfile.cmake index 50cb00c3553de6..0e7f1ad2bd3813 100644 --- a/ports/elfio/portfile.cmake +++ b/ports/elfio/portfile.cmake @@ -4,14 +4,13 @@ vcpkg_from_github( REF Release_3.10 SHA512 f609fe5162d1609d1d65f441dbf01011ca5ae36195d8b3a74dec2b72891e9f8f90d3fdbc9bf893f7186494071606e898e5519fda18665fc88ae9781c504cd4a9) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/elfio/vcpkg.json b/ports/elfio/vcpkg.json index a8c3290a056672..d1a7eadb44ba5e 100644 --- a/ports/elfio/vcpkg.json +++ b/ports/elfio/vcpkg.json @@ -2,5 +2,16 @@ "name": "elfio", "version": "3.10", "description": "A header-only C++ library intended for reading and generating files in the ELF binary format.", - "homepage": "https://github.com/serge1/ELFIO" + "homepage": "https://github.com/serge1/ELFIO", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/e-/elfio.json b/versions/e-/elfio.json index 94cf5c20e080e6..01d0d53b603e47 100644 --- a/versions/e-/elfio.json +++ b/versions/e-/elfio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0f6155d4bd5e835d929353d097d788d4c0bf39d7", + "git-tree": "76c8087deffd555757001f6c2dcf33f59901290f", "version": "3.10", "port-version": 0 },