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 06:41:14 UTC
(couchdb-pkg) branch build-nouveau created (now 6d6742d)
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a change to branch build-nouveau
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
at 6d6742d Build and include Nouveau if it's present in the tarball
This branch includes the following new commits:
new 6d6742d Build and include Nouveau if it's present in the tarball
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(couchdb-pkg) 01/01: Build and include Nouveau if it's present in the tarball
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch build-nouveau
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
commit 6d6742de64a5ce6aaae3a9c80194e25dde7832a4
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