diff options
| author | Ilya Arzhannikov <iarzhannikov@artec-group.com> | 2021-01-26 00:52:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 15:52:09 -0800 |
| commit | 1d415e8dc3afef0ae85b4d00ea56013b2f26bb46 (patch) | |
| tree | d6b43baf49e98ad558f550357fe4b8df57928271 /ports/libiconv | |
| parent | dbf5193ebbc3e34b8035bf5012d7e836ef39371a (diff) | |
| download | vcpkg-1d415e8dc3afef0ae85b4d00ea56013b2f26bb46.tar.gz vcpkg-1d415e8dc3afef0ae85b4d00ea56013b2f26bb46.zip | |
[boost-locale] android build (#15606)
* pass additional link flags to b2
* configure boost-locale for android
* build libiconv for android
* Bump port version
* bump port version
* Update CONTROL
* new_ci_checks and versions
* add versions again
* fix pr review
* fix pr review. version
* bump versions
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'ports/libiconv')
| -rw-r--r-- | ports/libiconv/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libiconv/portfile.cmake | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index ec885fe69..f7414b819 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,5 +1,5 @@ Source: libiconv Version: 1.16 -Port-Version: 7 +Port-Version: 8 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 85ccce0c8..a5d2d70e8 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -1,4 +1,4 @@ -if(NOT VCPKG_TARGET_IS_WINDOWS) +if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/iconv) file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/iconv) @@ -21,11 +21,14 @@ vcpkg_extract_source_archive_ex( 0003-Add-export.patch ) +if (NOT VCPKG_TARGET_IS_ANDROID) + list(APPEND OPTIONS --enable-relocatable) +endif() + vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH} DETERMINE_BUILD_TRIPLET USE_WRAPPERS OPTIONS - --enable-relocatable --enable-extra-encodings --without-libiconv-prefix --without-libintl-prefix |