also set OPENSSL_DIR

as it's needed in newer version of the openssl crate
cross-rs · Jan 14, 2017 · e972216 · e972216
1 parent 0d53943
commit e972216
Show file tree

Hide file tree

Showing 19 changed files with 57 additions and 19 deletions.
diff --git a/docker/aarch64-unknown-linux-gnu/Dockerfile b/docker/aarch64-unknown-linux-gnu/Dockerfile
@@ -23,6 +23,8 @@ RUN apt-get install -y --no-install-recommends \
 ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
  CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
  CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib \
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib \
  QEMU_LD_PREFIX=/usr/aarch64-linux-gnu \
  RUST_TEST_THREADS=1
diff --git a/docker/arm-unknown-linux-gnueabi/Dockerfile b/docker/arm-unknown-linux-gnueabi/Dockerfile
@@ -23,6 +23,8 @@ RUN apt-get install -y --no-install-recommends \
 ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc \
  CC_arm_unknown_linux_gnueabi=arm-linux-gnueabi-gcc \
  CXX_arm_unknown_linux_gnueabi=arm-linux-gnueabi-g++ \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib \
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib \
  QEMU_LD_PREFIX=/usr/arm-linux-gnueabi \
  RUST_TEST_THREADS=1
diff --git a/docker/armv7-unknown-linux-gnueabihf/Dockerfile b/docker/armv7-unknown-linux-gnueabihf/Dockerfile
@@ -27,6 +27,8 @@ RUN apt-get install -y --no-install-recommends \
 ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
  CC_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \
  CXX_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib \
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib \
  QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf \
  RUST_TEST_THREADS=1
diff --git a/docker/i686-unknown-freebsd/Dockerfile b/docker/i686-unknown-freebsd/Dockerfile
@@ -19,4 +19,6 @@ RUN bash /freebsd.sh i686 && \
 
 ENV CARGO_TARGET_I686_UNKNOWN_FREEBSD_LINKER=i686-unknown-freebsd10-gcc \
  CC_i686_unknown_freebsd=i686-unknown-freebsd10-gcc \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib
diff --git a/docker/i686-unknown-linux-gnu/Dockerfile b/docker/i686-unknown-linux-gnu/Dockerfile
@@ -22,4 +22,6 @@ RUN apt-get install -y --no-install-recommends \
  g++-multilib && \
  bash /openssl.sh 1.0.2j linux-elf "" -m32
 
-ENV OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib
+ENV OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib
diff --git a/docker/mips-unknown-linux-gnu/Dockerfile b/docker/mips-unknown-linux-gnu/Dockerfile
@@ -26,6 +26,8 @@ RUN apt-get install -y --no-install-recommends \
 ENV CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_LINKER=mips-linux-gnu-gcc \
  CC_mips_unknown_linux_gnu=mips-linux-gnu-gcc \
  CXX_mips_unknown_linux_gnu=mips-linux-gnu-g++ \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib \
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib \
  QEMU_LD_PREFIX=/usr/mips-linux-gnu \
  RUST_TEST_THREADS=1
diff --git a/docker/mips64-unknown-linux-gnuabi64/Dockerfile b/docker/mips64-unknown-linux-gnuabi64/Dockerfile
@@ -23,6 +23,8 @@ RUN apt-get install -y --no-install-recommends \
 ENV CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc \
  CC_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-gcc \
  CXX_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-g++ \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib \
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib \
  QEMU_LD_PREFIX=/usr/mips64-linux-gnuabi64 \
  RUST_TEST_THREADS=1
diff --git a/docker/mips64el-unknown-linux-gnuabi64/Dockerfile b/docker/mips64el-unknown-linux-gnuabi64/Dockerfile
@@ -23,6 +23,8 @@ RUN apt-get install -y --no-install-recommends \
 ENV CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_LINKER=mips64el-linux-gnuabi64-gcc \
  CC_mips64el_unknown_linux_gnuabi64=mips64el-linux-gnuabi64-gcc \
  CXX_mips64el_unknown_linux_gnuabi64=mips64el-linux-gnuabi64-g++ \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib \
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib \
  QEMU_LD_PREFIX=/usr/mips64el-linux-gnuabi64 \
  RUST_TEST_THREADS=1
diff --git a/docker/mipsel-unknown-linux-gnu/Dockerfile b/docker/mipsel-unknown-linux-gnu/Dockerfile
@@ -23,6 +23,8 @@ RUN apt-get install -y --no-install-recommends \
 ENV CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_GNU_LINKER=mipsel-linux-gnu-gcc \
  CC_mipsel_unknown_linux_gnu=mipsel-linux-gnu-gcc \
  CXX_mipsel_unknown_linux_gnu=mipsel-linux-gnu-g++ \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib \
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib \
  QEMU_LD_PREFIX=/usr/mipsel-linux-gnu \
  RUST_TEST_THREADS=1
