diff --git a/Dockerfile b/Dockerfile index 18a61a48..8ba22596 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,11 +9,11 @@ RUN apk update && \ git \ binutils cunit-dev ENV PREFIX=/opt/curl -ENV PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH +ENV PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig:$PREFIX/lib64/pkgconfig:$PKG_CONFIG_PATH RUN git clone --depth 1 -b openssl-3.0.8+quic https://github.com/quictls/openssl && \ cd openssl && \ - mkdir -p "${PREFIX}/lib/" "${PREFIX}/include/" && \ + mkdir -p "${PREFIX}/lib/" "${PREFIX}/lib64/" "${PREFIX}/include/" && \ ./config -fPIC --prefix="${PREFIX}" \ threads no-shared enable-tls1_3 && \ make -j $(nproc) && \ @@ -32,9 +32,9 @@ RUN git clone -b v0.11.0 https://github.com/ngtcp2/nghttp3 && \ RUN git clone -b v0.15.0 https://github.com/ngtcp2/ngtcp2 && \ cd ngtcp2 && \ autoreconf -i --force && \ - PKG_CONFIG="pkg-config --static --with-path=${PREFIX}/lib/pkgconfig" \ - ./configure --prefix="${PREFIX}" --enable-static --with-openssl \ - --with-libnghttp3 --enable-lib-only --enable-shared=no && \ + PKG_CONFIG="pkg-config --static --with-path=${PREFIX}/lib/pkgconfig:${PREFIX}/lib64/pkgconfig" \ + ./configure --prefix="${PREFIX}" --enable-static --with-openssl=${PREFIX} \ + --with-libnghttp3=${PREFIX} --enable-lib-only --enable-shared=no && \ make -j $(nproc) check && \ make install && \ cd .. @@ -57,7 +57,7 @@ RUN git clone https://github.com/curl/curl && \ --disable-shared --enable-static \ --with-openssl \ --with-nghttp2 --with-nghttp3 --with-ngtcp2 && \ - make -j$(nproc) V=1 LDFLAGS="-L${PREFIX}/lib -static -all-static" CFLAGS="-O3" && \ + make -j$(nproc) V=1 LDFLAGS="-L${PREFIX}/lib -L${PREFIX}/lib64 -static -all-static" CFLAGS="-O3" && \ make install && \ cd ..