diff options
| author | Andrei Belov <defan@nginx.com> | 2019-12-10 19:35:12 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2019-12-10 19:35:12 +0300 |
| commit | 68a22923728ddbbda25bc3ee048520a76056fb33 (patch) | |
| tree | b68aaf2fbd17299d718da3bcf08d1fc5930ce1fd | |
| parent | 55a368e5058451b99600b983f6cb98402fcd57cc (diff) | |
| download | unit-68a22923728ddbbda25bc3ee048520a76056fb33.tar.gz unit-68a22923728ddbbda25bc3ee048520a76056fb33.tar.bz2 | |
Packages: added Python 3 support on Amazon Linux 2 (LTS).
| -rw-r--r-- | pkg/rpm/Makefile | 3 | ||||
| -rw-r--r-- | pkg/rpm/Makefile.python27 | 4 | ||||
| -rw-r--r-- | pkg/rpm/Makefile.python37 | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index 7d9de8ad..39082d34 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -91,7 +91,8 @@ endif ifeq ($(OSVER), amazonlinux2) include Makefile.php -include Makefile.python +include Makefile.python27 +include Makefile.python37 include Makefile.go include Makefile.perl include Makefile.jsc-common diff --git a/pkg/rpm/Makefile.python27 b/pkg/rpm/Makefile.python27 index 19e64d43..079a8512 100644 --- a/pkg/rpm/Makefile.python27 +++ b/pkg/rpm/Makefile.python27 @@ -17,7 +17,7 @@ ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed sles)) BUILD_DEPENDS_python27= python-devel else ifneq (,$(findstring $(OSVER),fedora centos8)) BUILD_DEPENDS_python27= python2-devel -else ifneq (,$(findstring $(OSVER),centos7)) +else ifneq (,$(findstring $(OSVER),centos7 amazonlinux2)) BUILD_DEPENDS_python27= python-devel else BUILD_DEPENDS_python27= python27-devel @@ -26,7 +26,7 @@ endif BUILD_DEPENDS+= $(BUILD_DEPENDS_python27) define MODULE_DEFINITIONS_python27 -%if (0%{?rhel} == 7) +%if (0%{?rhel} == 7) || (0%{?amzn} == 2) Obsoletes: unit-python %endif endef diff --git a/pkg/rpm/Makefile.python37 b/pkg/rpm/Makefile.python37 index ed9462b8..563d4539 100644 --- a/pkg/rpm/Makefile.python37 +++ b/pkg/rpm/Makefile.python37 @@ -13,7 +13,7 @@ MODULE_INSTARGS_python37= python3.7-install MODULE_SOURCES_python37= unit.example-python-app \ unit.example-python37-config -ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora)) +ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora amazonlinux2)) BUILD_DEPENDS_python37= python3-devel else BUILD_DEPENDS_python37= python37-devel |