Packages: added wasm module packaging for rpm-based distros.
This commit is contained in:
@@ -64,6 +64,7 @@ include Makefile.perl
|
|||||||
include Makefile.jsc-common
|
include Makefile.jsc-common
|
||||||
include Makefile.jsc8
|
include Makefile.jsc8
|
||||||
include Makefile.jsc11
|
include Makefile.jsc11
|
||||||
|
include Makefile.wasm
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OSVER), centos9)
|
ifeq ($(OSVER), centos9)
|
||||||
@@ -74,6 +75,7 @@ include Makefile.perl
|
|||||||
include Makefile.jsc-common
|
include Makefile.jsc-common
|
||||||
include Makefile.jsc8
|
include Makefile.jsc8
|
||||||
include Makefile.jsc11
|
include Makefile.jsc11
|
||||||
|
include Makefile.wasm
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OSVER), amazonlinux2)
|
ifeq ($(OSVER), amazonlinux2)
|
||||||
@@ -84,6 +86,7 @@ include Makefile.go
|
|||||||
include Makefile.perl
|
include Makefile.perl
|
||||||
include Makefile.jsc-common
|
include Makefile.jsc-common
|
||||||
include Makefile.jsc8
|
include Makefile.jsc8
|
||||||
|
include Makefile.wasm
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OSVER), amazonlinux2023)
|
ifeq ($(OSVER), amazonlinux2023)
|
||||||
@@ -94,6 +97,7 @@ include Makefile.go
|
|||||||
include Makefile.perl
|
include Makefile.perl
|
||||||
include Makefile.jsc-common
|
include Makefile.jsc-common
|
||||||
include Makefile.jsc17
|
include Makefile.jsc17
|
||||||
|
include Makefile.wasm
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OSVER), fedora)
|
ifeq ($(OSVER), fedora)
|
||||||
@@ -105,6 +109,7 @@ include Makefile.ruby
|
|||||||
include Makefile.jsc-common
|
include Makefile.jsc-common
|
||||||
include Makefile.jsc8
|
include Makefile.jsc8
|
||||||
include Makefile.jsc11
|
include Makefile.jsc11
|
||||||
|
include Makefile.wasm
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OSVER), fedora37)
|
ifeq ($(OSVER), fedora37)
|
||||||
@@ -116,6 +121,7 @@ include Makefile.ruby
|
|||||||
include Makefile.jsc-common
|
include Makefile.jsc-common
|
||||||
include Makefile.jsc8
|
include Makefile.jsc8
|
||||||
include Makefile.jsc11
|
include Makefile.jsc11
|
||||||
|
include Makefile.wasm
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CONFIGURE_ARGS_COMMON=\
|
CONFIGURE_ARGS_COMMON=\
|
||||||
@@ -216,6 +222,7 @@ rpmbuild/SPECS/unit-%.spec: unit.module.spec.in ../../docs/changes.xml | rpmbuil
|
|||||||
done ; \
|
done ; \
|
||||||
pkgname=$(shell echo $@ | cut -d '/' -f 3 | tr '_' '-' | cut -d '.' -f 1) ; \
|
pkgname=$(shell echo $@ | cut -d '/' -f 3 | tr '_' '-' | cut -d '.' -f 1) ; \
|
||||||
definitions=`echo "$$MODULE_DEFINITIONS_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
|
definitions=`echo "$$MODULE_DEFINITIONS_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
|
||||||
|
prebuild=`echo "$$MODULE_PREBUILD_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
|
||||||
preinstall=`echo "$$MODULE_PREINSTALL_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
|
preinstall=`echo "$$MODULE_PREINSTALL_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
|
||||||
postinstall=`echo "$$MODULE_POSTINSTALL_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
|
postinstall=`echo "$$MODULE_POSTINSTALL_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
|
||||||
files=`echo "$$MODULE_FILES_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
|
files=`echo "$$MODULE_FILES_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
|
||||||
@@ -234,6 +241,7 @@ rpmbuild/SPECS/unit-%.spec: unit.module.spec.in ../../docs/changes.xml | rpmbuil
|
|||||||
-e "s#%%MODULE_MAKEARGS%%#$(MODULE_MAKEARGS_$*)#g" \
|
-e "s#%%MODULE_MAKEARGS%%#$(MODULE_MAKEARGS_$*)#g" \
|
||||||
-e "s#%%MODULE_INSTARGS%%#$(MODULE_INSTARGS_$*)#g" \
|
-e "s#%%MODULE_INSTARGS%%#$(MODULE_INSTARGS_$*)#g" \
|
||||||
-e "s#%%MODULE_DEFINITIONS%%#$${definitions}#g" \
|
-e "s#%%MODULE_DEFINITIONS%%#$${definitions}#g" \
|
||||||
|
-e "s#%%MODULE_PREBUILD%%#$${prebuild}#g" \
|
||||||
-e "s#%%MODULE_PREINSTALL%%#$${preinstall}#g" \
|
-e "s#%%MODULE_PREINSTALL%%#$${preinstall}#g" \
|
||||||
-e "s#%%MODULE_POSTINSTALL%%#$${postinstall}#g" \
|
-e "s#%%MODULE_POSTINSTALL%%#$${postinstall}#g" \
|
||||||
-e "s#%%MODULE_FILES%%#$${files}#g" \
|
-e "s#%%MODULE_FILES%%#$${files}#g" \
|
||||||
|
|||||||
51
pkg/rpm/Makefile.wasm
Normal file
51
pkg/rpm/Makefile.wasm
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
MODULES+= wasm
|
||||||
|
MODULE_SUFFIX_wasm= wasm
|
||||||
|
|
||||||
|
MODULE_SUMMARY_wasm= WASM module for NGINX Unit
|
||||||
|
|
||||||
|
MODULE_VERSION_wasm= $(VERSION)
|
||||||
|
MODULE_RELEASE_wasm= 1
|
||||||
|
|
||||||
|
MODULE_CONFARGS_wasm= wasm --include-path=\`pwd\`/pkg/contrib/wasmtime/crates/c-api/include --lib-path=\`pwd\`/pkg/contrib/wasmtime/target/release
|
||||||
|
MODULE_MAKEARGS_wasm= wasm
|
||||||
|
MODULE_INSTARGS_wasm= wasm-install
|
||||||
|
|
||||||
|
MODULE_SOURCES_wasm=
|
||||||
|
|
||||||
|
BUILD_DEPENDS_wasm=
|
||||||
|
|
||||||
|
BUILD_DEPENDS+= $(BUILD_DEPENDS_wasm)
|
||||||
|
|
||||||
|
define MODULE_PREBUILD_wasm
|
||||||
|
%{__make} -C pkg/contrib .wasmtime
|
||||||
|
endef
|
||||||
|
export MODULE_PREBUILD_wasm
|
||||||
|
|
||||||
|
define MODULE_PREINSTALL_wasm
|
||||||
|
endef
|
||||||
|
export MODULE_PREINSTALL_wasm
|
||||||
|
|
||||||
|
define MODULE_POSTINSTALL_wasm
|
||||||
|
%{__install} -m 755 -p pkg/contrib/wasmtime/target/release/libwasmtime.so %{buildroot}%{_libdir}/
|
||||||
|
endef
|
||||||
|
export MODULE_POSTINSTALL_wasm
|
||||||
|
|
||||||
|
define MODULE_FILES_wasm
|
||||||
|
%{_libdir}/libwasmtime.so
|
||||||
|
%{_libdir}/unit/modules/*
|
||||||
|
%{_libdir}/unit/debug-modules/*
|
||||||
|
endef
|
||||||
|
export MODULE_FILES_wasm
|
||||||
|
|
||||||
|
define MODULE_POST_wasm
|
||||||
|
cat <<BANNER
|
||||||
|
----------------------------------------------------------------------
|
||||||
|
|
||||||
|
The $(MODULE_SUMMARY_wasm) has been installed.
|
||||||
|
|
||||||
|
Online documentation is available at https://unit.nginx.org
|
||||||
|
|
||||||
|
----------------------------------------------------------------------
|
||||||
|
BANNER
|
||||||
|
endef
|
||||||
|
export MODULE_POST_wasm
|
||||||
@@ -59,6 +59,7 @@ This package contains %%SUMMARY%%.
|
|||||||
tar --strip-components=1 -zxf %{SOURCE0}
|
tar --strip-components=1 -zxf %{SOURCE0}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%%MODULE_PREBUILD%%
|
||||||
./configure \
|
./configure \
|
||||||
%{CONFIGURE_ARGS} \
|
%{CONFIGURE_ARGS} \
|
||||||
--modulesdir=%{_libdir}/unit/debug-modules \
|
--modulesdir=%{_libdir}/unit/debug-modules \
|
||||||
|
|||||||
Reference in New Issue
Block a user