From e7b97f9aee180624cbfea5c43ee1e9c42100ff89 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 30 Oct 2024 13:35:48 +0800 Subject: [PATCH] msys2: get python by transitive dependency --- msys2/PKGBUILD.common | 2 +- msys2/artiq_dependencies.txt | 1 - msys2/comtools_dependencies.txt | 1 - msys2/make_msys2_packages.sh | 2 +- msys2/sipyco_dependencies.txt | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/msys2/PKGBUILD.common b/msys2/PKGBUILD.common index 9768adb..f9ac6c3 100644 --- a/msys2/PKGBUILD.common +++ b/msys2/PKGBUILD.common @@ -7,7 +7,7 @@ sha256sums=("SKIP") build() { mkdir clang64 - export PYTHONPATH=`pwd`/clang64/lib/python3.11/site-packages + export PYTHONPATH=`pwd`/clang64/lib/python3.12/site-packages chmod +w -R source cd source wine-msys2-build python setup.py install --single-version-externally-managed --prefix=../clang64 --record=setuptools-sucks.txt diff --git a/msys2/artiq_dependencies.txt b/msys2/artiq_dependencies.txt index 2a8c254..af9ac34 100644 --- a/msys2/artiq_dependencies.txt +++ b/msys2/artiq_dependencies.txt @@ -1,4 +1,3 @@ -mingw-w64-clang-x86_64-python3.11 mingw-w64-clang-x86_64-python-h5py mingw-w64-clang-x86_64-python-pyqt5 mingw-w64-clang-x86_64-qt5-svg diff --git a/msys2/comtools_dependencies.txt b/msys2/comtools_dependencies.txt index 6dd15df..3991e38 100644 --- a/msys2/comtools_dependencies.txt +++ b/msys2/comtools_dependencies.txt @@ -1,3 +1,2 @@ -mingw-w64-clang-x86_64-python3.11 mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-aiohttp diff --git a/msys2/make_msys2_packages.sh b/msys2/make_msys2_packages.sh index d7d4c36..b8db652 100755 --- a/msys2/make_msys2_packages.sh +++ b/msys2/make_msys2_packages.sh @@ -13,7 +13,7 @@ curl -L https://raw.githubusercontent.com/msys2/MSYS2-packages/master/pacman/pac fakeroot pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf -Syy pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf \ --cachedir $MSYS2DIR/msys/cache --sync --print-format "%l %n" \ - mingw-w64-clang-x86_64-cc mingw-w64-clang-x86_64-python3.11 \ + mingw-w64-clang-x86_64-cc \ mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-setuptools > $MSYS2DIR/packages.txt cat artiq_dependencies.txt comtools_dependencies.txt pythonparser_dependencies.txt sipyco_dependencies.txt | pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf \ diff --git a/msys2/sipyco_dependencies.txt b/msys2/sipyco_dependencies.txt index a33a5e6..19ade38 100644 --- a/msys2/sipyco_dependencies.txt +++ b/msys2/sipyco_dependencies.txt @@ -1,3 +1,2 @@ -mingw-w64-clang-x86_64-python3.11 mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-pybase64