Skip to content

require Java 21 or higher for nouveau #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2025
Merged

require Java 21 or higher for nouveau #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ SPIDERMONKEY=couch-libmozjs185-1.0
SPIDERMONKEY_DEV=couch-libmozjs185-dev
SM_VER=1.8.5

# Java
JAVA_RUNTIME=java11-runtime-headless | java11-runtime

# Try and guess the correct target...
all:
Expand Down Expand Up @@ -117,6 +119,7 @@ debian-trixie: DIST=debian-trixie
debian-trixie: SPIDERMONKEY=libmozjs-128-0
debian-trixie: SPIDERMONKEY_DEV=libmozjs-128-dev
debian-trixie: SM_VER=128
debian-trixie: JAVA_RUNTIME=java21-runtime-headless | java21-runtime
debian-trixie: trixie

arm64-debian-trixie: aarch64-debian-trixie
Expand All @@ -126,20 +129,23 @@ aarch64-debian-trixie: DIST=debian-trixie
aarch64-debian-trixie: SPIDERMONKEY=libmozjs-128-0
aarch64-debian-trixie: SPIDERMONKEY_DEV=libmozjs-128-dev
aarch64-debian-trixie: SM_VER=128
aarch64-debian-trixie: JAVA_RUNTIME=java21-runtime-headless | java21-runtime
aarch64-debian-trixie: trixie

ppc64le-debian-trixie: PLATFORM=trixie
ppc64le-debian-trixie: DIST=debian-trixie
ppc64le-debian-trixie: SPIDERMONKEY=libmozjs-128-0
ppc64le-debian-trixie: SPIDERMONKEY_DEV=libmozjs-128-dev
ppc64le-debian-trixie: SM_VER=128
ppc64le-debian-trixie: JAVA_RUNTIME=java21-runtime-headless | java21-runtime
ppc64le-debian-trixie: trixie

s390x-debian-trixie: PLATFORM=trixie
s390x-debian-trixie: DIST=debian-trixie
s390x-debian-trixie: SPIDERMONKEY=libmozjs-128-0
s390x-debian-trixie: SPIDERMONKEY_DEV=libmozjs-128-dev
s390x-debian-trixie: SM_VER=128
s390x-debian-trixie: JAVA_RUNTIME=java21-runtime-headless | java21-runtime
s390x-debian-trixie: trixie

trixie: debian
Expand Down Expand Up @@ -251,7 +257,7 @@ build-couch:

# ######################################
sm-ver-debian:
sed 's/%SPIDERMONKEY%/$(SPIDERMONKEY)/g;s/%SPIDERMONKEY_DEV%/$(SPIDERMONKEY_DEV)/g' \
sed 's/%SPIDERMONKEY%/$(SPIDERMONKEY)/g;s/%SPIDERMONKEY_DEV%/$(SPIDERMONKEY_DEV)/g;s/%JAVA_RUNTIME%/$(JAVA_RUNTIME)/g' \
debian/control.in > debian/control
echo 'SM_VER = $(SM_VER)' > debian/sm_ver.mk

Expand Down
2 changes: 1 addition & 1 deletion debian/control.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Package: couchdb-nouveau
Architecture: any
Depends: adduser,
debconf,
java11-runtime-headless | java11-runtime,
%JAVA_RUNTIME%,
init-system-helpers,
lsb-base,
procps,
Expand Down