From d8fdac8d736be38b6bd1157bd1d7b6c55984c10c Mon Sep 17 00:00:00 2001 From: Andrey Filipenkov Date: Sun, 23 Feb 2025 10:15:17 +0300 Subject: [PATCH 1/3] test building libiconv on android --- .github/workflows/rebuildDependencies.yml | 30 ----------------------- 1 file changed, 30 deletions(-) diff --git a/.github/workflows/rebuildDependencies.yml b/.github/workflows/rebuildDependencies.yml index 76dd7f9..941fc52 100644 --- a/.github/workflows/rebuildDependencies.yml +++ b/.github/workflows/rebuildDependencies.yml @@ -13,34 +13,6 @@ jobs: fail-fast: false matrix: include: - - platform: mac-intel - os: macos-13 - before_install: macos.sh - conan_profile: macos-intel - conan_prebuilts: dependencies-mac-intel - conan_options: --options with_apple_system_libs=True - - platform: mac-arm - os: macos-13 - before_install: macos.sh - conan_profile: macos-arm - conan_prebuilts: dependencies-mac-arm - conan_options: --options with_apple_system_libs=True - - platform: ios - os: macos-13 - before_install: macos.sh - conan_profile: ios-arm64 - conan_prebuilts: dependencies-ios - conan_options: --options with_apple_system_libs=True - - platform: mingw-x86-64 - os: ubuntu-24.04 - before_install: mingw.sh - conan_profile: mingw64-linux.jinja - conan_prebuilts: dependencies-mingw-x86-64 - - platform: mingw-x86 - os: ubuntu-24.04 - before_install: mingw.sh - conan_profile: mingw32-linux.jinja - conan_prebuilts: dependencies-mingw-x86 - platform: android-armeabi-v7a os: ubuntu-24.04 conan_profile: android-32-ndk @@ -83,9 +55,7 @@ jobs: - name: Remove old binary packages (android) if: ${{ startsWith(matrix.platform, 'android') }} run: | - mv ~/.conan/data/libiconv ~/ rm -rf ~/.conan/data/*/*/_/_/package - mv ~/libiconv ~/.conan/data # Completely remove packages that were confirmed to be rebuildable using upstream recipe/sources # TODO: generate entire package from scratch instead of such cleanup From 7a25ed7355a7f58ab250edfa441eeb0ae3687982 Mon Sep 17 00:00:00 2001 From: Andrey Filipenkov Date: Mon, 24 Feb 2025 13:03:09 +0300 Subject: [PATCH 2/3] fix android LD --- .github/workflows/rebuildDependencies.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/rebuildDependencies.yml b/.github/workflows/rebuildDependencies.yml index 941fc52..506f1fc 100644 --- a/.github/workflows/rebuildDependencies.yml +++ b/.github/workflows/rebuildDependencies.yml @@ -56,6 +56,7 @@ jobs: if: ${{ startsWith(matrix.platform, 'android') }} run: | rm -rf ~/.conan/data/*/*/_/_/package + echo -e "[buildenv]\nLD=ld" >> CI/conan/${{ matrix.conan_profile }} # Completely remove packages that were confirmed to be rebuildable using upstream recipe/sources # TODO: generate entire package from scratch instead of such cleanup From b70b760d13ae887bb66087b0dbdb15212aaade28 Mon Sep 17 00:00:00 2001 From: Andrey Filipenkov Date: Mon, 24 Feb 2025 13:37:14 +0300 Subject: [PATCH 3/3] ignore Boost.Process --- .github/workflows/rebuildDependencies.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rebuildDependencies.yml b/.github/workflows/rebuildDependencies.yml index 506f1fc..8955371 100644 --- a/.github/workflows/rebuildDependencies.yml +++ b/.github/workflows/rebuildDependencies.yml @@ -81,7 +81,7 @@ jobs: - name: Generate conan profile run: | conan profile new default --detect - conan install . \ + conan install . -o 'boost/*:without_process=True' \ --install-folder=conan-generated \ --no-imports \ --build=missing \