You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2025/12/05 16:46:40 UTC

(couchdb-pkg) branch move-nouveau created (now d8d3bd6)

This is an automated email from the ASF dual-hosted git repository.

jan pushed a change to branch move-nouveau
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git


      at d8d3bd6  feat: support nouveau living in ./ (old) and ./extra (new)

This branch includes the following new commits:

     new d8d3bd6  feat: support nouveau living in ./ (old) and ./extra (new)

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: feat: support nouveau living in ./ (old) and ./extra (new)

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jan pushed a commit to branch move-nouveau
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git

commit d8d3bd6a275da75c8fd5cff18371cfaf8ebb53f9
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Fri Dec 5 17:46:26 2025 +0100

    feat: support nouveau living in ./ (old) and ./extra (new)
---
 debian/rules              | 2 +-
 rpm/SPECS/couchdb.spec.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 08a67f6..790808e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ override_dh_auto_clean:
 	-mv src/mango/src/mango_cursor_text.nocompile src/mango/src/mango_cursor_text.erl
 
 override_dh_auto_configure:
-	if [ -d "./nouveau" ]; then \
+	if [ -d "./nouveau" -o -d "./extra/nouveau" ]; then \
 		./configure --spidermonkey-version $(SM_VER) --with-nouveau; \
         else \
 		./configure --spidermonkey-version $(SM_VER); \
diff --git a/rpm/SPECS/couchdb.spec.in b/rpm/SPECS/couchdb.spec.in
index 402a9f8..571c380 100644
--- a/rpm/SPECS/couchdb.spec.in
+++ b/rpm/SPECS/couchdb.spec.in
@@ -74,7 +74,7 @@ languages and environments.
 %prep
 
 %build
-if [ -d ./nouveau ]; then
+if [ -d ./nouveau -o -d ./extra/nouveau ]; then
     ./configure --spidermonkey-version=%SM_VER% --with-nouveau
 else
     ./configure --spidermonkey-version=%SM_VER%