From 8fc16a77d511a4f0c00d0b0d24e575fe7673e4c8 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Fri, 17 May 2024 15:07:20 -0700 Subject: Packaging: added missing build dependencies to Makefiles Forgotten in bf3d5759e and 260494626. --- pkg/rpm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/rpm/Makefile') diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index 1f3bbd58..5d28fb2c 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -28,7 +28,7 @@ else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 39'`; echo $$?),0) OSVER = fedora39 endif -BUILD_DEPENDS_unit = gcc rpm-build rpmlint +BUILD_DEPENDS_unit = gcc rpm-build rpmlint clang llvm ifeq ($(OSVER), centos7) BUILD_DEPENDS_unit += which -- cgit From 804a12fed0f1c534412f687f89e101b5cb5b97c8 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Mon, 20 May 2024 12:52:02 -0700 Subject: Packages: remove support for EOL Fedora versions (35-38) --- pkg/rpm/Makefile | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'pkg/rpm/Makefile') diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index 5d28fb2c..dad76e83 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -20,10 +20,6 @@ else ifeq ($(shell rpm --eval "%{?amzn}"), 2) OSVER = amazonlinux2 else ifeq ($(shell rpm --eval "%{?amzn}"), 2023) OSVER = amazonlinux2023 -else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 35 -a 0%{?fedora} -le 36'`; echo $$?),0) -OSVER = fedora -else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 37 -a 0%{?fedora} -le 38'`; echo $$?),0) -OSVER = fedora37 else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 39'`; echo $$?),0) OSVER = fedora39 endif @@ -102,30 +98,6 @@ include Makefile.jsc17 include Makefile.wasm endif -ifeq ($(OSVER), fedora) -include Makefile.php -include Makefile.python310 -include Makefile.go -include Makefile.perl -include Makefile.ruby -include Makefile.jsc-common -include Makefile.jsc8 -include Makefile.jsc11 -include Makefile.wasm -endif - -ifeq ($(OSVER), fedora37) -include Makefile.php -include Makefile.python311 -include Makefile.go -include Makefile.perl -include Makefile.ruby -include Makefile.jsc-common -include Makefile.jsc8 -include Makefile.jsc11 -include Makefile.wasm -endif - ifeq ($(OSVER), fedora39) include Makefile.php include Makefile.python312 -- cgit From 63fb95ed5fb6dfa4a0ee492ec11a6e72997f289b Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Tue, 18 Jun 2024 09:50:47 -0700 Subject: Packages: removed CentOS 7 due to EOL --- pkg/rpm/Makefile | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'pkg/rpm/Makefile') diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index dad76e83..f00b336a 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -10,9 +10,7 @@ RELEASE ?= $(DEFAULT_RELEASE) PACKAGE_VENDOR = NGINX Packaging -ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 7 -a 0%{?amzn} -eq 0'`; echo $$?), 0) -OSVER = centos7 -else ifeq ($(shell rpm --eval "%{?rhel}"), 8) +ifeq ($(shell rpm --eval "%{?rhel}"), 8) OSVER = centos8 else ifeq ($(shell rpm --eval "%{?rhel}"), 9) OSVER = centos9 @@ -26,10 +24,6 @@ endif BUILD_DEPENDS_unit = gcc rpm-build rpmlint clang llvm -ifeq ($(OSVER), centos7) -BUILD_DEPENDS_unit += which -endif - ifneq (,$(findstring $(OSVER),amazonlinux2)) BUILD_DEPENDS_unit += libxml2 libxslt openssl11-devel else @@ -40,17 +34,6 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= -ifeq ($(OSVER), centos7) -include Makefile.php -include Makefile.python27 -include Makefile.python36 -include Makefile.go -include Makefile.perl -include Makefile.jsc-common -include Makefile.jsc8 -include Makefile.jsc11 -endif - ifeq ($(OSVER), centos8) include Makefile.php include Makefile.python27 -- cgit