summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2022-03-01 18:15:59 -0600
committerGitHub <noreply@github.com>2022-03-01 18:15:59 -0600
commitffd49c134ca9efe0682188763b3abf3a5d81af6b (patch)
tree1f47d7fb7bddd5c3e3615ef7d17da3ef40703183
parent0406e27ad6364beec537526de8a7875c490c6e10 (diff)
parent730466955998cf5af6300a04cd4f7f9465adc01f (diff)
downloadvyos-build-ffd49c134ca9efe0682188763b3abf3a5d81af6b.tar.gz
vyos-build-ffd49c134ca9efe0682188763b3abf3a5d81af6b.zip
Merge pull request #218 from jestabro/open-vmdk-gcc-10
pull in patch for building open-vmdk under gcc-10.+
-rw-r--r--docker/Dockerfile2
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 675a5b03..36efd311 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -155,6 +155,8 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \
RUN wget -O /tmp/open-vmdk-master.zip https://github.com/vmware/open-vmdk/archive/master.zip && \
unzip -d /tmp/ /tmp/open-vmdk-master.zip && \
cd /tmp/open-vmdk-master/ && \
+ wget -O gcc-10.patch https://github.com/dongsupark/open-vmdk/commit/74dffbca5d6fa37ed4ecd9b3a75206e33497e3df.patch && \
+ patch -p1 < gcc-10.patch && \
make && \
make install