From 2ac4a7527de8fb7ce8cfac05563a542078d65f4b Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Fri, 4 Nov 2022 16:52:19 +0400
Subject: Packages: relaxed dependencies between modules and base package. This
 allows us to update base or single modules packages without updating the
 whole set.

---
 pkg/deb/debian/control.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkg/deb/debian')

diff --git a/pkg/deb/debian/control.in b/pkg/deb/debian/control.in
index 691bafed..acf834bc 100644
--- a/pkg/deb/debian/control.in
+++ b/pkg/deb/debian/control.in
@@ -14,6 +14,7 @@ Section: admin
 Architecture: any
 Depends: lsb-base,
          ${misc:Depends}, ${shlibs:Depends}
+Provides: unit-r%%UNIT_VERSION%%
 Description: NGINX Unit
  NGINX Unit is a runtime and delivery environment for modern distributed
  applications. It runs the application code in multiple languages
-- 
cgit 


From 24e3f171029da265ee8cc20fe1a8846a0b49cb43 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Wed, 7 Dec 2022 18:20:44 -0800
Subject: Packages: added njs support.

---
 pkg/deb/debian/control.in | 3 ++-
 pkg/deb/debian/rules.in   | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'pkg/deb/debian')

diff --git a/pkg/deb/debian/control.in b/pkg/deb/debian/control.in
index acf834bc..579f41e3 100644
--- a/pkg/deb/debian/control.in
+++ b/pkg/deb/debian/control.in
@@ -5,7 +5,8 @@ Maintainer: %%PACKAGE_VENDOR%%
 Build-Depends: debhelper (>= 11),
                linux-libc-dev,
                libssl-dev,
-               libpcre2-dev
+               libpcre2-dev,
+               pkg-config
 Standards-Version: 4.1.4
 Homepage: https://unit.nginx.org
 
diff --git a/pkg/deb/debian/rules.in b/pkg/deb/debian/rules.in
index d2e34796..23812926 100644
--- a/pkg/deb/debian/rules.in
+++ b/pkg/deb/debian/rules.in
@@ -20,7 +20,12 @@ BASEDIR = $(CURDIR)
 
 DOTESTS = 0
 
-config.env.%:
+njs:
+	dh_testdir
+	cd pkg/contrib && make .njs
+	touch $@
+
+config.env.%: njs
 	dh_testdir
 	mkdir -p $(BUILDDIR_$*)
 	cp -Pa $(CURDIR)/auto $(BUILDDIR_$*)/
@@ -40,6 +45,7 @@ config.env.%:
 
 configure.unit: config.env.unit
 	cd $(BUILDDIR_unit) && \
+	PKG_CONFIG_PATH=$(CURDIR)/pkg/contrib/njs/build \
 	CFLAGS= ./configure \
 		%%CONFIGURE_ARGS%% \
 		--modules=/usr/lib/unit/modules \
@@ -50,6 +56,7 @@ configure.unit: config.env.unit
 
 configure.unit_debug: config.env.unit_debug
 	cd $(BUILDDIR_unit_debug) && \
+	PKG_CONFIG_PATH=$(CURDIR)/pkg/contrib/njs/build \
 	CFLAGS= ./configure \
 		%%CONFIGURE_ARGS%% \
 		--modules=/usr/lib/unit/debug-modules \
-- 
cgit