Update build example in readme

Update build example in readme Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
Merge pull request #632 from thewtex/sudo-wrapper-bash
2025-06-17 16:39:25 +02:00 · 2021-11-03 20:54:39 +01:00 · 2021-11-02 21:14:37 -04:00 · 2021-10-31 21:31:40 -04:00 · 2021-10-26 09:40:43 -04:00 · 2021-10-25 00:09:39 +02:00
7 changed files with 15 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,8 @@
 bin
 dockcross
+dockcross-*
+build
+build-*
 */test/
 Dockerfile
 web-wasm/Dockerfile
--- a/README.md
+++ b/README.md
@ -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:

 ```bash
-cd ~/src/dockcross
+git clone https://github.com/dockcross/dockcross.git
+cd dockcross
 docker run --rm dockcross/linux-armv7 > ./dockcross-linux-armv7
 chmod +x ./dockcross-linux-armv7
 ./dockcross-linux-armv7 bash -c '$CC test/C/hello.c -o hello_arm'
--- a/common/common.windows
+++ b/common/common.windows
@ -15,8 +15,8 @@
 #  ARG MXE_TARGET_LINK=shared
 #

-# mxe master 2021-08-04
-ARG MXE_GIT_TAG=91e21fc4bc0775790b0a7cc3f7da4aef89637a0f
+# mxe master 2021-10-18
+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

--- a/imagefiles/install-gosu-binary-wrapper.sh
+++ b/imagefiles/install-gosu-binary-wrapper.sh
@ -16,7 +16,7 @@ gosu nobody true
 # is created in /usr/local/bin

 cat << EOF >> /usr/local/bin/sudo
-#!/bin/sh
+#!/bin/bash
 # Emulate the sudo command
 SUDO_USER=root
 SUDO_GROUP=root
--- a/linux-x64-tinycc/Dockerfile.in
+++ b/linux-x64-tinycc/Dockerfile.in
@ -7,6 +7,11 @@ LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 ARG REPO_URL=https://repo.or.cz/tinycc.git
 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
 RUN git clone --recurse-submodules --remote-submodules ${REPO_URL} \
    && cd tinycc \
--- a/linux-x64/Dockerfile.in
+++ b/linux-x64/Dockerfile.in
@ -6,6 +6,7 @@ RUN apt-get update && \
    apt-get -y install \
    libelf-dev \
    libssl-dev \
+    libtbb-dev \
    && apt-get clean --yes

 ENV CROSS_TRIPLE x86_64-linux-gnu
--- a/linux-x86/Dockerfile.in
+++ b/linux-x86/Dockerfile.in
@ -7,6 +7,7 @@ RUN dpkg --add-architecture i386 && \
    gcc-multilib \
    g++-multilib \
    libc6:i386 \
+    libtbb-dev:i386 \
    libstdc++6:i386 \
    libbz2-dev:i386 \
    libexpat1-dev:i386 \
Author	SHA1	Message	Date
Bensuperpc	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
Matt McCormick	ea4d106ed8	Merge pull request #632 from thewtex/sudo-wrapper-bash imagefiles: gosu sudo wrapper requires bash	2021-11-02 21:14:37 -04:00
Matt McCormick	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
Matt McCormick	cb7421fc79	Merge pull request #631 from bensuperpc/add_tbb Add tbb	2021-10-26 09:40:43 -04:00
Bensuperpc	77e7761286	Update Dockerfile.in	2021-10-25 00:09:39 +02:00
Bensuperpc	9f3cbd5a17	Add tbb Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-10-24 19:29:02 +02:00
Matt McCormick	e607d1252b	Merge pull request #630 from bensuperpc/update_windows_image	2021-10-20 14:11:23 -04:00
Bensuperpc	b50710ea8f	Merge pull request #629 from bensuperpc/update_readme Update readme	2021-10-20 16:55:57 +02:00
Bensuperpc	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