[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>

9 files changed, 37 insertions, 7 deletions

diff --git a/ports/boost-locale/b2-options.cmake.in b/ports/boost-locale/b2-options.cmake.in
index d1df5d6c5..865a0b143 100644
--- a/ports/boost-locale/b2-options.cmake.in
+++ b/ports/boost-locale/b2-options.cmake.in
@@ -12,6 +12,18 @@ if(@VCPKG_TARGET_IS_WINDOWS@)
         /boost/locale//boost_locale

         boost.locale.icu=${BOOST_LOCALE_ICU_FEATURE}

     )

+elseif(@VCPKG_TARGET_IS_ANDROID@)

+    find_library(LIBICONV_LIBRARY iconv)

+    get_filename_component(LIBICONV_DIR "${LIBICONV_LIBRARY}" DIRECTORY)

+    get_filename_component(LIBICONV_DIR "${LIBICONV_DIR}" DIRECTORY)

+

+    list(APPEND B2_OPTIONS

+        boost.locale.iconv=on

+        boost.locale.posix=off

+        /boost/locale//boost_locale

+        boost.locale.icu=${BOOST_LOCALE_ICU_FEATURE}

+        -sICONV_PATH=${LIBICONV_DIR}

+    )

 else()

     find_library(LIBICONV_LIBRARY iconv)

     get_filename_component(LIBICONV_DIR "${LIBICONV_LIBRARY}" DIRECTORY)

diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
index d868b5ac8..c97158e48 100644
--- a/ports/boost-modular-build-helper/CMakeLists.txt
+++ b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -96,19 +96,24 @@ endif()
 if(CMAKE_CXX_COMPILER_TARGET AND CMAKE_CXX_COMPILE_OPTIONS_TARGET)

     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

         set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}")

+        set(LDFLAGS "${LDFLAGS} <linkflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}")

     else()

         set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET} <compileflags>${CMAKE_CXX_COMPILER_TARGET}")

+        set(LDFLAGS "${LDFLAGS} <linkflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET} <linkflags>${CMAKE_CXX_COMPILER_TARGET}")

     endif()

 endif()

 if(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN)

     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

         set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")

+        set(LDFLAGS "${LDFLAGS} <linkflags>${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")

     else()

         set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} <compileflags>${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")

+        set(LDFLAGS "${LDFLAGS} <linkflags>${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} <linkflags>${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")

     endif()

 endif()

 if(CMAKE_SYSROOT AND CMAKE_CXX_COMPILE_OPTIONS_SYSROOT)

     set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")

+    set(LDFLAGS "${LDFLAGS} <linkflags>${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")

 endif()

 foreach(INCDIR ${CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES})

     set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_INCLUDE_FLAG_C}${CMAKE_INCLUDE_FLAG_C_SEP}${INCDIR}")

diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json
index bc96cdaef..d58b458d8 100644
--- a/ports/boost-modular-build-helper/vcpkg.json
+++ b/ports/boost-modular-build-helper/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "boost-modular-build-helper",
   "version-string": "1.75.0",
-  "port-version": 3,
+  "port-version": 4,
   "dependencies": [
     "boost-uninstall"
   ]
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
diff --git a/versions/b-/boost-locale.json b/versions/b-/boost-locale.json
index c5b917b53..d5e2d017f 100644
--- a/versions/b-/boost-locale.json
+++ b/versions/b-/boost-locale.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "88631ecdc11e6ba3b30ee058381a62cf02a0a816",
+      "git-tree": "8a188d3cd40ba95cf241deda044c44d5426185bd",
       "version-string": "1.75.0",
       "port-version": 0
     },
diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json
index 52819f681..a44a263e4 100644
--- a/versions/b-/boost-modular-build-helper.json
+++ b/versions/b-/boost-modular-build-helper.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "b261a1bd3ff03916f10c4a157b670c3c4e7e7326",
+      "version-string": "1.75.0",
+      "port-version": 4
+    },
+    {
       "git-tree": "39acb181b681e8ac20ff594d3ac1782bfbb37ba2",
       "version-string": "1.75.0",
       "port-version": 3
diff --git a/versions/baseline.json b/versions/baseline.json
index f898dce80..3b18e13c2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -674,7 +674,7 @@
     },
     "boost-modular-build-helper": {
       "baseline": "1.75.0",
-      "port-version": 3
+      "port-version": 4
     },
     "boost-move": {
       "baseline": "1.75.0",
@@ -3014,7 +3014,7 @@
     },
     "libiconv": {
       "baseline": "1.16",
-      "port-version": 7
+      "port-version": 8
     },
     "libics": {
       "baseline": "1.6.4",
diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json
index c8d493eac..f198b5346 100644
--- a/versions/l-/libiconv.json
+++ b/versions/l-/libiconv.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "1190548d712c0ed8699e3b82e16f6b070a5154c9",
+      "version-string": "1.16",
+      "port-version": 8
+    },
+    {
       "git-tree": "2ca525bd3d388ec908ab2ec26bdccb12a990a26d",
       "version-string": "1.16",
       "port-version": 7