Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

V2.x fedora37 #4058

Merged
merged 2 commits into from
Jan 10, 2023
Merged

V2.x fedora37 #4058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdcb650
add builds for fedora37
mirostauder Dec 16, 2022
5224e48
fix libinjection with clang 15
mirostauder Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ amd64-ubuntu: ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg
amd64-debian: debian8 debian8-dbg debian9 debian9-dbg debian10 debian10-dbg debian11 debian11-clang debian11-dbg
.PHONY: amd64-debian

amd64-fedora: fedora27 fedora27-dbg fedora28 fedora28-dbg fedora33 fedora33-dbg fedora34 fedora34-clang fedora34-dbg fedora36 fedora36-clang fedora36-dbg
amd64-fedora: fedora27 fedora27-dbg fedora28 fedora28-dbg fedora33 fedora33-dbg fedora34 fedora34-clang fedora34-dbg fedora36 fedora36-clang fedora36-dbg fedora37 fedora37-clang fedora37-dbg
.PHONY: amd64-fedora

amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
Expand All @@ -233,7 +233,7 @@ arm64-debian: debian9-arm64 debian10-arm64 debian11-arm64
arm64-ubuntu: ubuntu16-arm64 ubuntu18-arm64 ubuntu20-arm64 ubuntu22-arm64
.PHONY: arm64-ubuntu

arm64-fedora: fedora33-arm64 fedora34-arm64
arm64-fedora: fedora33-arm64 fedora34-arm64 fedora36-arm64 fedora37-arm64
.PHONY: arm64-fedora

arm64-opensuse: opensuse15-arm64
Expand Down Expand Up @@ -326,6 +326,19 @@ fedora36-dbg: binaries/proxysql-${CURVER}-1-dbg-fedora36.x86_64.rpm
.PHONY: fedora36-dbg


fedora37: binaries/proxysql-${CURVER}-1-fedora37.x86_64.rpm
.PHONY: fedora36

fedora37-arm64: binaries/proxysql-${CURVER}-1-fedora37.aarch64.rpm
.PHONY: fedora36-arm64

fedora37-clang: binaries/proxysql-${CURVER}-1-fedora37-clang.x86_64.rpm
.PHONY: fedora36-clang

fedora37-dbg: binaries/proxysql-${CURVER}-1-dbg-fedora37.x86_64.rpm
.PHONY: fedora36-dbg


ubuntu14: binaries/proxysql_${CURVER}-ubuntu14_amd64.deb
.PHONY: ubuntu14

Expand Down Expand Up @@ -563,6 +576,23 @@ binaries/proxysql-${CURVER}-1-dbg-fedora36.x86_64.rpm:
docker-compose rm -f


binaries/proxysql-${CURVER}-1-fedora37.x86_64.rpm:
docker-compose up fedora37_build
docker-compose rm -f

binaries/proxysql-${CURVER}-1-fedora37.aarch64.rpm:
docker-compose up fedora37_build
docker-compose rm -f

binaries/proxysql-${CURVER}-1-fedora37-clang.x86_64.rpm:
docker-compose up fedora37_clang_build
docker-compose rm -f

binaries/proxysql-${CURVER}-1-dbg-fedora37.x86_64.rpm:
docker-compose up fedora37_dbg_build
docker-compose rm -f


binaries/proxysql_${CURVER}-ubuntu14_amd64.deb:
docker-compose up ubuntu14_build
docker-compose rm -f
Expand Down
1 change: 1 addition & 0 deletions deps/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ libinjection/libinjection/src/libinjection.a:
cd libinjection && tar -zxf libinjection-3.10.0.tar.gz
ifneq ($(CENTOSVER),6)
cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff
cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch
endif
ifeq ($(UNAME_S),Darwin)
sed -i '' 's/CC=/CC?=/' libinjection/libinjection/src/Makefile
Expand Down
11 changes: 11 additions & 0 deletions deps/libinjection/libinjection_sqli.c.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/src/libinjection_sqli.c 2017-05-21 20:44:26.000000000 +0000
+++ b/src/libinjection_sqli.c 2022-12-16 10:36:23.632259768 +0000
@@ -1197,7 +1197,7 @@
* without having to regenerated the SWIG (or other binding) in minor
* releases.
*/
-const char* libinjection_version()
+const char* libinjection_version(void)
{
return LIBINJECTION_VERSION;
}
30 changes: 30 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,36 @@ services:
- PKG_RELEASE=dbg-fedora36
- PROXYSQL_BUILD_TYPE=debug

####################################################################################################
fedora37_build:
image: proxysql/packaging:build-fedora37
volumes:
- ./docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/:/root/rpmbuild/
- ./docker/images/proxysql/rhel-compliant/rpmmacros/.rpmmacros:/root/.rpmmacros
- ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/
- ./:/opt/proxysql/
environment:
- MAKE
- MAKEOPT
- CURVER
- PKG_RELEASE=fedora37
- PROXYSQL_BUILD_TYPE=clickhouse
command: bash -l -c /opt/entrypoint/entrypoint.bash

fedora37_clang_build:
extends:
service: fedora37_build
image: proxysql/packaging:build-clang-fedora37
environment:
- PKG_RELEASE=fedora37-clang
- PROXYSQL_BUILD_TYPE=clickhouse

fedora37_dbg_build:
extends:
service: fedora37_build
environment:
- PKG_RELEASE=dbg-fedora37
- PROXYSQL_BUILD_TYPE=debug

####################################################################################################
####################################################################################################
Expand Down