Add python3-dev

Merge pull request #620 from thewtex/wasi-cmake-platform
2025-06-17 16:39:25 +02:00 · 2021-10-15 20:20:08 +02:00 · 2021-10-14 20:52:56 -04:00 · 2021-10-14 13:54:55 -04:00 · 2021-10-13 23:47:29 -04:00 · 2021-10-13 15:41:28 -04:00
10 changed files with 69 additions and 50 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -62,8 +62,8 @@ jobs:
              C-Plus-Plus_arg: "",
              fmt: "no",
              fmt_arg: "",
-              cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=arm-linux-androideabi",
+              cpython: "no",
+              cpython_arg: "--host=arm-linux-androideabi --target=arm-linux-androideabi",
            }
          - {
              image: "android-arm64",
@ -79,8 +79,8 @@ jobs:
              C-Plus-Plus_arg: "",
              fmt: "no",
              fmt_arg: "",
-              cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-linux-android",
+              cpython: "no",
+              cpython_arg: "--host=aarch64-linux-android --target=aarch64-linux-android",
            }
          - {
              image: "android-x86",
@ -96,8 +96,8 @@ jobs:
              C-Plus-Plus_arg: "",
              fmt: "no",
              fmt_arg: "",
-              cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=i686-linux-android",
+              cpython: "no",
+              cpython_arg: "--host=i686-linux-android --target=i686-linux-android",
            }
          - {
              image: "android-x86_64",
@ -113,8 +113,8 @@ jobs:
              C-Plus-Plus_arg: "",
              fmt: "no",
              fmt_arg: "",
-              cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=x86_64-linux-android",
+              cpython: "no",
+              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=x86_64-linux-gnu --build=aarch64-unknown-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=x86_64-linux-gnu --build=aarch64-unknown-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=x86_64-linux-gnu --build=aarch64-linux-musl",
+              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=x86_64-linux-gnu --build=aarch64-unknown-linux-gnu",
+              cpython_arg: "--host=aarch64-buildroot-linux-gnu --target=aarch64-buildroot-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",
            }
          - {
              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",
            }
          # Linux armv6 images
          - {
@ -236,7 +236,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",
            }
          - {
              image: "linux-armv6-lts",
@ -253,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",
            }
          - {
              image: "linux-armv6-musl",
@ -270,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",
            }
          # Linux armv7 images
          - {
@ -288,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",
            }
          - {
              image: "linux-armv7a",
@ -305,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",
            }
          - {
              image: "linux-armv7l-musl",
@ -322,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",
            }
          # Linux x86 images
          - {
@ -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",
            }
          # 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",
            }
          - {
              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",
            }
          # 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",
            }
          # 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",
            }
          # 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",
            }
          # 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",
            }
          # 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",
            }
          # 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
--- a/common/common.debian
+++ b/common/common.debian
@ -25,7 +25,7 @@ RUN \
    ncurses-dev \
    pkg-config \
    pax \
-    python3 \
+    python3-dev \
    python3-pip \
    rsync \
    sed \
--- a/common/common.windows
+++ b/common/common.windows
@ -54,6 +54,7 @@ RUN \
    libc6-dev-i386 \
    lzip \
    make \
+    nsis \
    openssl \
    p7zip-full \
    patch \
@ -107,12 +108,20 @@ RUN \
  #
  echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE} && \
  #
+  # Add a sysmbolic link for makensis
+  #
+  ln -s /usr/bin/makensis /usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-makensis && \
+  #
  # Replace cmake and cpack binaries
  #
  cd /usr/bin && \
  rm cmake cpack && \
  ln -s /usr/src/mxe/usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-cmake cmake && \
-  ln -s /usr/src/mxe/usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-cpack cpack
+  ln -s /usr/src/mxe/usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-cpack cpack && \
+  #
+  # clean up temporary wine files
+  #
+  rm -rf /tmp/wine-*

 ENV PATH ${PATH}:/usr/src/mxe/usr/bin
 ENV CROSS_TRIPLE ${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}
--- a/linux-armv5-musl/Dockerfile.in
+++ b/linux-armv5-musl/Dockerfile.in
@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

 # This is for ARMv5 "legacy" (armel) devices which do NOT support hard float
 # VFP instructions (armhf).
