From 4a57647c9dc9387b9cc0524fb3331ef5e68eebfb Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Tue, 11 Feb 2025 08:30:56 +0100 Subject: [PATCH] [ci] pass PKG_CONFIG_PATH when building using vcpkg Signed-off-by: Vitalii Koshura --- android/build_boinc_arm.sh | 3 +-- android/build_boinc_arm64.sh | 2 +- android/build_boinc_armv6.sh | 4 +--- android/build_boinc_x86.sh | 1 + android/build_boinc_x86_64.sh | 2 +- android/build_example_arm.sh | 1 + android/build_example_arm64.sh | 1 + android/build_example_armv6.sh | 1 + android/build_example_x86.sh | 1 + android/build_example_x86_64.sh | 1 + android/build_libraries_arm.sh | 1 + android/build_libraries_arm64.sh | 1 + android/build_libraries_armv6.sh | 1 + android/build_libraries_x86.sh | 1 + android/build_libraries_x86_64.sh | 1 + linux/ci_configure_client.sh | 2 ++ wasm/ci_configure_client.sh | 1 + 17 files changed, 18 insertions(+), 7 deletions(-) diff --git a/android/build_boinc_arm.sh b/android/build_boinc_arm.sh index 4f0017c8719..0e0ad452bc8 100755 --- a/android/build_boinc_arm.sh +++ b/android/build_boinc_arm.sh @@ -32,8 +32,7 @@ CONFIG_LDFLAGS="" CONFIG_LDFLAGS="-L$VCPKG_DIR/lib" CONFIG_FLAGS="--with-ssl=$VCPKG_DIR --with-libcurl=$VCPKG_DIR" export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" - - +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ export PATH="$TCBINARIES:$TCINCLUDES/bin:$PATH" export CC=armv7a-linux-androideabi16-clang diff --git a/android/build_boinc_arm64.sh b/android/build_boinc_arm64.sh index ad18d2f080e..43ab6c31a99 100755 --- a/android/build_boinc_arm64.sh +++ b/android/build_boinc_arm64.sh @@ -31,7 +31,7 @@ CONFIG_LDFLAGS="" CONFIG_LDFLAGS="-L$VCPKG_DIR/lib" CONFIG_FLAGS="--with-ssl=$VCPKG_DIR --with-libcurl=$VCPKG_DIR" export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" - +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ export PATH="$TCBINARIES:$TCINCLUDES/bin:$PATH" export CC=aarch64-linux-android21-clang diff --git a/android/build_boinc_armv6.sh b/android/build_boinc_armv6.sh index cbf974e1d41..73ae1723455 100755 --- a/android/build_boinc_armv6.sh +++ b/android/build_boinc_armv6.sh @@ -30,6 +30,7 @@ CONFIG_LDFLAGS="" CONFIG_LDFLAGS="-L$VCPKG_DIR/lib" CONFIG_FLAGS="--with-ssl=$VCPKG_DIR --with-libcurl=$VCPKG_DIR" export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ export PATH="$TCBINARIES:$TCINCLUDES/bin:$PATH" export CC=arm-linux-androideabi-clang @@ -69,9 +70,6 @@ if [ -n "$COMPILEBOINC" ]; then fi if [ -n "$CONFIGURE" ]; then ./_autosetup - if [ $BUILD_APPS_WITH_VCPKG = "yes" ]; then - export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" - fi ./configure --host=armv6-linux --with-boinc-platform="arm-android-linux-gnu" $CONFIG_FLAGS --disable-server --disable-manager --disable-shared --enable-static --disable-largefile sed -e "s%^CLIENTLIBS *= *.*$%CLIENTLIBS = -lm $STDCPPTC%g" client/Makefile > client/Makefile.out mv client/Makefile.out client/Makefile diff --git a/android/build_boinc_x86.sh b/android/build_boinc_x86.sh index 0b206d4baf1..193456e5ed9 100755 --- a/android/build_boinc_x86.sh +++ b/android/build_boinc_x86.sh @@ -31,6 +31,7 @@ CONFIG_LDFLAGS="" CONFIG_LDFLAGS="-L$VCPKG_DIR/lib" CONFIG_FLAGS="--with-ssl=$VCPKG_DIR --with-libcurl=$VCPKG_DIR" export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ export PATH="$TCBINARIES:$TCINCLUDES/bin:$PATH" export CC=i686-linux-android16-clang diff --git a/android/build_boinc_x86_64.sh b/android/build_boinc_x86_64.sh index a2583e77fbc..956a7cc9be5 100755 --- a/android/build_boinc_x86_64.sh +++ b/android/build_boinc_x86_64.sh @@ -31,7 +31,7 @@ CONFIG_LDFLAGS="" CONFIG_LDFLAGS="-L$VCPKG_DIR/lib" CONFIG_FLAGS="--with-ssl=$VCPKG_DIR --with-libcurl=$VCPKG_DIR" export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" - +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ export PATH="$TCBINARIES:$TCINCLUDES/bin:$PATH" export CC=x86_64-linux-android21-clang diff --git a/android/build_example_arm.sh b/android/build_example_arm.sh index a4590744879..f6fc9df38e3 100755 --- a/android/build_example_arm.sh +++ b/android/build_example_arm.sh @@ -29,6 +29,7 @@ CONFIG_LDFLAGS="" CONFIG_LDFLAGS="-L$VCPKG_DIR/lib" CONFIG_FLAGS="--with-ssl=$VCPKG_DIR --with-libcurl=$VCPKG_DIR --enable-apps-vcpkg" export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ export ANDROID="yes" export PATH="$TCBINARIES:$TCINCLUDES/bin:$PATH" diff --git a/android/build_example_arm64.sh b/android/build_example_arm64.sh index 87c8fbda875..ca3755eec5d 100755 --- a/android/build_example_arm64.sh +++ b/android/build_example_arm64.sh @@ -29,6 +29,7 @@ CONFIG_LDFLAGS="" CONFIG_LDFLAGS="-L$VCPKG_DIR/lib" CONFIG_FLAGS="--with-ssl=$VCPKG_DIR --with-libcurl=$VCPKG_DIR --enable-apps-vcpkg" export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ export ANDROID="yes" export PATH="$TCBINARIES:$TCINCLUDES/bin:$PATH" diff --git a/android/build_example_armv6.sh b/android/build_example_armv6.sh index 57192632a4a..46c1e02b3d1 100755 --- a/android/build_example_armv6.sh +++ b/android/build_example_armv6.sh @@ -28,6 +28,7 @@ CONFIG_LDFLAGS="" CONFIG_LDFLAGS="-L$VCPKG_DIR/lib" CONFIG_FLAGS="--with-ssl=$VCPKG_DIR --with-libcurl=$VCPKG_DIR --enable-apps-vcpkg" export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ export ANDROID="yes" export PATH="$TCBINARIES:$TCINCLUDES/bin:$PATH" diff --git a/android/build_example_x86.sh b/android/build_example_x86.sh index 7059a195005..55358c02111 100755 --- a/android/build_example_x86.sh +++ b/android/build_example_x86.sh @@ -29,6 +29,7 @@ CONFIG_LDFLAGS="" CONFIG_LDFLAGS="-L$VCPKG_DIR/lib" CONFIG_FLAGS="--with-ssl=$VCPKG_DIR --with-libcurl=$VCPKG_DIR --enable-apps-vcpkg" export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ export ANDROID="yes" export PATH="$TCBINARIES:$TCINCLUDES/bin:$PATH" diff --git a/android/build_example_x86_64.sh b/android/build_example_x86_64.sh index 20894238c32..2537664651a 100755 --- a/android/build_example_x86_64.sh +++ b/android/build_example_x86_64.sh @@ -29,6 +29,7 @@ CONFIG_LDFLAGS="" CONFIG_LDFLAGS="-L$VCPKG_DIR/lib" CONFIG_FLAGS="--with-ssl=$VCPKG_DIR --with-libcurl=$VCPKG_DIR --enable-apps-vcpkg" export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ export ANDROID="yes" export PATH="$TCBINARIES:$TCINCLUDES/bin:$PATH" diff --git a/android/build_libraries_arm.sh b/android/build_libraries_arm.sh index 0b1ec682547..13131d16455 100755 --- a/android/build_libraries_arm.sh +++ b/android/build_libraries_arm.sh @@ -32,6 +32,7 @@ CONFIG_LDFLAGS="" CONFIG_LDFLAGS="-L$VCPKG_DIR/lib" CONFIG_FLAGS="--with-ssl=$VCPKG_DIR --with-libcurl=$VCPKG_DIR" export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ export PATH="$TCBINARIES:$TCINCLUDES/bin:$PATH" export CC=armv7a-linux-androideabi16-clang diff --git a/android/build_libraries_arm64.sh b/android/build_libraries_arm64.sh index b05715da866..a1a8e7c9286 100755 --- a/android/build_libraries_arm64.sh +++ b/android/build_libraries_arm64.sh @@ -32,6 +32,7 @@ CONFIG_LDFLAGS="" CONFIG_LDFLAGS="-L$VCPKG_DIR/lib" CONFIG_FLAGS="--with-ssl=$VCPKG_DIR --with-libcurl=$VCPKG_DIR" export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ export PATH="$TCBINARIES:$TCINCLUDES/bin:$PATH" export CC=aarch64-linux-android21-clang diff --git a/android/build_libraries_armv6.sh b/android/build_libraries_armv6.sh index 7525b295d51..722a1df59ae 100755 --- a/android/build_libraries_armv6.sh +++ b/android/build_libraries_armv6.sh @@ -30,6 +30,7 @@ CONFIG_LDFLAGS="" CONFIG_LDFLAGS="-L$VCPKG_DIR/lib" CONFIG_FLAGS="--with-ssl=$VCPKG_DIR --with-libcurl=$VCPKG_DIR" export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ export PATH="$TCBINARIES:$TCINCLUDES/bin:$PATH" export CC=arm-linux-androideabi-clang diff --git a/android/build_libraries_x86.sh b/android/build_libraries_x86.sh index 9769a3b713d..fdfdd63d8ca 100755 --- a/android/build_libraries_x86.sh +++ b/android/build_libraries_x86.sh @@ -32,6 +32,7 @@ CONFIG_LDFLAGS="" CONFIG_LDFLAGS="-L$VCPKG_DIR/lib" CONFIG_FLAGS="--with-ssl=$VCPKG_DIR --with-libcurl=$VCPKG_DIR" export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ export PATH="$TCBINARIES:$TCINCLUDES/bin:$PATH" export CC=i686-linux-android16-clang diff --git a/android/build_libraries_x86_64.sh b/android/build_libraries_x86_64.sh index 91b10bb79eb..f8f9e7beef3 100755 --- a/android/build_libraries_x86_64.sh +++ b/android/build_libraries_x86_64.sh @@ -32,6 +32,7 @@ CONFIG_LDFLAGS="" CONFIG_LDFLAGS="-L$VCPKG_DIR/lib" CONFIG_FLAGS="--with-ssl=$VCPKG_DIR --with-libcurl=$VCPKG_DIR" export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ export PATH="$TCBINARIES:$TCINCLUDES/bin:$PATH" export CC=x86_64-linux-android21-clang diff --git a/linux/ci_configure_client.sh b/linux/ci_configure_client.sh index 04bf2c08036..61784b9c053 100755 --- a/linux/ci_configure_client.sh +++ b/linux/ci_configure_client.sh @@ -47,4 +47,6 @@ export VCPKG_DIR="$VCPKG_ROOT/installed/x64-linux" linux/update_vcpkg_client.sh export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ + ./configure --with-libcurl=$VCPKG_DIR --with-ssl=$VCPKG_DIR --disable-server --enable-client --disable-manager $exec_prefix diff --git a/wasm/ci_configure_client.sh b/wasm/ci_configure_client.sh index 1da06a3c6c8..6db40451993 100755 --- a/wasm/ci_configure_client.sh +++ b/wasm/ci_configure_client.sh @@ -25,4 +25,5 @@ if [ "debug" == "$1" ]; then fi export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" +export PKG_CONFIG_PATH=$VCPKG_DIR/lib/pkgconfig/ emconfigure ./configure $debug_flags --enable-wasm --with-libcurl=$VCPKG_DIR --with-ssl=$VCPKG_DIR --disable-server --enable-client --disable-manager