Compare commits

...

23 Commits

Author SHA1 Message Date
4dcd7eeec1 Update build example in readme
Update build example in readme

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-11-03 20:54:39 +01:00
ea4d106ed8 Merge pull request #632 from thewtex/sudo-wrapper-bash
imagefiles: gosu sudo wrapper requires bash
2021-11-02 21:14:37 -04:00
9098b1a478 imagefiles: gosu sudo wrapper requires bash
Addresses:

  /usr/local/bin/sudo: 5: 2: not found

that occurs during sudo execution.
2021-10-31 21:31:40 -04:00
cb7421fc79 Merge pull request #631 from bensuperpc/add_tbb
Add tbb
2021-10-26 09:40:43 -04:00
77e7761286 Update Dockerfile.in 2021-10-25 00:09:39 +02:00
9f3cbd5a17 Add tbb
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-10-24 19:29:02 +02:00
e607d1252b Merge pull request #630 from bensuperpc/update_windows_image 2021-10-20 14:11:23 -04:00
b50710ea8f Merge pull request #629 from bensuperpc/update_readme
Update readme
2021-10-20 16:55:57 +02:00
e1a1191559 Update readme
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-10-19 14:30:16 +02:00
7cd0ce9f5d Update windows image
GCC 11.2
OpenSSL 1.1.1l
GDB 11.1
curl 7.79.1

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-10-18 11:03:33 +02:00
ed5ecc293e Update text
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-10-18 10:52:20 +02:00
6d00aa95f5 Update text
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-10-18 10:51:55 +02:00
c06be541ac Bold some words
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-10-18 10:49:04 +02:00
0f9beb211c Update readme
move image list

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-10-18 10:46:38 +02:00
b3b207e65a Merge pull request #623 from bensuperpc/update_python
Add python3-dev
2021-10-17 23:51:10 +02:00
958baab724 Merge pull request #626 from bensuperpc/update_linux-x64-tinycc
Update linux-x64-tinycc and enable openSSL test
2021-10-17 23:29:46 +02:00
94ca571f67 Merge pull request #624 from bensuperpc/add_linux-armv7-lts
Add linux-armv7-lts image
2021-10-17 20:51:48 +02:00
b922daff52 Merge pull request #625 from bensuperpc/add_openmp
Add OpenMP on linux-x64-clang and fix tests
2021-10-17 19:29:03 +02:00
5322eac0bf Update linux-x64-tinycc and enable openSSL test
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-10-17 14:31:34 +02:00
259afe733b Enable tests on linux-x64-clang image
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-10-17 14:01:04 +02:00
47215f71ba Fix llvm-ar and llvm-as
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-10-17 13:53:26 +02:00
5d97dc31aa Add OpenMP on linux-x64-clang
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-10-17 13:10:33 +02:00
139f0833e6 Add python3-dev
Add python3-dev
2021-10-15 20:20:08 +02:00
10 changed files with 41 additions and 30 deletions

View File

