ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-29 09:18:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #63 from corda/tlil/sgx-build-files

Browse Source 
Add missing build dependencies and build JDK without X11
This commit is contained in:
Tommy Lillehagen 2017-10-17 16:21:09 +01:00 committed by GitHub
commit 9f834b1495
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgx-jvm/Makefile
View File

@ -29,7 +29,10 @@ jdk8u:
git clone -b deterministic-jvm8 --single-branch https://github.com/corda/openjdk $@ git clone -b deterministic-jvm8 --single-branch https://github.com/corda/openjdk $@
$(JDK_IMAGE): jdk8u $(JDK_IMAGE): jdk8u
cd jdk8u && $(SHELL) ./configure && $(MAKE) JOBS=2 images docs cd jdk8u && \
ALSA_NOT_NEEDED=yes CUPS_NOT_NEEDED=yes FREETYPE_NOT_NEEDED=yes \
PULSE_NOT_NEEDED=yes X11_NOT_NEEDED=yes $(SHELL) ./configure && \
$(MAKE) JOBS=2 images docs
linux-sgx/external/ippcp_internal/inc: linux-sgx/external/ippcp_internal/inc:
cd linux-sgx && $(SHELL) ./download_prebuilt.sh cd linux-sgx && $(SHELL) ./download_prebuilt.sh

6
sgx-jvm/dependencies/docker-minimal/Dockerfile
View File

@ -1,6 +1,8 @@
FROM ubuntu:xenial FROM ubuntu:xenial
RUN apt-get update -y RUN apt-get update -y
RUN apt-get install -y make gcc autoconf cmake g++ openjdk-8-jdk libtool ocaml python2.7 RUN apt-get install -y \
RUN apt-get install -y mercurial wget autoconf ccache cmake cpio g++ gcc git libtool make \
ocaml openjdk-8-jdk python2.7 unzip wget zip
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64