[RFC,for-3.1,1/2] docker: Fix TriCore binutils build

Message ID 20180711043417.24097-2-f4bug@amsat.org
State New
Headers show
Series
  • [RFC,for-3.1,1/2] docker: Fix TriCore binutils build
Related show

Commit Message

Philippe Mathieu-Daudé July 11, 2018, 4:34 a.m.
- Use recent 'missing' from libtool,
- Fix 'ylwrap' permissions

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Shippable runs 'clang --version'.

 .../dockerfiles/debian-tricore-cross.docker   | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

Comments

Alex Bennée July 12, 2018, 10:47 a.m. | #1
Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> - Use recent 'missing' from libtool,
> - Fix 'ylwrap' permissions
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> Shippable runs 'clang --version'.
>
>  .../dockerfiles/debian-tricore-cross.docker   | 23 ++++++++++++++++---
>  1 file changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker
> index 898b8dd511..f833a6ca16 100644
> --- a/tests/docker/dockerfiles/debian-tricore-cross.docker
> +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
> @@ -7,16 +7,33 @@
>  #
>  # SPDX-License-Identifier: GPL-2.0-or-later
>  #
> -FROM debian:9
> +FROM debian:9-slim
>
>  MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> +# Install common build utilities
> +RUN apt-get update && \
> +    DEBIAN_FRONTEND=noninteractive apt-get install -yy eatmydata && \
> +    DEBIAN_FRONTEND=noninteractive eatmydata \
> +    apt-get install -y --no-install-recommends \
> +        automake \
> +        bison \
> +        build-essential \
> +        ca-certificates \
> +        flex \
> +        git \
> +        libtool && \
> +    ln -s /usr/bin/cc /usr/bin/clang && \
> +    ln -s /usr/bin/gcc /usr/bin/tricore-gcc

Erm what is this trying to do?

> +
>  RUN git clone --single-branch \
>          https://github.com/bkoppelmann/tricore-binutils.git \
>          /usr/src/binutils && \
> -    cd /usr/src/binutils && chmod +x missing && \
> +    cd /usr/src/binutils && \
> +    cp /usr/share/libtool/build-aux/missing . && \
> +    chmod +x ylwrap binutils/ylwrap && \
>      CFLAGS=-w ./configure --prefix=/usr --disable-nls --target=tricore && \
> -    make && make install && \
> +    make all install && \
>      rm -rf /usr/src/binutils
>
>  # Specify the cross prefix for this image (see tests/docker/common.rc)


--
Alex Bennée

Patch

diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker
index 898b8dd511..f833a6ca16 100644
--- a/tests/docker/dockerfiles/debian-tricore-cross.docker
+++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
@@ -7,16 +7,33 @@ 
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
-FROM debian:9
+FROM debian:9-slim
 
 MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
 
+# Install common build utilities
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -yy eatmydata && \
+    DEBIAN_FRONTEND=noninteractive eatmydata \
+    apt-get install -y --no-install-recommends \
+        automake \
+        bison \
+        build-essential \
+        ca-certificates \
+        flex \
+        git \
+        libtool && \
+    ln -s /usr/bin/cc /usr/bin/clang && \
+    ln -s /usr/bin/gcc /usr/bin/tricore-gcc
+
 RUN git clone --single-branch \
         https://github.com/bkoppelmann/tricore-binutils.git \
         /usr/src/binutils && \
-    cd /usr/src/binutils && chmod +x missing && \
+    cd /usr/src/binutils && \
+    cp /usr/share/libtool/build-aux/missing . && \
+    chmod +x ylwrap binutils/ylwrap && \
     CFLAGS=-w ./configure --prefix=/usr --disable-nls --target=tricore && \
-    make && make install && \
+    make all install && \
     rm -rf /usr/src/binutils
 
 # Specify the cross prefix for this image (see tests/docker/common.rc)