emo/haproxy
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Upgrade 2.7-dev to f9de4e9

Browse Source 
And tweak out MAKEARGS for Darwin builds to pass fully
This commit is contained in:
Tristan 2022-06-25 04:10:42 +01:00
parent 908852a35d
commit 9755b6a860
No known key found for this signature in database
GPG Key ID: BDDFC4A0651ACDE4
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -16,8 +16,8 @@ variables: &default-variables
.haproxy_dev: &haproxy-dev .haproxy_dev: &haproxy-dev
HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy.git" HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy.git"
HAPROXY_VERSION: 2.7-dev HAPROXY_VERSION: 2.7-dev
# https://git.haproxy.org/?p=haproxy.git;a=commit;h=2bed1f166e0f4fd865007a8ad86be7263b019427 # https://git.haproxy.org/?p=haproxy.git;a=commit;h=f9de4e9fae3877f92be7475e898c8c560c2e8e4d
HAPROXY_GITREF: 2bed1f166e0f4fd865007a8ad86be7263b019427 HAPROXY_GITREF: f9de4e9fae3877f92be7475e898c8c560c2e8e4d
.build-job: &build-job .build-job: &build-job
image: registry.gitlab.com/mangadex-pub/debuilder/buster:main image: registry.gitlab.com/mangadex-pub/debuilder/buster:main

32
haproxy/Makefile
View File

@ -35,22 +35,29 @@ MAKEARGS = DEBUG="-DDEBUG_MEMORY_POOLS -DDEBUG_STRICT" \
LUA_INC="$(DEP_DIST_ROOT_LUA)/include" \ LUA_INC="$(DEP_DIST_ROOT_LUA)/include" \
LUA_LIB="$(DEP_DIST_ROOT_LUA)/lib" \ LUA_LIB="$(DEP_DIST_ROOT_LUA)/lib" \
LUA_LIB_NAME="lua" \ LUA_LIB_NAME="lua" \
USE_NS=1 \
USE_OPENSSL=1 \ USE_OPENSSL=1 \
SSL_INC="$(DEP_DIST_ROOT_QUICTLS)/opt/quictls/include" \ SSL_INC="$(DEP_DIST_ROOT_QUICTLS)/opt/quictls/include" \
SSL_LIB="$(DEP_DIST_ROOT_QUICTLS)/opt/quictls/lib" \ SSL_LIB="$(DEP_DIST_ROOT_QUICTLS)/opt/quictls/lib" \
USE_PCRE2=1 \ USE_PCRE2=1 \
USE_PCRE2_JIT=1 \
USE_STATIC_PCRE2=1 \
PCRE2_INC="$(DEP_DIST_ROOT_PCRE2)/include" \
PCRE2_LIB="$(DEP_DIST_ROOT_PCRE2)/lib64" \
PCRE2_CONFIG="$(DEP_DIST_ROOT_PCRE2)/bin/pcre2-config" \
USE_PROMEX=1 \ USE_PROMEX=1 \
USE_QUIC=1 \ USE_QUIC=1 \
USE_SLZ=1 \ USE_SLZ=1 \
USE_TFO=1 \ USE_TFO=1
MAKEARGS_LINUX = $(MAKEARGS) \
PCRE2_LIB="$(DEP_DIST_ROOT_PCRE2)/lib64" \
PCRE2_INC="$(DEP_DIST_ROOT_PCRE2)/include" \
PCRE2_CONFIG="$(DEP_DIST_ROOT_PCRE2)/bin/pcre2-config" \
USE_PCRE2_JIT=1 \
USE_STATIC_PCRE2=1 \
USE_NS=1 \
USE_SYSTEMD=1 USE_SYSTEMD=1
MAKEARGS_DARWIN = $(MAKEARGS) \
CC=$(shell brew --prefix llvm)/bin/clang \
LD=$(shell brew --prefix llvm)/bin/clang \
TARGET=osx
all: dist-bin all: dist-bin
dist-bin: build $(HAPROXY_DESTDIR) $(HAPROXY_ARCHIVE) dist-bin: build $(HAPROXY_DESTDIR) $(HAPROXY_ARCHIVE)
@ -71,13 +78,13 @@ build: $(HAPROXY_BUILDIR) patches
.PHONY: build_Linux .PHONY: build_Linux
build_Linux: build_Linux:
$(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" $(MAKEARGS) opts $(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" $(MAKEARGS_LINUX) opts
$(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" $(MAKEARGS) $(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" $(MAKEARGS_LINUX)
.PHONY: build_Darwin .PHONY: build_Darwin
build_Darwin: build_Darwin:
BREW_CLANG="$(shell brew --prefix llvm)/bin/clang" && $(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" CC="$${BREW_CLANG}" LD="$${BREW_CLANG}" $(MAKEARGS) TARGET=osx opts $(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" $(MAKEARGS_DARWIN) opts
BREW_CLANG="$(shell brew --prefix llvm)/bin/clang" && $(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" CC="$${BREW_CLANG}" LD="$${BREW_CLANG}" $(MAKEARGS) TARGET=osx $(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" $(MAKEARGS_DARWIN)
# Ignore ssl/ssl_generate_certificate.vtc as it fails and I have no clue why at all # Ignore ssl/ssl_generate_certificate.vtc as it fails and I have no clue why at all
test: $(HAPROXY_BUILDIR) test: $(HAPROXY_BUILDIR)
@ -86,7 +93,8 @@ test: $(HAPROXY_BUILDIR)
$(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" REGTESTS_TYPES=default,bug,devel reg-tests $(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" REGTESTS_TYPES=default,bug,devel reg-tests
$(HAPROXY_DESTDIR): $(HAPROXY_DESTDIR):
@if ! [ -d "$(HAPROXY_DESTDIR)" ]; then mkdir -v "$(HAPROXY_DESTDIR)"; fi @if [ -d "$(HAPROXY_DESTDIR)" ]; then rm -rf $(HAPROXY_DESTDIR); fi
@mkdir -pv "$(HAPROXY_DESTDIR)"
$(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" DESTDIR="$(HAPROXY_DESTDIR_ABS)" install $(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" DESTDIR="$(HAPROXY_DESTDIR_ABS)" install
$(HAPROXY_ARCHIVE): $(HAPROXY_DESTDIR) $(HAPROXY_ARCHIVE): $(HAPROXY_DESTDIR)