technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Packages: added libunit-wasm and headers to deb packaging.

Browse Source
This commit is contained in:
Konstantin Pavlov
2023-08-22 14:55:10 -07:00
parent 260494626b
commit bf3d5759eb
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/deb/Makefile
View File

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

4
pkg/deb/debian/control.in
View File

@@ -6,7 +6,9 @@ Build-Depends: debhelper (>= 11),
linux-libc-dev, linux-libc-dev,
libssl-dev, libssl-dev,
libpcre2-dev, libpcre2-dev,
pkg-config pkg-config,
clang,
llvm
Standards-Version: 4.1.4 Standards-Version: 4.1.4
Homepage: https://unit.nginx.org Homepage: https://unit.nginx.org

1
pkg/deb/debian/dirs
View File

@@ -1,4 +1,5 @@
usr/bin usr/bin
usr/sbin usr/sbin
usr/lib/unit usr/lib/unit
usr/include/unit
var/lib/unit var/lib/unit

10
pkg/deb/debian/rules.in
View File

@@ -25,6 +25,11 @@ njs:
cd pkg/contrib && make .njs cd pkg/contrib && make .njs
touch $@ touch $@
libunit-wasm:
dh_testdir
cd pkg/contrib && make .libunit-wasm
touch $@
config.env.%: njs config.env.%: njs
dh_testdir dh_testdir
mkdir -p $(BUILDDIR_$*) mkdir -p $(BUILDDIR_$*)
@@ -92,7 +97,7 @@ build-arch: build-arch.unit build-arch.unit_debug
dh_testdir dh_testdir
touch $@ touch $@
build: build-arch build-indep build: build-arch build-indep libunit-wasm
dh_testdir dh_testdir
touch $@ touch $@
@@ -123,6 +128,9 @@ install: build do.tests
install -m 644 README.md $(INSTALLDIR)/usr/share/doc/unit/ install -m 644 README.md $(INSTALLDIR)/usr/share/doc/unit/
install -m 644 CONTRIBUTING.md $(INSTALLDIR)/usr/share/doc/unit/ install -m 644 CONTRIBUTING.md $(INSTALLDIR)/usr/share/doc/unit/
install -m 644 NOTICE $(INSTALLDIR)/usr/share/doc/unit/ install -m 644 NOTICE $(INSTALLDIR)/usr/share/doc/unit/
mkdir -p $(INSTALLDIR_dev)/usr/include/unit
install -m644 $(CURDIR)/pkg/contrib/libunit-wasm/src/c/libunit-wasm.a $(INSTALLDIR_dev)/usr/lib/$(DEB_HOST_MULTIARCH)/libunit-wasm.a
install -m644 $(CURDIR)/pkg/contrib/libunit-wasm/src/c/include/unit/unit-wasm.h $(INSTALLDIR_dev)/usr/include/unit/
binary-indep: build install binary-indep: build install
dh_testdir dh_testdir