You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2023/11/19 14:55:46 UTC
(couchdb-pkg) branch main updated: Build and include Nouveau if it's present in the tarball
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
The following commit(s) were added to refs/heads/main by this push:
new bb7709f Build and include Nouveau if it's present in the tarball
bb7709f is described below
commit bb7709f1b2879f622ab8f4a85a4a7f1ea6738c68
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Sun Nov 19 01:39:46 2023 -0500
Build and include Nouveau if it's present in the tarball
We want to be able to build older patch release packages as well as
the new releases with Nouveau. To keep it simple we just inspect the
presence of the nouveau directory.
---
debian/rules | 6 +++++-
rpm/SPECS/couchdb.spec.in | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/debian/rules b/debian/rules
index 9f5c9ac..b442b0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,11 @@ override_dh_auto_clean:
-mv src/mango/src/mango_cursor_text.nocompile src/mango/src/mango_cursor_text.erl
override_dh_auto_configure:
- ./configure --spidermonkey-version $(SM_VER)
+ if [ -d "./nouveau" ]; then \
+ ./configure --spidermonkey-version $(SM_VER) --enable-nouveau; \
+ else \
+ ./configure --spidermonkey-version $(SM_VER); \
+ fi
override_dh_auto_build:
dh_auto_build -- release
diff --git a/rpm/SPECS/couchdb.spec.in b/rpm/SPECS/couchdb.spec.in
index 863c203..f3005f2 100644
--- a/rpm/SPECS/couchdb.spec.in
+++ b/rpm/SPECS/couchdb.spec.in
@@ -96,7 +96,11 @@ languages and environments.
%prep
%build
-./configure --spidermonkey-version=%SM_VER%
+if [ -d ./nouveau ]; then
+ ./configure --spidermonkey-version=%SM_VER% --enable-nouveau
+else
+ ./configure --spidermonkey-version=%SM_VER%
+fi
%{__make} release
%clean