Skip to content

Commit bf3d575

Browse files
committed
Packages: added libunit-wasm and headers to deb packaging.
1 parent 2604946 commit bf3d575

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

pkg/deb/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ debuild/unit_$(VERSION).orig.tar.gz: | debuild/$(SRCDIR)/debian
241241

242242
unit: check-build-depends-unit debuild/unit_$(VERSION).orig.tar.gz debuild/$(SRCDIR)/debian/changelog
243243
@echo "===> Building $@ package"
244-
cd debuild/$(SRCDIR) && debuild -us -uc
244+
cd debuild/$(SRCDIR) && debuild --preserve-envvar PATH --preserve-envvar RUSTUP_HOME -us -uc
245245
mkdir -p debs
246246
find debuild/ -maxdepth 1 -type f -exec cp {} debs/ \;
247247
ln -s debuild/$(SRCDIR)/build $@
@@ -314,7 +314,7 @@ endif
314314

315315
unit-%: check-build-depends-% | debuild-%
316316
@echo "===> Building $@ package"
317-
cd debuild-$*/$(SRCDIR) && debuild -us -uc
317+
cd debuild-$*/$(SRCDIR) && debuild --preserve-envvar PATH --preserve-envvar RUSTUP_HOME -us -uc
318318
mkdir -p debs
319319
find debuild-$*/ -maxdepth 1 -type f -exec cp {} debs/ \;
320320
ln -s debuild-$*/$(SRCDIR)/build $@

pkg/deb/debian/control.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ Build-Depends: debhelper (>= 11),
66
linux-libc-dev,
77
libssl-dev,
88
libpcre2-dev,
9-
pkg-config
9+
pkg-config,
10+
clang,
11+
llvm
1012
Standards-Version: 4.1.4
1113
Homepage: https://unit.nginx.org
1214

pkg/deb/debian/dirs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
usr/bin
22
usr/sbin
33
usr/lib/unit
4+
usr/include/unit
45
var/lib/unit

pkg/deb/debian/rules.in

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ njs:
2525
cd pkg/contrib && make .njs
2626
touch $@
2727

28+
libunit-wasm:
29+
dh_testdir
30+
cd pkg/contrib && make .libunit-wasm
31+
touch $@
32+
2833
config.env.%: njs
2934
dh_testdir
3035
mkdir -p $(BUILDDIR_$*)
@@ -92,7 +97,7 @@ build-arch: build-arch.unit build-arch.unit_debug
9297
dh_testdir
9398
touch $@
9499

95-
build: build-arch build-indep
100+
build: build-arch build-indep libunit-wasm
96101
dh_testdir
97102
touch $@
98103

@@ -123,6 +128,9 @@ install: build do.tests
123128
install -m 644 README.md $(INSTALLDIR)/usr/share/doc/unit/
124129
install -m 644 CONTRIBUTING.md $(INSTALLDIR)/usr/share/doc/unit/
125130
install -m 644 NOTICE $(INSTALLDIR)/usr/share/doc/unit/
131+
mkdir -p $(INSTALLDIR_dev)/usr/include/unit
132+
install -m644 $(CURDIR)/pkg/contrib/libunit-wasm/src/c/libunit-wasm.a $(INSTALLDIR_dev)/usr/lib/$(DEB_HOST_MULTIARCH)/libunit-wasm.a
133+
install -m644 $(CURDIR)/pkg/contrib/libunit-wasm/src/c/include/unit/unit-wasm.h $(INSTALLDIR_dev)/usr/include/unit/
126134

127135
binary-indep: build install
128136
dh_testdir

0 commit comments

Comments
 (0)