This is an automated email from the ASF dual-hosted git repository. ronny pushed a commit to branch add-el10-pkgs in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
commit 902697cea75b31c08131fa5d209ee05a8990af4f Author: Ronny Berndt <[email protected]> AuthorDate: Thu Feb 19 10:29:25 2026 +0100 feat: Add convenience binary packages for el10 --- Makefile | 27 ++++++++++++++++++++++++++- rpm/SPECS/couchdb.spec.in | 13 +++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 321da49..53bfef4 100644 --- a/Makefile +++ b/Makefile @@ -187,6 +187,7 @@ centos-8: centos8 centos8: SPIDERMONKEY=mozjs60 centos8: SPIDERMONKEY_DEV=mozjs60-devel centos8: SM_VER=60 +centos8: JS_ENGINE=spidermonkey centos8: sm-ver-rpm make-rpmbuild centos centos-9: DIST=centos-9 @@ -194,8 +195,14 @@ centos-9: centos9 centos9: SPIDERMONKEY=mozjs78 centos9: SPIDERMONKEY_DEV=mozjs78-devel centos9: SM_VER=78 +centos9: JS_ENGINE=spidermonkey centos9: sm-ver-rpm make-rpmbuild centos +centos-10: DIST=centos-10 +centos-10: centos10 +centos10: JS_ENGINE=quickjs +centos10: sm-ver-rpm make-rpmbuild centos + # Almalinux 8 is a CentOS 8 alias almalinux-8: centos-8 almalinux-8.8: centos-8 @@ -230,6 +237,23 @@ arm64-centos-9: PKGARCH=aarch64 arm64-centos-9: centos-9 ppc64le-centos-9: centos-9 +# Almalinux 10 is a CentOS 10 alias +almalinux-10: centos-10 +almalinux-10.1: centos-10 +aarch64-almalinux-10: PKGARCH=aarch64 +aarch64-almalinux-10: centos-10 +aarch64-almalinux-10.1: PKGARCH=aarch64 +aarch64-almalinux-10.1: centos-10 +# s390x RHEL 10 clone based +s390x-centos-10: centos-10 +ppc64le-centos-10: centos-10 +# s390x RHEL 10 clone based +s390x-centos-10: centos-10 + +arm64-centos-10: PKGARCH=aarch64 +arm64-centos-10: centos-10 +ppc64le-centos-10: centos-10 + # aarch64 RHEL-based aarch64-rhel: DIST=rhel # Needs 68 for aarch compat, we're using the included one here @@ -288,6 +312,7 @@ link-couch-dist: $(eval VERSION := $(shell echo $(VERSION) | sed 's/-/\./')) sm-ver-rpm: + echo "MF: ${DISABLE_SPIDERMONKEY}" sed 's/%SPIDERMONKEY%/$(SPIDERMONKEY)/g;s/%SPIDERMONKEY_DEV%/$(SPIDERMONKEY_DEV)/g;s/%SM_VER%/$(SM_VER)/g' \ rpm/SPECS/couchdb.spec.in > rpm/SPECS/couchdb.spec @@ -299,7 +324,7 @@ make-rpmbuild: # If we don't change $HOME it'll force building in ~/rpmbuild. Boo. build-rpm: $(eval HOME := $(shell readlink -f ..)) - export HOME=$(HOME) && cd ../rpmbuild && rpmbuild --verbose -bb SPECS/couchdb.spec --define '_version $(VERSION)' + export HOME=$(HOME) && cd ../rpmbuild && rpmbuild --verbose -bb SPECS/couchdb.spec --define '_version $(VERSION)' --define '_js_engine $(JS_ENGINE)' # ###################################### copy-pkgs: diff --git a/rpm/SPECS/couchdb.spec.in b/rpm/SPECS/couchdb.spec.in index 571c380..721193c 100644 --- a/rpm/SPECS/couchdb.spec.in +++ b/rpm/SPECS/couchdb.spec.in @@ -45,7 +45,9 @@ BuildRequires: nodejs >= 6.10.1 BuildRequires: java-21-openjdk-devel Requires(post): curl +%if 0%{?rhel} < 10 Requires(post): %SPIDERMONKEY% +%endif Requires(post): libicu >= 4.2.1 Requires(post): procps @@ -74,10 +76,17 @@ languages and environments. %prep %build +echo "SM: %{_js_engine}" +if [ %{_js_engine} = quickjs ]; then + conf_args="--disable-spidermonkey --js_engine=quickjs" +else + conf_args="--spidermonkey-version=%SM_VER%" +fi +echo "ARGS: ${conf_args}" if [ -d ./nouveau -o -d ./extra/nouveau ]; then - ./configure --spidermonkey-version=%SM_VER% --with-nouveau + ./configure "$conf_args --with-nouveau" else - ./configure --spidermonkey-version=%SM_VER% + ./configure "$conf_args" fi %{__make} release
