summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2019-04-10 20:31:59 (GMT)
committerGitHub <noreply@github.com>2019-04-10 20:31:59 (GMT)
commitb2151f1dba2b20c310adfe7198e461ec4469172b (patch)
tree05c80fcd5c80c3efb73cbc027461b6cc17fe80d8
parent51f1db5c0aed562caf6d195ee5d3666ee33cc0ad (diff)
parenta90046a056e4bf43114d0fed8f1f909baa6ce054 (diff)
Merge pull request #1182 from stilor/mastercrosstool-ng-1.24.0
Last fixes for 1.24
-rw-r--r--config/arch/riscv.in1
-rw-r--r--testing/docker/ubuntu16.04/Dockerfile2
-rw-r--r--testing/docker/ubuntu18.04/Dockerfile2
-rw-r--r--testing/docker/ubuntu18.10/Dockerfile2
4 files changed, 4 insertions, 3 deletions
diff --git a/config/arch/riscv.in b/config/arch/riscv.in
index f4b3eeb..6b98520 100644
--- a/config/arch/riscv.in
+++ b/config/arch/riscv.in
@@ -13,6 +13,7 @@
## select GCC_REQUIRE_7_or_later
## select BINUTILS_REQUIRE_2_28_or_later
## select GDB_REQUIRE_8_0_or_later if DEBUG_GDB
+## select GLIBC_REQUIRE_2_29_or_later if LIBC_GLIBC
## help The RISC-V architecture, as defined by:
## help http://www.riscv.org/
diff --git a/testing/docker/ubuntu16.04/Dockerfile b/testing/docker/ubuntu16.04/Dockerfile
index 7a76712..e2ea06d 100644
--- a/testing/docker/ubuntu16.04/Dockerfile
+++ b/testing/docker/ubuntu16.04/Dockerfile
@@ -5,7 +5,7 @@ RUN groupadd -g $CTNG_GID ctng
RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng
RUN apt-get update
RUN apt-get install -y gcc g++ gperf bison flex texinfo help2man make libncurses5-dev \
- python-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \
+ python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \
patch libstdc++6
RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
RUN chmod a+x /sbin/dumb-init
diff --git a/testing/docker/ubuntu18.04/Dockerfile b/testing/docker/ubuntu18.04/Dockerfile
index 9fe27b2..5dab842 100644
--- a/testing/docker/ubuntu18.04/Dockerfile
+++ b/testing/docker/ubuntu18.04/Dockerfile
@@ -5,7 +5,7 @@ RUN groupadd -g $CTNG_GID ctng
RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng
RUN apt-get update
RUN apt-get install -y gcc g++ gperf bison flex texinfo help2man make libncurses5-dev \
- python-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \
+ python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \
patch libstdc++6
RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
RUN chmod a+x /sbin/dumb-init
diff --git a/testing/docker/ubuntu18.10/Dockerfile b/testing/docker/ubuntu18.10/Dockerfile
index 468175e..6789a5c 100644
--- a/testing/docker/ubuntu18.10/Dockerfile
+++ b/testing/docker/ubuntu18.10/Dockerfile
@@ -5,7 +5,7 @@ RUN groupadd -g $CTNG_GID ctng
RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng
RUN apt-get update
RUN apt-get install -y gcc g++ gperf bison flex texinfo help2man make libncurses5-dev \
- python-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \
+ python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \
patch libstdc++6
RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
RUN chmod a+x /sbin/dumb-init