From 67e130af0887273f16a58c2d2d41de83bec0dd79 Mon Sep 17 00:00:00 2001 From: Steeve Morin Date: Tue, 4 Nov 2014 23:29:52 +0100 Subject: [PATCH] Update darwin-x64 to Mac OS X 10.10 (Yosemite) Signed-off-by: Steeve Morin --- darwin-x64/Dockerfile | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/darwin-x64/Dockerfile b/darwin-x64/Dockerfile index f412e4e..e1b7a76 100644 --- a/darwin-x64/Dockerfile +++ b/darwin-x64/Dockerfile @@ -1,22 +1,25 @@ FROM steeve/cross-compiler:base MAINTAINER Steeve Morin "steeve.morin@gmail.com" -ENV CROSS_TRIPLE x86_64-apple-darwin13 +ENV CROSS_TRIPLE x86_64-apple-darwin14 ENV CROSS_ROOT /usr/${CROSS_TRIPLE} ENV PATH ${PATH}:${CROSS_ROOT}/bin -ENV LD_LIBRARY_PATH /usr/lib/llvm-3.5/lib:${CROSS_ROOT}/lib -ENV MAC_SDK_VERSION 10.9 +ENV LD_LIBRARY_PATH /usr/lib/llvm-3.4/lib:${CROSS_ROOT}/lib +ENV MAC_SDK_VERSION 10.10 -RUN curl -L https://github.com/tpoechtrager/osxcross/archive/master.tar.gz | tar xvz -COPY MacOSX${MAC_SDK_VERSION}.sdk.tar.bz2 /osxcross-master/tarballs/ +RUN echo "deb http://llvm.org/apt/wheezy/ llvm-toolchain-wheezy-3.4-binaries main" >> /etc/apt/sources.list && \ + curl http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add - && \ + apt-get update -# Build the toolchain -WORKDIR /osxcross-master +RUN apt-get update && \ + apt-get install -y --force-yes clang-3.4 llvm-3.4-dev automake autogen \ + libtool libxml2-dev uuid-dev libssl-dev bash \ + patch make tar xz-utils bzip2 gzip sed cpio -RUN ./tools/get_dependencies.sh && \ +RUN curl -L https://github.com/tpoechtrager/osxcross/archive/master.tar.gz | tar xvz && \ + cd /osxcross-master/ && \ + cd tarballs/ && wget https://www.dropbox.com/s/yfbesd249w10lpc/MacOSX${MAC_SDK_VERSION}.sdk.tar.xz && cd - && \ echo | SDK_VERSION=${MAC_SDK_VERSION} OSX_VERSION_MIN=10.6 ./build.sh && \ mv /osxcross-master/target ${CROSS_ROOT} && \ mkdir -p ${CROSS_ROOT}/lib && \ rm -rf /osxcross-master - -WORKDIR /