From 9258d2fdd24fe9f23a373605fae12b33fc0a699c Mon Sep 17 00:00:00 2001 From: Zanie Blue Date: Sun, 29 Dec 2024 22:36:57 -0600 Subject: [PATCH 1/3] Set `PKG_CONFIG_PATH` in `build-cpython` --- cpython-unix/build-cpython.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/cpython-unix/build-cpython.sh b/cpython-unix/build-cpython.sh index 31536f3a..01355b38 100755 --- a/cpython-unix/build-cpython.sh +++ b/cpython-unix/build-cpython.sh @@ -8,6 +8,7 @@ set -ex export ROOT=`pwd` export PATH=${TOOLS_PATH}/${TOOLCHAIN}/bin:${TOOLS_PATH}/host/bin:${TOOLS_PATH}/deps/bin:$PATH +export PKG_CONFIG_PATH=${TOOLS_PATH}/deps/share/pkgconfig:${TOOLS_PATH}/deps/lib/pkgconfig # configure somehow has problems locating llvm-profdata even though it is in # PATH. The macro it is using allows us to specify its path via an From c663e82871d7c8b5c87c18917403dd6b2822c9b7 Mon Sep 17 00:00:00 2001 From: Zanie Blue Date: Sun, 29 Dec 2024 22:39:29 -0600 Subject: [PATCH 2/3] Display SQLite pkg-config output --- cpython-unix/build-cpython.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cpython-unix/build-cpython.sh b/cpython-unix/build-cpython.sh index 01355b38..37d546cc 100755 --- a/cpython-unix/build-cpython.sh +++ b/cpython-unix/build-cpython.sh @@ -7,9 +7,13 @@ set -ex export ROOT=`pwd` +pkg-config --modversion sqlite3 || echo "sqlite3.pc not found" + export PATH=${TOOLS_PATH}/${TOOLCHAIN}/bin:${TOOLS_PATH}/host/bin:${TOOLS_PATH}/deps/bin:$PATH export PKG_CONFIG_PATH=${TOOLS_PATH}/deps/share/pkgconfig:${TOOLS_PATH}/deps/lib/pkgconfig +pkg-config --modversion sqlite3 || echo "sqlite3.pc not found" + # configure somehow has problems locating llvm-profdata even though it is in # PATH. The macro it is using allows us to specify its path via an # environment variable. From c110f4c7dc14e6438e4f68a0bd0c396fee375fa5 Mon Sep 17 00:00:00 2001 From: Zanie Blue Date: Sun, 29 Dec 2024 23:18:20 -0600 Subject: [PATCH 3/3] Set `pkg-config --static` --- cpython-unix/build-cpython.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cpython-unix/build-cpython.sh b/cpython-unix/build-cpython.sh index 37d546cc..bdfb0112 100755 --- a/cpython-unix/build-cpython.sh +++ b/cpython-unix/build-cpython.sh @@ -14,6 +14,8 @@ export PKG_CONFIG_PATH=${TOOLS_PATH}/deps/share/pkgconfig:${TOOLS_PATH}/deps/lib pkg-config --modversion sqlite3 || echo "sqlite3.pc not found" +export PKG_CONFIG="pkg-config --static" + # configure somehow has problems locating llvm-profdata even though it is in # PATH. The macro it is using allows us to specify its path via an # environment variable.