Skip to content

Commit 7357229

Browse files
authored
Merge pull request #4635 from sysown/v2.7.1-add_fedora41
V2.7.1 add fedora41
2 parents 2ec058b + 8c271cd commit 7357229

File tree

3 files changed

+34
-6
lines changed

3 files changed

+34
-6
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ amd64-packages: amd64-centos amd64-ubuntu amd64-debian amd64-fedora amd64-opensu
308308
amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg
309309
amd64-centos: centos7 centos7-dbg centos8 centos8-clang centos8-dbg centos9 centos9-clang centos9-dbg
310310
amd64-debian: debian10 debian10-dbg debian11 debian11-clang debian11-dbg debian12 debian12-clang debian12-dbg
311-
amd64-fedora: fedora38 fedora38-clang fedora38-dbg fedora39 fedora39-clang fedora39-dbg fedora40 fedora40-clang fedora40-dbg
311+
amd64-fedora: fedora38 fedora38-clang fedora38-dbg fedora39 fedora39-clang fedora39-dbg fedora40 fedora40-clang fedora40-dbg fedora41 fedora41-clang fedora41-dbg
312312
amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
313313
amd64-ubuntu: ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg ubuntu22 ubuntu22-clang ubuntu22-dbg ubuntu24 ubuntu24-clang ubuntu24-dbg
314314

docker-compose.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,34 @@ services:
178178
- PKG_RELEASE=dbg-fedora40
179179
- PROXYSQL_BUILD_TYPE=debug
180180

181+
####################################################################################################
182+
fedora41_build:
183+
extends:
184+
service: _build
185+
image: proxysql/packaging:build-fedora41-v2.7.1
186+
volumes:
187+
- ./docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/:/root/rpmbuild/
188+
- ./docker/images/proxysql/rhel-compliant/rpmmacros/.rpmmacros:/root/.rpmmacros
189+
- ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/
190+
- ./:/opt/proxysql/
191+
environment:
192+
- PKG_RELEASE=fedora41
193+
- PROXYSQL_BUILD_TYPE=clickhouse
194+
195+
fedora41_clang_build:
196+
extends:
197+
service: fedora41_build
198+
image: proxysql/packaging:build-clang-fedora41-v2.7.1
199+
environment:
200+
- PKG_RELEASE=fedora41-clang
201+
202+
fedora41_dbg_build:
203+
extends:
204+
service: fedora41_build
205+
environment:
206+
- PKG_RELEASE=dbg-fedora41
207+
- PROXYSQL_BUILD_TYPE=debug
208+
181209
####################################################################################################
182210
####################################################################################################
183211
debian10_build:

src/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ STDCPP := -std=c++$(shell echo $(CPLUSPLUS) | cut -c3-4) -DCXX$(shell echo $(CPL
118118
### handle clang issue https://bugs.llvm.org/show_bug.cgi?id=16404
119119
CLANGFIX :=
120120
ifeq ($(CXX),clang++)
121-
CLANG_VERSION := $(shell clang -dumpversion | tr '.' ' ' | awk '{ printf("%04d.%04d.%04d", $$1, $$2, $$3) }')
122-
CLANG_MIN_VER := $(shell echo 14.0 | tr '.' ' ' | awk '{ printf("%04d.%04d.%04d", $$1, $$2, $$3) }')
123-
ifneq ($(CLANG_MIN_VER),$(firstword $(sort $(CLANG_VERSION) $(CLANG_MIN_VER))))
124-
CLANGFIX := --rtlib=compiler-rt --unwindlib=libgcc
125-
endif
121+
# CLANG_VERSION := $(shell clang -dumpversion | tr '.' ' ' | awk '{ printf("%04d.%04d.%04d", $$1, $$2, $$3) }')
122+
# CLANG_MIN_VER := $(shell echo 14.0 | tr '.' ' ' | awk '{ printf("%04d.%04d.%04d", $$1, $$2, $$3) }')
123+
#ifneq ($(CLANG_MIN_VER),$(firstword $(sort $(CLANG_VERSION) $(CLANG_MIN_VER))))
124+
CLANGFIX := --rtlib=compiler-rt --unwindlib=libgcc
125+
#endif
126126
endif
127127

128128
PSQLCH :=

0 commit comments

Comments
 (0)