diff options
| author | Andrei Belov <defan@nginx.com> | 2020-05-28 18:13:06 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2020-05-28 18:13:06 +0300 |
| commit | 733c14e991d6b2d5bdae5202ae9f090d022bc956 (patch) | |
| tree | 120562db5d30e5f4f51d001397f765f5cebab999 /pkg/deb | |
| parent | 6a8d4571d7fc89a951b4da80c39a93fcaa634406 (diff) | |
| parent | 9d8e476c4e3695019b0a1fe3696d3411a8393de6 (diff) | |
| download | unit-733c14e991d6b2d5bdae5202ae9f090d022bc956.tar.gz unit-733c14e991d6b2d5bdae5202ae9f090d022bc956.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to '')
| -rw-r--r-- | pkg/deb/Makefile | 12 | ||||
| -rw-r--r-- | pkg/deb/Makefile.jsc-common | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 797ff438..55bf7082 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -16,6 +16,18 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= +# Ubuntu 20.04 +ifeq ($(CODENAME),focal) +include Makefile.php +include Makefile.python27 +include Makefile.python38 +include Makefile.go +include Makefile.perl +include Makefile.ruby +include Makefile.jsc-common +include Makefile.jsc11 +endif + # Ubuntu 19.10 ifeq ($(CODENAME),eoan) include Makefile.php diff --git a/pkg/deb/Makefile.jsc-common b/pkg/deb/Makefile.jsc-common index 42b4ad74..928376c3 100644 --- a/pkg/deb/Makefile.jsc-common +++ b/pkg/deb/Makefile.jsc-common @@ -6,7 +6,7 @@ MODULE_SUMMARY_jsc_common= Java shared packages for NGINX Unit MODULE_VERSION_jsc_common= $(VERSION) MODULE_RELEASE_jsc_common= 1 -ifneq (,$(findstring $(CODENAME),eoan disco buster)) +ifneq (,$(findstring $(CODENAME),focal eoan disco buster)) JAVA_MINVERSION= 11 else JAVA_MINVERSION= 8 |