--- a/tools/dockcross-cmake-builder.sh
+++ b/tools/dockcross-cmake-builder.sh
@ -1,15 +1,17 @@
 #!/usr/bin/env bash

 if (( $# >= 1 )); then
-    image=$1
-    build_file=build-${image%:*}
+    image_complet=$1
+    image=${image_complet%:*}
+    tag=${image_complet#*:}
+    build_file=build-$image
    shift 1

-    cmake_arg=$@
+    cmake_arg=$*
    echo "cmake arg: $cmake_arg"

-    #echo "Pulling dockcross/$image"
-    #docker pull dockcross/"$image"
+#    echo "Pulling dockcross/$image"
+#    docker pull "dockcross/$image:$tag"

    echo "Make script dockcross-$image"
    docker run --rm dockcross/"$image" > ./dockcross-"$image"
@ -19,6 +21,6 @@ if (( $# >= 1 )); then
    ./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja $cmake_arg
    ./dockcross-"$image" ninja -C "$build_file"
 else
-    echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <cmake arg.>"
+    echo "Usage: ${0##*/} <docker image (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <cmake arg.>"
    exit 1
 fi
--- a/tools/dockcross-command.sh
+++ b/tools/dockcross-command.sh
@ -1,14 +1,16 @@
 #!/usr/bin/env bash

 if (( $# >= 2 )); then
-    image=$1
+    image_complet=$1
+    image=${image_complet%:*}
+    tag=${image_complet#*:}
    shift 1

-    command=$@
+    command=$*
    echo "command: $command"

-    #echo "Pulling dockcross/$image"
-    #docker pull dockcross/"$image"
+#    echo "Pulling dockcross/$image"
+#    docker pull "dockcross/$image:$tag"

    echo "Make script dockcross-$image"
    docker run --rm dockcross/"$image" > ./dockcross-"$image"
--- a/tools/dockcross-make-builder.sh
+++ b/tools/dockcross-make-builder.sh
@ -1,15 +1,17 @@
 #!/usr/bin/env bash

 if (( $# >= 1 )); then
-    image=$1
-    build_file=build-${image%:*}
+    image_complet=$1
+    image=${image_complet%:*}
+    tag=${image_complet#*:}
+    build_file=build-$image
    shift 1

-    make_arg=$@
+    make_arg=$*
    echo "make arg: $make_arg"

-    #echo "Pulling dockcross/$image"
-    #docker pull dockcross/"$image"
+#    echo "Pulling dockcross/$image"
+#    docker pull "dockcross/$image:$tag"

    echo "Make script dockcross-$image"
    docker run --rm dockcross/"$image" > ./dockcross-"$image"
@ -18,6 +20,6 @@ if (( $# >= 1 )); then
    echo "Build $build_file"
    ./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} '"$make_arg"
 else
-    echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <make arg.>"
+    echo "Usage: ${0##*/} <docker image (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <make arg.>"
    exit 1
 fi
--- a/web-wasi/Dockerfile.in
+++ b/web-wasi/Dockerfile.in
@ -26,6 +26,8 @@ ENV AR=${CROSS_ROOT}/bin/llvm-ar \
    CXX=clang++-wasi-sysroot.sh \
    LD=${CROSS_ROOT}/bin/wasm-ld

+COPY WASI.cmake /usr/src/
+RUN mv /usr/src/WASI.cmake /usr/share/cmake-*/Modules/Platform/
 COPY Toolchain.cmake ${CROSS_ROOT}/
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

--- a/web-wasi/Toolchain.cmake
+++ b/web-wasi/Toolchain.cmake
@ -1,5 +1,4 @@
-set(WASI 1)
-
+set(WASI_SDK_PREFIX $ENV{WASI_SDK_PATH})
 include($ENV{WASI_SDK_PATH}/share/cmake/wasi-sdk.cmake)

 set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
--- a/web-wasi/WASI.cmake
+++ b/web-wasi/WASI.cmake
@ -0,0 +1,2 @@
+set(WASI 1)
+set(UNIX 1)
Author	SHA1	Message	Date
Bensuperpc	139f0833e6	Add python3-dev Add python3-dev	2021-10-15 20:20:08 +02:00
Matt McCormick	2b6cd4ae1d	Merge pull request #620 from thewtex/wasi-cmake-platform web-wasi: Patch CMake with WASI platform	2021-10-14 20:52:56 -04:00
Matt McCormick	1ec42ecb43	Merge pull request #619 from bensuperpc/update_scripts	2021-10-14 13:54:55 -04:00
Matt McCormick	ef0ff63ed9	web-wasi: Initialize WASI_SDK_PATH for wasi-sdk.cmake, set UNIX	2021-10-13 23:47:29 -04:00
Matt McCormick	93b23ec997	web-wasi: Patch CMake with WASI platform WASI.cmake taken from the wasi-sdk repository. To address the build time warning: System is unknown to cmake, create: Platform/WASI to use this system, please post your config file on discourse.cmake.org so it can be added to cmake	2021-10-13 15:41:28 -04:00
Bensuperpc	4f29f3d665	Disable auto pulling image in scripts Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-10-13 20:03:06 +02:00
Bensuperpc	749fb64f2d	Update scripts Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-10-13 19:44:08 +02:00
Bensuperpc	c994e33650	Merge pull request #617 from bensuperpc/update_tests Update and fix CPython tests	2021-10-13 14:08:58 +02:00
Bensuperpc	b44144d865	Merge pull request #618 from bensuperpc/update_isl Change ISL mirror with new official source	2021-10-13 14:08:44 +02:00
Matt McCormick	17a2266499	Merge pull request #616 from sabelka/nsis-installer add nsis installer for windows images	2021-10-12 14:00:08 -04:00
Matt McCormick	122a1586ef	Merge pull request #615 from sabelka/fix-tmp-wine clean up temporary files left over from wine	2021-10-12 13:59:40 -04:00
Bensuperpc	8dbeadbf6c	Fix ARM64 full Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-10-12 09:54:13 +02:00
Bensuperpc	1f024a67f4	Update main.yml	2021-10-12 01:11:47 +02:00
Bensuperpc	e8f7b68794	Update main.yml	2021-10-11 20:56:49 +02:00
Bensuperpc	73897d848b	Update main.yml	2021-10-11 20:47:17 +02:00
Bensuperpc	cb783b06c2	Update main.yml	2021-10-11 20:43:58 +02:00
Bensuperpc	c03a167b3f	Update main.yml	2021-10-11 17:25:09 +02:00
Rainer Sabelka	a036aca087	add nsis installer for windows images	2021-10-11 12:49:53 +02:00
Rainer Sabelka	1c2475d42d	clean up temporary files left over from wine	2021-10-11 12:22:05 +02:00