From c03a167b3f52611e0190e8ea1f915610dd7dc05e Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Mon, 11 Oct 2021 17:25:09 +0200 Subject: [PATCH 1/6] Update main.yml --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 68d6d99..d83dca0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -236,7 +236,8 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=armv6-unknown-linux-gnueabihf", +# cpython_arg: "--host=x86_64-linux-gnu --build=armv6-unknown-linux-gnueabihf", + cpython_arg: "--host=armv6-unknown-linux-gnueabihf --target=armv6-unknown-linux-gnueabihf --build=x86_64-linux-gnu", } - { image: "linux-armv6-lts", From cb783b06c240d08bceb01d4efd99804231f686a6 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Mon, 11 Oct 2021 20:43:58 +0200 Subject: [PATCH 2/6] Update main.yml --- .github/workflows/main.yml | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d83dca0..80861c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -63,7 +63,7 @@ jobs: fmt: "no", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=arm-linux-androideabi", + cpython_arg: "--host=arm-linux-androideabi --target=arm-linux-androideabi --build=x86_64-linux-gnu", } - { image: "android-arm64", @@ -80,7 +80,7 @@ jobs: fmt: "no", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-linux-android", + cpython_arg: "--host=aarch64-linux-android --target=aarch64-linux-android --build=x86_64-linux-gnu", } - { image: "android-x86", @@ -97,7 +97,7 @@ jobs: fmt: "no", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=i686-linux-android", + cpython_arg: "--host=i686-linux-android --target=i686-linux-android --build=x86_64-linux-gnu", } - { image: "android-x86_64", @@ -114,7 +114,7 @@ jobs: fmt: "no", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=x86_64-linux-android", + cpython_arg: "--host=x86_64-linux-android --target=x86_64-linux-android --build=x86_64-linux-gnu", } # Linux arm64/armv8 images - { @@ -132,7 +132,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-unknown-linux-gnu", + cpython_arg: "--host=aarch64-unknown-linux-gnu --target=aarch64-unknown-linux-gnu --build=x86_64-linux-gnu", } - { image: "linux-arm64-lts", @@ -149,7 +149,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-unknown-linux-gnu", + cpython_arg: "--host=aarch64-unknown-linux-gnu --target=aarch64-unknown-linux-gnu --build=x86_64-linux-gnu", } - { image: "linux-arm64-musl", @@ -166,7 +166,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-linux-musl", + cpython_arg: "--host=aarch64-linux-musl --target=aarch64-linux-musl --build=x86_64-linux-gnu", } - { image: "linux-arm64-full", @@ -183,7 +183,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-unknown-linux-gnu", + cpython_arg: "--host=aarch64-unknown-linux-gnu --target=aarch64-unknown-linux-gnu --build=x86_64-linux-gnu", } # Linux armv5 images - { @@ -201,7 +201,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=armv5-unknown-linux-gnueabi", + cpython_arg: "--host=armv5-unknown-linux-gnueabi --target=armv5-unknown-linux-gnueabi --build=x86_64-linux-gnu", } - { image: "linux-armv5-musl", @@ -218,7 +218,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=armv5-unknown-linux-musleabi", + cpython_arg: "--host=armv5-unknown-linux-musleabi --target=armv5-unknown-linux-musleabi --build=x86_64-linux-gnu", } # Linux armv6 images - { @@ -236,7 +236,6 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", -# cpython_arg: "--host=x86_64-linux-gnu --build=armv6-unknown-linux-gnueabihf", cpython_arg: "--host=armv6-unknown-linux-gnueabihf --target=armv6-unknown-linux-gnueabihf --build=x86_64-linux-gnu", } - { @@ -254,7 +253,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=armv6-unknown-linux-gnueabihf", + cpython_arg: "--host=armv6-unknown-linux-gnueabihf --target=armv6-unknown-linux-gnueabihf --build=x86_64-linux-gnu", } - { image: "linux-armv6-musl", @@ -271,7 +270,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=armv6-linux-musleabihf", + cpython_arg: "--host=armv6-linux-musleabihf --target=armv6-linux-musleabihf --build=x86_64-linux-gnu", } # Linux armv7 images - { @@ -289,7 +288,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=armv7-unknown-linux-gnueabi", + cpython_arg: "--host=armv7-unknown-linux-gnueabi --target=armv7-unknown-linux-gnueabi --build=x86_64-linux-gnu", } - { image: "linux-armv7a", @@ -306,7 +305,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=arm-cortexa8_neon-linux-gnueabihf", + cpython_arg: "--host=arm-cortexa8_neon-linux-gnueabihf --target=arm-cortexa8_neon-linux-gnueabihf --build=x86_64-linux-gnu", } - { image: "linux-armv7l-musl", @@ -323,7 +322,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=armv7l-linux-musleabihf", + cpython_arg: "--host=armv7l-linux-musleabihf --target=armv7l-linux-musleabihf --build=x86_64-linux-gnu", } # Linux x86 images - { From 73897d848bb3739150f61122086bdfa25f17360b Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Mon, 11 Oct 2021 20:47:17 +0200 Subject: [PATCH 3/6] Update main.yml --- .github/workflows/main.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 80861c4..9563bac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -409,7 +409,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=x86_64-buildroot-linux-gnu", + cpython_arg: "--host=x86_64-buildroot-linux-gnu --target=x86_64-buildroot-linux-gnu --build=x86_64-linux-gnu", } # Linux riscv images - { @@ -427,7 +427,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=riscv32-unknown-linux-gnu", + cpython_arg: "--host=riscv32-unknown-linux-gnu --target=riscv32-unknown-linux-gnu --build=x86_64-linux-gnu", } - { image: "linux-riscv64", @@ -444,7 +444,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=riscv64-unknown-linux-gnu", + cpython_arg: "--host=riscv64-unknown-linux-gnu --target=riscv64-unknown-linux-gnu --build=x86_64-linux-gnu", } # Linux s390x images - { @@ -462,7 +462,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=s390x-ibm-linux-gnu", + cpython_arg: "--host=s390x-ibm-linux-gnu --target=s390x-ibm-linux-gnu --build=x86_64-linux-gnu", } # Linux mips images - { @@ -480,7 +480,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=mips-unknown-linux-gnu", + cpython_arg: "--host=mips-unknown-linux-gnu --target=mips-unknown-linux-gnu --build=x86_64-linux-gnu", } # Linux ppc64le images - { @@ -498,7 +498,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=powerpc64le-unknown-linux-gnu", + cpython_arg: "--host=powerpc64le-unknown-linux-gnu --target=powerpc64le-unknown-linux-gnu --build=x86_64-linux-gnu", } # Linux m68k images - { @@ -516,7 +516,7 @@ jobs: fmt: "no", fmt_arg: "", cpython: "no", - cpython_arg: "--host=x86_64-linux-gnu --build=m68k-unknown-uclinux-uclibc", + cpython_arg: "--host=m68k-unknown-uclinux-uclibc --target=m68k-unknown-uclinux-uclibc --build=x86_64-linux-gnu", } # Linux xtensa images - { @@ -534,7 +534,7 @@ jobs: fmt: "no", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-gnu --build=xtensa-fsf-linux-uclibc", + cpython_arg: "--host=xtensa-fsf-linux-uclibc --target=xtensa-fsf-linux-uclibc --build=x86_64-linux-gnu", } # Windows x86_x64 images - { From e8f7b687947f27d070432ef079a9d56d842de891 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Mon, 11 Oct 2021 20:56:49 +0200 Subject: [PATCH 4/6] Update main.yml --- .github/workflows/main.yml | 50 +++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9563bac..ef6a30a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -63,7 +63,7 @@ jobs: fmt: "no", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=arm-linux-androideabi --target=arm-linux-androideabi --build=x86_64-linux-gnu", + cpython_arg: "--host=arm-linux-androideabi --target=arm-linux-androideabi", } - { image: "android-arm64", @@ -80,7 +80,7 @@ jobs: fmt: "no", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=aarch64-linux-android --target=aarch64-linux-android --build=x86_64-linux-gnu", + cpython_arg: "--host=aarch64-linux-android --target=aarch64-linux-android", } - { image: "android-x86", @@ -97,7 +97,7 @@ jobs: fmt: "no", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=i686-linux-android --target=i686-linux-android --build=x86_64-linux-gnu", + cpython_arg: "--host=i686-linux-android --target=i686-linux-android", } - { image: "android-x86_64", @@ -114,7 +114,7 @@ jobs: fmt: "no", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-linux-android --target=x86_64-linux-android --build=x86_64-linux-gnu", + cpython_arg: "--host=x86_64-linux-android --target=x86_64-linux-android", } # Linux arm64/armv8 images - { @@ -132,7 +132,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=aarch64-unknown-linux-gnu --target=aarch64-unknown-linux-gnu --build=x86_64-linux-gnu", + cpython_arg: "--host=aarch64-unknown-linux-gnu --target=aarch64-unknown-linux-gnu", } - { image: "linux-arm64-lts", @@ -149,7 +149,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=aarch64-unknown-linux-gnu --target=aarch64-unknown-linux-gnu --build=x86_64-linux-gnu", + cpython_arg: "--host=aarch64-unknown-linux-gnu --target=aarch64-unknown-linux-gnu", } - { image: "linux-arm64-musl", @@ -166,7 +166,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=aarch64-linux-musl --target=aarch64-linux-musl --build=x86_64-linux-gnu", + cpython_arg: "--host=aarch64-linux-musl --target=aarch64-linux-musl", } - { image: "linux-arm64-full", @@ -183,7 +183,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=aarch64-unknown-linux-gnu --target=aarch64-unknown-linux-gnu --build=x86_64-linux-gnu", + cpython_arg: "--host=aarch64-unknown-linux-gnu --target=aarch64-unknown-linux-gnu", } # Linux armv5 images - { @@ -201,7 +201,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=armv5-unknown-linux-gnueabi --target=armv5-unknown-linux-gnueabi --build=x86_64-linux-gnu", + cpython_arg: "--host=armv5-unknown-linux-gnueabi --target=armv5-unknown-linux-gnueabi", } - { image: "linux-armv5-musl", @@ -218,7 +218,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=armv5-unknown-linux-musleabi --target=armv5-unknown-linux-musleabi --build=x86_64-linux-gnu", + cpython_arg: "--host=armv5-unknown-linux-musleabi --target=armv5-unknown-linux-musleabi", } # Linux armv6 images - { @@ -236,7 +236,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=armv6-unknown-linux-gnueabihf --target=armv6-unknown-linux-gnueabihf --build=x86_64-linux-gnu", + cpython_arg: "--host=armv6-unknown-linux-gnueabihf --target=armv6-unknown-linux-gnueabihf", } - { image: "linux-armv6-lts", @@ -253,7 +253,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=armv6-unknown-linux-gnueabihf --target=armv6-unknown-linux-gnueabihf --build=x86_64-linux-gnu", + cpython_arg: "--host=armv6-unknown-linux-gnueabihf --target=armv6-unknown-linux-gnueabihf", } - { image: "linux-armv6-musl", @@ -270,7 +270,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=armv6-linux-musleabihf --target=armv6-linux-musleabihf --build=x86_64-linux-gnu", + cpython_arg: "--host=armv6-linux-musleabihf --target=armv6-linux-musleabihf", } # Linux armv7 images - { @@ -288,7 +288,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=armv7-unknown-linux-gnueabi --target=armv7-unknown-linux-gnueabi --build=x86_64-linux-gnu", + cpython_arg: "--host=armv7-unknown-linux-gnueabi --target=armv7-unknown-linux-gnueabi", } - { image: "linux-armv7a", @@ -305,7 +305,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=arm-cortexa8_neon-linux-gnueabihf --target=arm-cortexa8_neon-linux-gnueabihf --build=x86_64-linux-gnu", + cpython_arg: "--host=arm-cortexa8_neon-linux-gnueabihf --target=arm-cortexa8_neon-linux-gnueabihf", } - { image: "linux-armv7l-musl", @@ -322,7 +322,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=armv7l-linux-musleabihf --target=armv7l-linux-musleabihf --build=x86_64-linux-gnu", + cpython_arg: "--host=armv7l-linux-musleabihf --target=armv7l-linux-musleabihf", } # Linux x86 images - { @@ -409,7 +409,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=x86_64-buildroot-linux-gnu --target=x86_64-buildroot-linux-gnu --build=x86_64-linux-gnu", + cpython_arg: "--host=x86_64-buildroot-linux-gnu --target=x86_64-buildroot-linux-gnu", } # Linux riscv images - { @@ -427,7 +427,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=riscv32-unknown-linux-gnu --target=riscv32-unknown-linux-gnu --build=x86_64-linux-gnu", + cpython_arg: "--host=riscv32-unknown-linux-gnu --target=riscv32-unknown-linux-gnu", } - { image: "linux-riscv64", @@ -444,7 +444,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=riscv64-unknown-linux-gnu --target=riscv64-unknown-linux-gnu --build=x86_64-linux-gnu", + cpython_arg: "--host=riscv64-unknown-linux-gnu --target=riscv64-unknown-linux-gnu", } # Linux s390x images - { @@ -462,7 +462,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=s390x-ibm-linux-gnu --target=s390x-ibm-linux-gnu --build=x86_64-linux-gnu", + cpython_arg: "--host=s390x-ibm-linux-gnu --target=s390x-ibm-linux-gnu", } # Linux mips images - { @@ -480,7 +480,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=mips-unknown-linux-gnu --target=mips-unknown-linux-gnu --build=x86_64-linux-gnu", + cpython_arg: "--host=mips-unknown-linux-gnu --target=mips-unknown-linux-gnu", } # Linux ppc64le images - { @@ -498,7 +498,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=powerpc64le-unknown-linux-gnu --target=powerpc64le-unknown-linux-gnu --build=x86_64-linux-gnu", + cpython_arg: "--host=powerpc64le-unknown-linux-gnu --target=powerpc64le-unknown-linux-gnu", } # Linux m68k images - { @@ -516,7 +516,7 @@ jobs: fmt: "no", fmt_arg: "", cpython: "no", - cpython_arg: "--host=m68k-unknown-uclinux-uclibc --target=m68k-unknown-uclinux-uclibc --build=x86_64-linux-gnu", + cpython_arg: "--host=m68k-unknown-uclinux-uclibc --target=m68k-unknown-uclinux-uclibc", } # Linux xtensa images - { @@ -534,7 +534,7 @@ jobs: fmt: "no", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=xtensa-fsf-linux-uclibc --target=xtensa-fsf-linux-uclibc --build=x86_64-linux-gnu", + cpython_arg: "--host=xtensa-fsf-linux-uclibc --target=xtensa-fsf-linux-uclibc", } # Windows x86_x64 images - { @@ -838,7 +838,7 @@ jobs: run: | git clone --depth 1 --branch v3.9.2 https://github.com/python/cpython.git cd cpython - ./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./configure ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no --disable-ipv6 ${{ matrix.arch_name.cpython_arg }} + ./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./configure ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no --disable-ipv6 ${{ matrix.arch_name.cpython_arg }} --build=x86_64-linux-gnu --enable-shared ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2 cd .. rm -rf cpython From 1f024a67f413affa849f4d1d82637f0dbd11dff1 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Tue, 12 Oct 2021 01:11:47 +0200 Subject: [PATCH 5/6] Update main.yml --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ef6a30a..b9c2412 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -62,7 +62,7 @@ jobs: C-Plus-Plus_arg: "", fmt: "no", fmt_arg: "", - cpython: "yes", + cpython: "no", cpython_arg: "--host=arm-linux-androideabi --target=arm-linux-androideabi", } - { @@ -79,7 +79,7 @@ jobs: C-Plus-Plus_arg: "", fmt: "no", fmt_arg: "", - cpython: "yes", + cpython: "no", cpython_arg: "--host=aarch64-linux-android --target=aarch64-linux-android", } - { @@ -96,7 +96,7 @@ jobs: C-Plus-Plus_arg: "", fmt: "no", fmt_arg: "", - cpython: "yes", + cpython: "no", cpython_arg: "--host=i686-linux-android --target=i686-linux-android", } - { @@ -113,7 +113,7 @@ jobs: C-Plus-Plus_arg: "", fmt: "no", fmt_arg: "", - cpython: "yes", + cpython: "no", cpython_arg: "--host=x86_64-linux-android --target=x86_64-linux-android", } # Linux arm64/armv8 images From 8dbeadbf6cb6482153b5f48afa14b896a937e0db Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Tue, 12 Oct 2021 09:54:13 +0200 Subject: [PATCH 6/6] Fix ARM64 full Signed-off-by: Bensuperpc --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b9c2412..756049f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -183,7 +183,7 @@ jobs: fmt: "yes", fmt_arg: "", cpython: "yes", - cpython_arg: "--host=aarch64-unknown-linux-gnu --target=aarch64-unknown-linux-gnu", + cpython_arg: "--host=aarch64-buildroot-linux-gnu --target=aarch64-buildroot-linux-gnu", } # Linux armv5 images - {