diff options
| author | Ludek Vodicka <ludek.vodicka@orm-designer.com> | 2021-01-25 09:15:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 00:15:40 -0800 |
| commit | c9977384354ac363d9ef09768aa0ed0affe63293 (patch) | |
| tree | b43a7e2d343dd40501f065cea7c736c6091dfcf9 | |
| parent | b7c8a3097d8aaafd0065852ad028857a02eab4b6 (diff) | |
| download | vcpkg-c9977384354ac363d9ef09768aa0ed0affe63293.tar.gz vcpkg-c9977384354ac363d9ef09768aa0ed0affe63293.zip | |
[libiconv] Updated typo in iconv share files location (#15771)
* Updated typo in iconv share files location
CMake Error at ports/libiconv/portfile.cmake:4 (file):
file COPY cannot copy file
"/root/dev/ExternalLibraries/vcpkg/ports/libiconv/vcpkg-cmake-wrapper.cmake"
to
"/root/dev/ExternalLibraries/vcpkg/packages/libiconv_x64-linux/share/iconv/vcpkg-cmake-wrapper.cmake":
Success.
Call Stack (most recent call first):
scripts/ports.cmake:136 (include)
* [libiconv] Bump version
* update baseline
* Update ports/libiconv/portfile.cmake
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
* update baseline
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
| -rw-r--r-- | ports/libiconv/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libiconv/portfile.cmake | 4 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libiconv.json | 5 |
4 files changed, 9 insertions, 4 deletions
diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index 329b3ebc1..ec885fe69 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,5 +1,5 @@ Source: libiconv Version: 1.16 -Port-Version: 6 +Port-Version: 7 Homepage: https://www.gnu.org/software/libiconv/ Description: GNU Unicode text conversion diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index 62fb8e42d..85ccce0c8 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -1,6 +1,6 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/Iconv) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/iconv) file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/iconv) return() endif() @@ -42,4 +42,4 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURR file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)
\ No newline at end of file +set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) diff --git a/versions/baseline.json b/versions/baseline.json index 8afed10c3..67fe34aeb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3010,7 +3010,7 @@ }, "libiconv": { "baseline": "1.16", - "port-version": 6 + "port-version": 7 }, "libics": { "baseline": "1.6.4", diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json index e24310b5d..c8d493eac 100644 --- a/versions/l-/libiconv.json +++ b/versions/l-/libiconv.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "2ca525bd3d388ec908ab2ec26bdccb12a990a26d", + "version-string": "1.16", + "port-version": 7 + }, + { "git-tree": "b052109a8f7de3bcaf5d81b92952cbe9218dea6a", "version-string": "1.16", "port-version": 6 |