diff --git a/docker/powerpc-unknown-linux-gnu/Dockerfile b/docker/powerpc-unknown-linux-gnu/Dockerfile
@@ -23,6 +23,8 @@ RUN apt-get install -y --no-install-recommends \
 ENV CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-linux-gnu-gcc \
  CC_powerpc_unknown_linux_gnu=powerpc-linux-gnu-gcc \
  CXX_powerpc_unknown_linux_gnu=powerpc-linux-gnu-g++ \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib \
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib \
  QEMU_LD_PREFIX=/usr/powerpc-linux-gnu \
  RUST_TEST_THREADS=1
diff --git a/docker/powerpc64-unknown-linux-gnu/Dockerfile b/docker/powerpc64-unknown-linux-gnu/Dockerfile
@@ -26,6 +26,8 @@ RUN apt-get install -y --no-install-recommends \
 ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-linux-gnu-gcc \
  CC_powerpc64_unknown_linux_gnu=powerpc64-linux-gnu-gcc \
  CXX_powerpc64_unknown_linux_gnu=powerpc64-linux-gnu-g++ \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib \
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib \
  QEMU_LD_PREFIX=/usr/powerpc64-linux-gnu \
  RUST_TEST_THREADS=1
diff --git a/docker/powerpc64le-unknown-linux-gnu/Dockerfile b/docker/powerpc64le-unknown-linux-gnu/Dockerfile
@@ -23,6 +23,8 @@ RUN apt-get install -y --no-install-recommends \
 ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc \
  CC_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-gcc \
  CXX_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-g++ \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib \
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib \
  QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu \
  RUST_TEST_THREADS=1
diff --git a/docker/s390x-unknown-linux-gnu/Dockerfile b/docker/s390x-unknown-linux-gnu/Dockerfile
@@ -23,6 +23,8 @@ RUN apt-get install -y --no-install-recommends \
 ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \
  CC_s390x_unknown_linux_gnu=s390x-linux-gnu-gcc \
  CXX_s390x_unknown_linux_gnu=s390x-linux-gnu-g++ \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib \
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib \
  QEMU_LD_PREFIX=/usr/s390x-linux-gnu \
  RUST_TEST_THREADS=1
diff --git a/docker/sparc64-unknown-linux-gnu/Dockerfile b/docker/sparc64-unknown-linux-gnu/Dockerfile
@@ -23,6 +23,8 @@ RUN apt-get install -y --no-install-recommends \
 ENV CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_LINKER=sparc64-linux-gnu-gcc \
  CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \
  CXX_sparc64_unknown_linux_gnu=sparc64-linux-gnu-g++ \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib \
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib \
  QEMU_LD_PREFIX=/usr/sparc64-linux-gnu \
  RUST_TEST_THREADS=1
diff --git a/docker/x86_64-unknown-dragonfly/Dockerfile b/docker/x86_64-unknown-dragonfly/Dockerfile
@@ -19,4 +19,6 @@ RUN bash /dragonfly.sh && \
 
 ENV CARGO_TARGET_X86_64_UNKNOWN_DRAGONFLY_LINKER=x86_64-unknown-dragonfly-gcc \
  CC_x86_64_unknown_dragonfly=x86_64-unknown-dragonfly-gcc \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib
diff --git a/docker/x86_64-unknown-freebsd/Dockerfile b/docker/x86_64-unknown-freebsd/Dockerfile
@@ -19,4 +19,6 @@ RUN bash /freebsd.sh x86_64 && \
 
 ENV CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER=x86_64-unknown-freebsd10-gcc \
  CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-gcc \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib
diff --git a/docker/x86_64-unknown-linux-gnu/Dockerfile b/docker/x86_64-unknown-linux-gnu/Dockerfile
@@ -23,4 +23,6 @@ RUN apt-get install -y --no-install-recommends \
  zlib1g-dev && \
  bash /openssl.sh 1.0.2j linux-x86_64
 
-ENV OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib
+ENV OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib
diff --git a/docker/x86_64-unknown-linux-musl/Dockerfile b/docker/x86_64-unknown-linux-musl/Dockerfile
@@ -20,4 +20,6 @@ RUN bash /musl.sh 1.1.15 && \
  bash /openssl.sh 1.0.2j linux-x86_64 musl- -static
 
 ENV CC_x86_64_unknown_linux_musl=musl-gcc \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib
diff --git a/docker/x86_64-unknown-netbsd/Dockerfile b/docker/x86_64-unknown-netbsd/Dockerfile
@@ -19,4 +19,6 @@ RUN bash /netbsd.sh && \
 
 ENV CARGO_TARGET_X86_64_UNKNOWN_NETBSD_LINKER=x86_64-unknown-netbsd-gcc \
  CC_x86_64_unknown_netbsd=x86_64-unknown-netbsd-gcc \
- OPENSSL_INCLUDE_DIR=/openssl/include OPENSSL_LIB_DIR=/openssl/lib
+ OPENSSL_DIR=/openssl \
+ OPENSSL_INCLUDE_DIR=/openssl/include \
+ OPENSSL_LIB_DIR=/openssl/lib