From 0472602b51f5baf5906c70d5a430233b0e8379f9 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Wed, 10 Apr 2019 13:21:24 -0700 Subject: [PATCH 1/2] Require 2.29 if building glibc for RISC-V64 Signed-off-by: Alexey Neyman --- config/arch/riscv.in | 1 + 1 file changed, 1 insertion(+) diff --git a/config/arch/riscv.in b/config/arch/riscv.in index f4b3eeb7..6b98520c 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/ From a90046a056e4bf43114d0fed8f1f909baa6ce054 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Wed, 10 Apr 2019 13:23:31 -0700 Subject: [PATCH 2/2] Install python3, needed by recent GLIBC Signed-off-by: Alexey Neyman --- testing/docker/ubuntu16.04/Dockerfile | 2 +- testing/docker/ubuntu18.04/Dockerfile | 2 +- testing/docker/ubuntu18.10/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/docker/ubuntu16.04/Dockerfile b/testing/docker/ubuntu16.04/Dockerfile index 7a76712f..e2ea06dc 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 9fe27b26..5dab8422 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 468175e5..6789a5cb 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