@ -383,8 +383,8 @@ jobs:
stockfish_arg: "ARCH=x86-64-modern", stockfish_arg: "ARCH=x86-64-modern",
ninja: "yes", ninja: "yes",
ninja_arg: "", ninja_arg: "",
openssl: "no", openssl: "yes",
openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso", openssl_arg: "linux-generic64 no-tests no-asm no-hw no-dtls no-shared no-dso",
C: "no", C: "no",
C_arg: "", C_arg: "",
C-Plus-Plus: "yes", C-Plus-Plus: "yes",
@ -400,7 +400,7 @@ jobs:
stockfish_arg: "ARCH=x86-64-modern COMP=clang", stockfish_arg: "ARCH=x86-64-modern COMP=clang",
ninja: "yes", ninja: "yes",
ninja_arg: "", ninja_arg: "",
openssl: "no", openssl: "yes",
openssl_arg: "linux-x86_64-clang", openssl_arg: "linux-x86_64-clang",
C: "yes", C: "yes",
C_arg: "", C_arg: "",
@ -408,7 +408,7 @@ jobs:
C-Plus-Plus_arg: "", C-Plus-Plus_arg: "",
fmt: "yes", fmt: "yes",
fmt_arg: "", fmt_arg: "",
cpython: "no", cpython: "yes",
cpython_arg: "", cpython_arg: "",
} }
- { - {

3
.gitignore vendored
View File

@ -1,5 +1,8 @@
bin bin
dockcross dockcross
dockcross-*
build
build-*
*/test/ */test/
Dockerfile Dockerfile
web-wasm/Dockerfile web-wasm/Dockerfile

View File

@ -56,7 +56,8 @@ Only 64-bit x86_64 images are provided, a 64-bit x86_64 host system is required.
For the impatient, here\'s how to compile a hello world for armv7: For the impatient, here\'s how to compile a hello world for armv7:
```bash ```bash
cd ~/src/dockcross git clone https://github.com/dockcross/dockcross.git
cd dockcross
docker run --rm dockcross/linux-armv7 > ./dockcross-linux-armv7 docker run --rm dockcross/linux-armv7 > ./dockcross-linux-armv7
chmod +x ./dockcross-linux-armv7 chmod +x ./dockcross-linux-armv7
./dockcross-linux-armv7 bash -c '$CC test/C/hello.c -o hello_arm' ./dockcross-linux-armv7 bash -c '$CC test/C/hello.c -o hello_arm'
@ -117,6 +118,17 @@ The dockcross script will execute the given command-line inside the container, a
| dockcross/windows-armv7 | ARMv7 | Clang | Windows | | dockcross/windows-armv7 | ARMv7 | Clang | Windows |
| dockcross/windows-arm64 | ARMv8 | Clang | Windows | | dockcross/windows-arm64 | ARMv8 | Clang | Windows |
The list of docker images that are **no longer maintained**.
| Image name | Target arch | Compiler | Target OS |
|:-------:|:--------:|:------:|:-----:|
| dockcross/manylinux1-x86 | x86 | GCC | manylinux |
| dockcross/manylinux1-x64 | x86_64 | GCC| manylinux |
| dockcross/manylinux2010-x86 | x86 | GCC | manylinux |
| dockcross/manylinux2010-x64 | x86_64 | GCC | manylinux |
| dockcross/linux-mipsel | mipsel | GCC 4.9 | Debian 8 |
## Cross compilers ## Cross compilers
### dockcross/base ### dockcross/base
@ -381,17 +393,6 @@ ARMv7 32-bit Windows cross-compiler based on [LLVM/MinGW-w64](https://github.com
ARMv8 64-bit Windows cross-compiler based on [llvm-mingw](https://github.com/mstorsjo/llvm-mingw) ARMv8 64-bit Windows cross-compiler based on [llvm-mingw](https://github.com/mstorsjo/llvm-mingw)
## Summary legacy cross compilers
The list of docker images that are no longer supported or broken
| Image name | Target arch | Compiler | Target OS |
|:-------:|:--------:|:------:|:-----:|
| dockcross/manylinux1-x86 | x86 | GCC | manylinux |
| dockcross/manylinux1-x64 | x86_64 | GCC| manylinux |
| dockcross/manylinux2010-x86 | x86 | GCC | manylinux |
| dockcross/manylinux2010-x64 | x86_64 | GCC | manylinux |
## Articles ## Articles
- [dockcross: C++ Write Once, Run - [dockcross: C++ Write Once, Run

View File

@ -25,7 +25,7 @@ RUN \
ncurses-dev \ ncurses-dev \
pkg-config \ pkg-config \
pax \ pax \
python3 \ python3-dev \
python3-pip \ python3-pip \
rsync \ rsync \
sed \ sed \

View File

@ -15,8 +15,8 @@
# ARG MXE_TARGET_LINK=shared # ARG MXE_TARGET_LINK=shared
# #
# mxe master 2021-08-04 # mxe master 2021-10-18
ARG MXE_GIT_TAG=91e21fc4bc0775790b0a7cc3f7da4aef89637a0f ARG MXE_GIT_TAG=8838ac3938cd8e47424a4cb5d3676d1ae9a4d670
ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}/share/cmake/mxe-conf.cmake ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}/share/cmake/mxe-conf.cmake

View File

@ -16,7 +16,7 @@ gosu nobody true
# is created in /usr/local/bin # is created in /usr/local/bin
cat << EOF >> /usr/local/bin/sudo cat << EOF >> /usr/local/bin/sudo
#!/bin/sh #!/bin/bash
# Emulate the sudo command # Emulate the sudo command
SUDO_USER=root SUDO_USER=root
SUDO_GROUP=root SUDO_GROUP=root

View File

@ -11,8 +11,8 @@ RUN echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /et
&& echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${CLANG_VERSION} main" >> /etc/apt/sources.list \ && echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${CLANG_VERSION} main" >> /etc/apt/sources.list \
&& wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \ && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
&& apt-get update \ && apt-get update \
&& apt-get purge --autoremove -y gcc g++ software-properties-common \ && apt-get -y install clang-${CLANG_VERSION} libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev clang-format-${CLANG_VERSION} clang-tidy-${CLANG_VERSION} lldb-${CLANG_VERSION} liblld-${CLANG_VERSION}-dev \
&& apt-get -y install clang-${CLANG_VERSION} libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev clang-format-${CLANG_VERSION} clang-tidy-${CLANG_VERSION} lldb-${CLANG_VERSION} \ && apt-get -y install libomp-${CLANG_VERSION}-dev clang-tools-${CLANG_VERSION} clangd-${CLANG_VERSION} libclang-${CLANG_VERSION}-dev libclang-common-${CLANG_VERSION}-dev llvm-${CLANG_VERSION}-dev \
&& apt-get clean --yes \ && apt-get clean --yes \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${CLANG_VERSION} 90 \ && update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${CLANG_VERSION} 90 \
@ -20,20 +20,20 @@ RUN echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /et
&& update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++-${CLANG_VERSION} 90 \ && update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++-${CLANG_VERSION} 90 \
&& update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${CLANG_VERSION} 90 \ && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${CLANG_VERSION} 90 \
&& update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_VERSION} 90 \ && update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_VERSION} 90 \
&& update-alternatives --install /usr/bin/lld lld /usr/bin/lld-${CLANG_VERSION} 90 \
&& cc --version \ && cc --version \
&& c++ --version \ && c++ --version \
&& cpp --version && cpp --version
ENV CROSS_TRIPLE x86_64-linux-gnu ENV CROSS_TRIPLE x86_64-linux-gnu
ENV CROSS_ROOT /usr/bin ENV CROSS_ROOT /usr/bin
ENV CC=/usr/bin/clang \ ENV CC=/usr/bin/clang-${CLANG_VERSION} \
CPP=/usr/bin/cpp \ CPP=/usr/bin/clang-cpp-${CLANG_VERSION} \
CXX=/usr/bin/clang++ \ CXX=/usr/bin/clang++-${CLANG_VERSION} \
LD=/usr/bin/lld \ LD=/usr/bin/lld-${CLANG_VERSION} \
FC=/usr/bin/flang AS=/usr/bin/llvm-as-${CLANG_VERSION} \
AR=/usr/bin/llvm-ar-${CLANG_VERSION}
# AS=/usr/bin/${CROSS_TRIPLE}-as # FC=/usr/bin/flang
# AR=/usr/bin/${CROSS_TRIPLE}-ar
COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop

View File

@ -7,6 +7,11 @@ LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
ARG REPO_URL=https://repo.or.cz/tinycc.git ARG REPO_URL=https://repo.or.cz/tinycc.git
ENV REPO_URL=${REPO_URL} ENV REPO_URL=${REPO_URL}
RUN apt-get update && \
apt-get -y install \
libtbb-dev \
&& apt-get clean --yes
# Disable options: --with-libgcc --disable-static # Disable options: --with-libgcc --disable-static
RUN git clone --recurse-submodules --remote-submodules ${REPO_URL} \ RUN git clone --recurse-submodules --remote-submodules ${REPO_URL} \
&& cd tinycc \ && cd tinycc \

View File

@ -6,6 +6,7 @@ RUN apt-get update && \
apt-get -y install \ apt-get -y install \
libelf-dev \ libelf-dev \
libssl-dev \ libssl-dev \
libtbb-dev \
&& apt-get clean --yes && apt-get clean --yes
ENV CROSS_TRIPLE x86_64-linux-gnu ENV CROSS_TRIPLE x86_64-linux-gnu

View File

@ -7,6 +7,7 @@ RUN dpkg --add-architecture i386 && \
gcc-multilib \ gcc-multilib \
g++-multilib \ g++-multilib \
libc6:i386 \ libc6:i386 \
libtbb-dev:i386 \
libstdc++6:i386 \ libstdc++6:i386 \
libbz2-dev:i386 \ libbz2-dev:i386 \
libexpat1-dev:i386 \ libexpat1-dev:i386 \