Fix dependencies for PCRE2

This commit is contained in:
Tristan 2022-06-06 06:18:58 +01:00
parent 0538df3600
commit 6376218f49
No known key found for this signature in database
GPG Key ID: BDDFC4A0651ACDE4
3 changed files with 8 additions and 11 deletions

3
.dockerignore Normal file
View File

@ -0,0 +1,3 @@
**/dist
**/src
**/*.tar.gz

View File

@ -11,14 +11,12 @@ variables:
needs: [ ]
before_script:
- apt -qq update
- apt install -y --no-install-recommends -qq build-essential ca-certificates curl tar
- apt install -y --no-install-recommends -qq build-essential ca-certificates cmake curl libreadline-dev libsystemd-dev tar
lua:
<<: *build-job
stage: dependencies
script:
- apt -qq update && apt install -qq -y --no-install-recommends libreadline-dev
- make -C deps/lua
script: make -C deps/lua
artifacts:
expire_in: 14 days
paths: [ "deps/lua/dist" ]
@ -26,9 +24,7 @@ lua:
pcre2:
<<: *build-job
stage: dependencies
script:
- apt -qq update && apt install -qq -y --no-install-recommends cmake
- make -C deps/pcre2
script: make -C deps/pcre2
artifacts:
expire_in: 14 days
paths: [ "deps/pcre2/dist" ]
@ -44,9 +40,7 @@ quictls:
haproxy:
<<: *build-job
stage: haproxy
script:
- apt -qq update && apt install -qq -y --no-install-recommends git libsystemd-dev
- make -C haproxy
script: make -C haproxy
needs:
- job: lua
artifacts: true

View File

@ -25,7 +25,7 @@ HAPROXY_MAKE_ARGS := DEBUG="-DDEBUG_STRICT -DDEBUG_MEMORY_POOLS" \
USE_PCRE2_JIT=1 \
USE_STATIC_PCRE2=1 \
PCRE2_INC="../$(DEP_ROOT_PCRE2)/dist/include" \
PCRE2_LIB="../$(DEP_ROOT_PCRE2)/dist/lib64" \
PCRE2_LIB="../$(DEP_ROOT_PCRE2)/dist/lib" \
USE_PROMEX=1 \
USE_QUIC=1 \
USE_SLZ=1 \