git.iko.soy/stackage
on master help sign in
Move configure-args into Docker file settings
commita45a41024d71c7a2522a13aff8a74054660d0016 authorMichael Snoyman <michael@snoyman.com> dateSun 13 Jan 2019, 10:20 (8 years ago) parent65e3a38
3 files changed+16−42
compare with master
unifiedsplit
Dockerfile+3−1 build-constraints.yaml+3−41 debian-bootstrap.sh+10
Dockerfile+3−1
@@ -6,7 +6,9 @@ ENV LANG en_US.UTF-8
66# NOTE: also update debian-bootstrap.sh when cuda version changes
77ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.3/bin:/usr/sbin:/usr/bin:/sbin:/bin
88ENV CUDA_PATH /usr/local/cuda-10.0
9−ENV LD_LIBRARY_PATH=/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/nvvm/lib64
109
1110ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
1211RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh
12+
13+# Include file path
14+ENV CPATH /usr/lib/jvm/java-8-openjdk-amd64/include:/usr/lib/jvm/java-8-openjdk-amd64/include/linux:/usr/lib/llvm-3.7/include
build-constraints.yaml+3−41
@@ -4022,47 +4022,9 @@ package-flags:
40224022
40234023# Special configure options for individual packages
40244024
4025−configure-args:
4026− jni:
4027− - --extra-lib-dirs
4028− - /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
4029− - --extra-include-dirs
4030− - /usr/lib/jvm/java-8-openjdk-amd64/include
4031− - --extra-include-dirs
4032− - /usr/lib/jvm/java-8-openjdk-amd64/include/linux
4033− jvm:
4034− - --extra-lib-dirs
4035− - /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
4036− - --extra-include-dirs
4037− - /usr/lib/jvm/java-8-openjdk-amd64/include
4038− - --extra-include-dirs
4039− - /usr/lib/jvm/java-8-openjdk-amd64/include/linux
4040− jvm-streaming:
4041− - --extra-lib-dirs
4042− - /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
4043− - --extra-include-dirs
4044− - /usr/lib/jvm/java-8-openjdk-amd64/include
4045− - --extra-include-dirs
4046− - /usr/lib/jvm/java-8-openjdk-amd64/include/linux
4047− sparkle:
4048− - --extra-lib-dirs
4049− - /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
4050− - --extra-include-dirs
4051− - /usr/lib/jvm/java-8-openjdk-amd64/include
4052− - --extra-include-dirs
4053− - /usr/lib/jvm/java-8-openjdk-amd64/include/linux
4054− hocilib:
4055− - --extra-lib-dirs
4056− - /usr/local/lib
4057− clang-pure:
4058− - --extra-lib-dirs
4059− - /usr/lib/llvm-3.7/lib
4060− - --extra-include-dirs
4061− - /usr/lib/llvm-3.7/include
4062− secp256k1-haskell:
4063− - --extra-lib-dirs
4064− - /usr/local/lib
4065−
4025+# This used to be used for extra-include-dirs and extra-lib-dirs
4026+# Instead, we set this in the Docker image itself
4027+configure-args: {}
40664028# end of configure-args
40674029
40684030
debian-bootstrap.sh+10
@@ -268,3 +268,13 @@ PROTOC_ZIP=protoc-3.3.0-linux-x86_64.zip
268268curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/$PROTOC_ZIP
269269sudo unzip -o $PROTOC_ZIP -d /usr bin/protoc
270270rm -f $PROTOC_ZIP
271+
272+# Update library search paths
273+echo /usr/local/cuda-10.0/lib64 > /etc/ld.so.conf.d/cuda.conf
274+echo /usr/local/cuda-10.0/nvvm/lib64 >> /etc/ld.so.conf.d/cuda.conf
275+
276+echo /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server > /etc/ld.so.conf.d/java.conf
277+
278+echo /usr/lib/llvm-3.7/lib > /etc/ld.so.conf.d/llvm.conf
279+
280+ldconfig