Merge pull request #1002 from GitaiQAQ/master
Just fix unreachable links and remove ndk...
This commit is contained in:
commit
0de9d374df
|
@ -10,39 +10,47 @@
|
||||||
#
|
#
|
||||||
# $ sudo docker run -v /path/to/dest:/out nghttp2-android cp /root/build/nghttp2/src/nghttpx /out
|
# $ sudo docker run -v /path/to/dest:/out nghttp2-android cp /root/build/nghttp2/src/nghttpx /out
|
||||||
|
|
||||||
FROM ubuntu:vivid
|
|
||||||
|
|
||||||
|
# Only use standalone-toolchain for reduce size
|
||||||
|
FROM ubuntu:xenial
|
||||||
MAINTAINER Tatsuhiro Tsujikawa
|
MAINTAINER Tatsuhiro Tsujikawa
|
||||||
|
ENV ANDROID_HOME /root
|
||||||
ENV ANDROID_HOME /root/android
|
|
||||||
ENV PREFIX $ANDROID_HOME/usr/local
|
|
||||||
ENV TOOLCHAIN $ANDROID_HOME/toolchain
|
ENV TOOLCHAIN $ANDROID_HOME/toolchain
|
||||||
ENV PATH $TOOLCHAIN/bin:$PATH
|
ENV PATH $TOOLCHAIN/bin:$PATH
|
||||||
|
|
||||||
# It would be better to use nearest ubuntu archive mirror for faster
|
ENV NDK_VERSION r14b
|
||||||
# downloads.
|
|
||||||
# RUN sed -ie 's/archive\.ubuntu/jp.archive.ubuntu/g' /etc/apt/sources.list
|
|
||||||
|
|
||||||
RUN apt-get update
|
WORKDIR /root
|
||||||
# genisoimage, libc6-i386 and lib32stdc++6 are required to decompress ndk.
|
RUN apt-get update && \
|
||||||
RUN apt-get install -y make binutils autoconf automake autotools-dev libtool \
|
apt-get install -y unzip make binutils autoconf \
|
||||||
pkg-config git curl dpkg-dev libxml2-dev \
|
automake autotools-dev libtool pkg-config git \
|
||||||
genisoimage libc6-i386 lib32stdc++6
|
curl dpkg-dev libxml2-dev genisoimage libc6-i386 \
|
||||||
|
lib32stdc++6 python&& \
|
||||||
|
rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
|
# Install toolchain
|
||||||
|
RUN curl -L -O https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux-x86_64.zip && \
|
||||||
|
unzip -q android-ndk-$NDK_VERSION-linux-x86_64.zip && \
|
||||||
|
rm android-ndk-$NDK_VERSION-linux-x86_64.zip && \
|
||||||
|
mkdir -p $ANDROID_HOME/toolchain && \
|
||||||
|
$ANDROID_HOME/android-ndk-$NDK_VERSION/build/tools/make-standalone-toolchain.sh \
|
||||||
|
--install-dir=$ANDROID_HOME/toolchain \
|
||||||
|
--toolchain=arm-linux-androideabi-4.9 \
|
||||||
|
--force && \
|
||||||
|
rm -r android-ndk-$NDK_VERSION
|
||||||
|
|
||||||
|
ENV PREFIX /root/usr/local
|
||||||
|
|
||||||
|
# Setup version of libraries
|
||||||
|
ENV OPENSSL_VERSION 1.0.2d
|
||||||
|
ENV SPDYLAY_VERSION v1.4.0
|
||||||
|
ENV LIBEV_VERSION 4.19
|
||||||
|
ENV ZLIB_VERSION 1.2.8
|
||||||
|
ENV CARES_VERSION 1.13.0
|
||||||
|
ENV NGHTTP2_VERSION v1.24.0
|
||||||
|
|
||||||
WORKDIR /root/build
|
WORKDIR /root/build
|
||||||
RUN curl -L -O http://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin && \
|
RUN git clone https://github.com/tatsuhiro-t/spdylay -b $SPDYLAY_VERSION --depth 1
|
||||||
chmod a+x android-ndk-r10d-linux-x86_64.bin && \
|
|
||||||
./android-ndk-r10d-linux-x86_64.bin && \
|
|
||||||
rm android-ndk-r10d-linux-x86_64.bin
|
|
||||||
|
|
||||||
WORKDIR /root/build/android-ndk-r10d
|
|
||||||
RUN /bin/bash build/tools/make-standalone-toolchain.sh \
|
|
||||||
--install-dir=$ANDROID_HOME/toolchain \
|
|
||||||
--toolchain=arm-linux-androideabi-4.9 --llvm-version=3.5 \
|
|
||||||
--system=linux-x86_64
|
|
||||||
|
|
||||||
WORKDIR /root/build
|
|
||||||
RUN git clone https://github.com/tatsuhiro-t/spdylay
|
|
||||||
WORKDIR /root/build/spdylay
|
WORKDIR /root/build/spdylay
|
||||||
RUN autoreconf -i && \
|
RUN autoreconf -i && \
|
||||||
./configure \
|
./configure \
|
||||||
|
@ -59,22 +67,22 @@ RUN autoreconf -i && \
|
||||||
make install
|
make install
|
||||||
|
|
||||||
WORKDIR /root/build
|
WORKDIR /root/build
|
||||||
RUN curl -L -O https://www.openssl.org/source/openssl-1.0.2d.tar.gz && \
|
RUN curl -L -O https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz && \
|
||||||
tar xf openssl-1.0.2d.tar.gz && \
|
tar xf openssl-$OPENSSL_VERSION.tar.gz && \
|
||||||
rm openssl-1.0.2d.tar.gz
|
rm openssl-$OPENSSL_VERSION.tar.gz
|
||||||
|
|
||||||
WORKDIR /root/build/openssl-1.0.2d
|
WORKDIR /root/build/openssl-$OPENSSL_VERSION
|
||||||
RUN export CROSS_COMPILE=$TOOLCHAIN/bin/arm-linux-androideabi- && \
|
RUN export CROSS_COMPILE=$TOOLCHAIN/bin/arm-linux-androideabi- && \
|
||||||
./Configure --prefix=$PREFIX android && \
|
./Configure --prefix=$PREFIX android && \
|
||||||
make && make install_sw
|
make && make install_sw
|
||||||
|
|
||||||
WORKDIR /root/build
|
WORKDIR /root/build
|
||||||
RUN curl -L -O http://dist.schmorp.de/libev/libev-4.19.tar.gz && \
|
RUN curl -L -O http://dist.schmorp.de/libev/Attic/libev-$LIBEV_VERSION.tar.gz && \
|
||||||
curl -L -O https://gist.github.com/tatsuhiro-t/48c45f08950f587180ed/raw/80a8f003b5d1091eae497c5995bbaa68096e739b/libev-4.19-android.patch && \
|
curl -L -O https://gist.github.com/tatsuhiro-t/48c45f08950f587180ed/raw/80a8f003b5d1091eae497c5995bbaa68096e739b/libev-4.19-android.patch && \
|
||||||
tar xf libev-4.19.tar.gz && \
|
tar xf libev-$LIBEV_VERSION.tar.gz && \
|
||||||
rm libev-4.19.tar.gz
|
rm libev-$LIBEV_VERSION.tar.gz
|
||||||
|
|
||||||
WORKDIR /root/build/libev-4.19
|
WORKDIR /root/build/libev-$LIBEV_VERSION
|
||||||
RUN patch -p1 < ../libev-4.19-android.patch && \
|
RUN patch -p1 < ../libev-4.19-android.patch && \
|
||||||
./configure \
|
./configure \
|
||||||
--host=arm-linux-androideabi \
|
--host=arm-linux-androideabi \
|
||||||
|
@ -87,11 +95,11 @@ RUN patch -p1 < ../libev-4.19-android.patch && \
|
||||||
make install
|
make install
|
||||||
|
|
||||||
WORKDIR /root/build
|
WORKDIR /root/build
|
||||||
RUN curl -L -O http://zlib.net/zlib-1.2.8.tar.gz && \
|
RUN curl -L -O https://downloads.sourceforge.net/project/libpng/zlib/$ZLIB_VERSION/zlib-$ZLIB_VERSION.tar.gz && \
|
||||||
tar xf zlib-1.2.8.tar.gz && \
|
tar xf zlib-$ZLIB_VERSION.tar.gz && \
|
||||||
rm zlib-1.2.8.tar.gz
|
rm zlib-$ZLIB_VERSION.tar.gz
|
||||||
|
|
||||||
WORKDIR /root/build/zlib-1.2.8
|
WORKDIR /root/build/zlib-$ZLIB_VERSION
|
||||||
RUN HOST=arm-linux-androideabi \
|
RUN HOST=arm-linux-androideabi \
|
||||||
CC=$HOST-gcc \
|
CC=$HOST-gcc \
|
||||||
AR=$HOST-ar \
|
AR=$HOST-ar \
|
||||||
|
@ -105,11 +113,26 @@ RUN HOST=arm-linux-androideabi \
|
||||||
--static && \
|
--static && \
|
||||||
make install
|
make install
|
||||||
|
|
||||||
|
|
||||||
WORKDIR /root/build
|
WORKDIR /root/build
|
||||||
RUN git clone https://github.com/nghttp2/nghttp2
|
RUN curl -L -O https://c-ares.haxx.se/download/c-ares-$CARES_VERSION.tar.gz && \
|
||||||
|
tar xf c-ares-$CARES_VERSION.tar.gz && \
|
||||||
|
rm c-ares-$CARES_VERSION.tar.gz
|
||||||
|
|
||||||
|
WORKDIR /root/build/c-ares-$CARES_VERSION
|
||||||
|
RUN ./configure \
|
||||||
|
--host=arm-linux-androideabi \
|
||||||
|
--build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
|
||||||
|
--prefix=$PREFIX \
|
||||||
|
--disable-shared && \
|
||||||
|
make install
|
||||||
|
|
||||||
|
WORKDIR /root/build
|
||||||
|
RUN git clone https://github.com/nghttp2/nghttp2 -b $NGHTTP2_VERSION --depth 1
|
||||||
WORKDIR /root/build/nghttp2
|
WORKDIR /root/build/nghttp2
|
||||||
RUN autoreconf -i && \
|
RUN autoreconf -i && \
|
||||||
./configure \
|
./configure \
|
||||||
|
--enable-app \
|
||||||
--disable-shared \
|
--disable-shared \
|
||||||
--host=arm-linux-androideabi \
|
--host=arm-linux-androideabi \
|
||||||
--build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
|
--build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
|
||||||
|
@ -118,11 +141,10 @@ RUN autoreconf -i && \
|
||||||
--disable-python-bindings \
|
--disable-python-bindings \
|
||||||
--disable-examples \
|
--disable-examples \
|
||||||
--disable-threads \
|
--disable-threads \
|
||||||
LIBSPDYLAY_CFLAGS=-I$PREFIX/usr/local/include \
|
CC="$TOOLCHAIN"/bin/arm-linux-androideabi-clang \
|
||||||
LIBSPDYLAY_LIBS="-L$PREFIX/usr/local/lib -lspdylay" \
|
CXX="$TOOLCHAIN"/bin/arm-linux-androideabi-clang++ \
|
||||||
CPPFLAGS="-fPIE -I$PREFIX/include" \
|
CPPFLAGS="-fPIE -I$PREFIX/include" \
|
||||||
CXXFLAGS="-fno-strict-aliasing" \
|
PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
|
||||||
PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
|
LDFLAGS="-fPIE -pie -L$PREFIX/lib" && \
|
||||||
LDFLAGS="-fPIE -pie -L$PREFIX/lib" && \
|
|
||||||
make && \
|
make && \
|
||||||
arm-linux-androideabi-strip src/nghttpx src/nghttpd src/nghttp
|
arm-linux-androideabi-strip src/nghttpx src/nghttpd src/nghttp
|
||||||
|
|
Loading…
Reference in New Issue