i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docker/bootstrap: Add extra gcc bootstrap requirements

Browse Source 
Change-Id: Icacba4faaaab7e9af2b04225f99ef00ea4753606
This commit is contained in:
Alexander von Gluck IV
2018-11-02 22:32:12 -05:00
parent 4ee3f16d6a
commit bae2263db9
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
3rdparty/docker/bootstrap/Dockerfile
Vendored
+5
View File
@@ -3,11 +3,16 @@ FROM debian
ENV DEBIAN_FRONTEND="noninteractive" ENV DEBIAN_FRONTEND="noninteractive"
RUN apt-get update RUN apt-get update
# Base Haiku requirements
RUN apt-get install -y git nasm autoconf automake texinfo flex \ RUN apt-get install -y git nasm autoconf automake texinfo flex \
bison gawk build-essential unzip wget zip less zlib1g-dev \ bison gawk build-essential unzip wget zip less zlib1g-dev \
libcurl4-openssl-dev genisoimage libtool mtools gcc-multilib \ libcurl4-openssl-dev genisoimage libtool mtools gcc-multilib \
u-boot-tools util-linux device-tree-compiler bc u-boot-tools util-linux device-tree-compiler bc
# GCC Requirements
RUN apt-get install -y python
ENV GIT_BUILDTOOLS="https://git.haiku-os.org/buildtools" ENV GIT_BUILDTOOLS="https://git.haiku-os.org/buildtools"
ENV GIT_HAIKU="https://git.haiku-os.org/haiku" ENV GIT_HAIKU="https://git.haiku-os.org/haiku"
ENV GIT_HAIKUPORTER="https://github.com/haikuports/haikuporter.git" ENV GIT_HAIKUPORTER="https://github.com/haikuports/haikuporter.git"
3rdparty/docker/bootstrap/Makefile
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
default: default:
docker build . -t docker.io/haiku/bootstrap docker build . -t docker.io/haiku/bootstrap
clean: clean:
docker rm docker.io/haiku/bootstrap docker ps -a -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} docker rm {}
docker volume rm bootstrap_work docker volume rm bootstrap_work
init: init:
docker run -v bootstrap_work:/work docker.io/haiku/bootstrap prep docker run -v bootstrap_work:/work docker.io/haiku/bootstrap prep
3rdparty/docker/bootstrap/crosstools.sh
Vendored
+1 -1
View File
@@ -24,4 +24,4 @@ cd $GENERATED
$WORKPATH/src/haiku/configure -j4 --build-cross-tools $TARGET_ARCH $WORKPATH/src/buildtools \ $WORKPATH/src/haiku/configure -j4 --build-cross-tools $TARGET_ARCH $WORKPATH/src/buildtools \
--bootstrap $WORKPATH/src/haikuporter/haikuporter $WORKPATH/src/haikuports.cross $WORKPATH/src/haikuports --bootstrap $WORKPATH/src/haikuporter/haikuporter $WORKPATH/src/haikuports.cross $WORKPATH/src/haikuports
echo "If everything was successful, your next step is 'make bootstrap'" echo "If everything was successful, your next step is 'TARGET_ARCH=$TARGET_ARCH make bootstrap'"