haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-02-16 16:25:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move configure-args into Docker file settings

Browse Source
This commit is contained in:
Michael Snoyman 2019-01-13 10:20:37 +00:00
parent 65e3a3890d
commit a45a41024d
3 changed files with 16 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -6,7 +6,9 @@ ENV LANG en_US.UTF-8
# NOTE: also update debian-bootstrap.sh when cuda version changes # NOTE: also update debian-bootstrap.sh when cuda version changes
ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.3/bin:/usr/sbin:/usr/bin:/sbin:/bin ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.3/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV CUDA_PATH /usr/local/cuda-10.0 ENV CUDA_PATH /usr/local/cuda-10.0
ENV LD_LIBRARY_PATH=/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/nvvm/lib64
ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh
# Include file path
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

44
build-constraints.yaml
View File

@ -4022,47 +4022,9 @@ package-flags:
# Special configure options for individual packages # Special configure options for individual packages
configure-args: # This used to be used for extra-include-dirs and extra-lib-dirs
jni: # Instead, we set this in the Docker image itself
- --extra-lib-dirs configure-args: {}
- /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
- --extra-include-dirs
- /usr/lib/jvm/java-8-openjdk-amd64/include
- --extra-include-dirs
- /usr/lib/jvm/java-8-openjdk-amd64/include/linux
jvm:
- --extra-lib-dirs
- /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
- --extra-include-dirs
- /usr/lib/jvm/java-8-openjdk-amd64/include
- --extra-include-dirs
- /usr/lib/jvm/java-8-openjdk-amd64/include/linux
jvm-streaming:
- --extra-lib-dirs
- /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
- --extra-include-dirs
- /usr/lib/jvm/java-8-openjdk-amd64/include
- --extra-include-dirs
- /usr/lib/jvm/java-8-openjdk-amd64/include/linux
sparkle:
- --extra-lib-dirs
- /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
- --extra-include-dirs
- /usr/lib/jvm/java-8-openjdk-amd64/include
- --extra-include-dirs
- /usr/lib/jvm/java-8-openjdk-amd64/include/linux
hocilib:
- --extra-lib-dirs
- /usr/local/lib
clang-pure:
- --extra-lib-dirs
- /usr/lib/llvm-3.7/lib
- --extra-include-dirs
- /usr/lib/llvm-3.7/include
secp256k1-haskell:
- --extra-lib-dirs
- /usr/local/lib
# end of configure-args # end of configure-args

10
debian-bootstrap.sh
View File

@ -268,3 +268,13 @@ PROTOC_ZIP=protoc-3.3.0-linux-x86_64.zip
curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/$PROTOC_ZIP curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/$PROTOC_ZIP
sudo unzip -o $PROTOC_ZIP -d /usr bin/protoc sudo unzip -o $PROTOC_ZIP -d /usr bin/protoc
rm -f $PROTOC_ZIP rm -f $PROTOC_ZIP
# Update library search paths
echo /usr/local/cuda-10.0/lib64 > /etc/ld.so.conf.d/cuda.conf
echo /usr/local/cuda-10.0/nvvm/lib64 >> /etc/ld.so.conf.d/cuda.conf
echo /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server > /etc/ld.so.conf.d/java.conf
echo /usr/lib/llvm-3.7/lib > /etc/ld.so.conf.d/llvm.conf
ldconfig