mirror of
https://github.com/docker-library/haproxy.git
synced 2026-11-20 21:29:04 +03:00
Apply the canonical backported ebtree patch from upstream
This commit is contained in:
1 parent
908197803a
commit
461dcbfa85
3 files changed
+11
-6
No files matched your search
@@ -16,6 +16,7 @@ RUN set -x \
|
||||
make \
|
||||
openssl \
|
||||
openssl-dev \
|
||||
patch \
|
||||
pcre2-dev \
|
||||
readline-dev \
|
||||
tar \
|
||||
@@ -27,9 +28,10 @@ RUN set -x \
|
||||
&& tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1 \
|
||||
&& rm haproxy.tar.gz \
|
||||
# https://github.com/haproxy/haproxy/issues/760 ("ebtree/ebtree.c:43:2: error: unknown type name 'ssize_t'; did you mean 'size_t'?")
|
||||
&& ! grep -qF 'unistd.h' /usr/src/haproxy/ebtree/ebtree.c \
|
||||
&& awk '$1 == "#include" && !inc { print "#include <unistd.h>"; inc = 1 } { print }' /usr/src/haproxy/ebtree/ebtree.c > ebtree.c \
|
||||
&& mv ebtree.c /usr/src/haproxy/ebtree/ebtree.c \
|
||||
# ebtree patch/fix: https://git.haproxy.org/?p=haproxy-2.0.git;a=commit;h=5df32b51bb0c3c89b503d04cd7d31bdd77932370
|
||||
&& wget -O ebtree.patch 'https://git.haproxy.org/?p=haproxy-2.0.git;a=patch;h=5df32b51bb0c3c89b503d04cd7d31bdd77932370' \
|
||||
&& patch -p1 --input="$PWD/ebtree.patch" --directory=/usr/src/haproxy \
|
||||
&& rm ebtree.patch \
|
||||
\
|
||||
&& makeOpts=' \
|
||||
TARGET=linux-glibc \
|
||||
|
||||
@@ -16,6 +16,7 @@ RUN set -x \
|
||||
make \
|
||||
openssl \
|
||||
openssl-dev \
|
||||
patch \
|
||||
pcre2-dev \
|
||||
readline-dev \
|
||||
tar \
|
||||
@@ -27,9 +28,10 @@ RUN set -x \
|
||||
&& tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1 \
|
||||
&& rm haproxy.tar.gz \
|
||||
# https://github.com/haproxy/haproxy/issues/760 ("ebtree/ebtree.c:43:2: error: unknown type name 'ssize_t'; did you mean 'size_t'?")
|
||||
&& ! grep -qF 'unistd.h' /usr/src/haproxy/ebtree/ebtree.c \
|
||||
&& awk '$1 == "#include" && !inc { print "#include <unistd.h>"; inc = 1 } { print }' /usr/src/haproxy/ebtree/ebtree.c > ebtree.c \
|
||||
&& mv ebtree.c /usr/src/haproxy/ebtree/ebtree.c \
|
||||
# ebtree patch/fix: https://git.haproxy.org/?p=haproxy-2.0.git;a=commit;h=5df32b51bb0c3c89b503d04cd7d31bdd77932370
|
||||
&& wget -O ebtree.patch 'https://git.haproxy.org/?p=haproxy-2.0.git;a=patch;h=5df32b51bb0c3c89b503d04cd7d31bdd77932370' \
|
||||
&& patch -p1 --input="$PWD/ebtree.patch" --directory=/usr/src/haproxy \
|
||||
&& rm ebtree.patch \
|
||||
\
|
||||
&& makeOpts=' \
|
||||
TARGET=linux-musl \
|
||||
|
||||
Reference in new issue
Block a user