Source: openjdk-11
Version: 11.0.5+6-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

openjdk-11 fails to build from source (natively) when built with the
nocheck profile, because debian/rules checks for jtreg even when it is
not installed. The attached patch conditionalizes the sanity check and
makes openjdk-11 buildable without checks again. Please consider
applying it. This happens to also make cross building fail.

Helmut
diff --minimal -Nru openjdk-11-11.0.5+6/debian/changelog 
openjdk-11-11.0.5+6/debian/changelog
--- openjdk-11-11.0.5+6/debian/changelog        2019-09-04 16:48:18.000000000 
+0200
+++ openjdk-11-11.0.5+6/debian/changelog        2019-09-05 22:27:37.000000000 
+0200
@@ -1,3 +1,10 @@
+openjdk-11 (11.0.5+6-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with DEB_BUILD_PROFILES=nocheck. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Thu, 05 Sep 2019 22:27:37 +0200
+
 openjdk-11 (11.0.5+6-1) unstable; urgency=medium
 
   * OpenJDK 11.0.5+6 build (early access).
diff --minimal -Nru openjdk-11-11.0.5+6/debian/rules 
openjdk-11-11.0.5+6/debian/rules
--- openjdk-11-11.0.5+6/debian/rules    2019-09-04 16:48:18.000000000 +0200
+++ openjdk-11-11.0.5+6/debian/rules    2019-09-05 20:42:18.000000000 +0200
@@ -958,12 +958,14 @@
 build_stamps +=  stamps/jtreg-check-default
 
 pre-build:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
        jtreg_version="$$(dpkg-query -f '$${Version}\n' -W jtreg)"; \
        if ! dpkg --compare-versions $(min_jtreg_version) le $$jtreg_version; 
then \
          echo "Error: testsuite requires jtreg $(min_jtreg_version) but 
$$jtreg_version is installed"; \
          echo "Please update the jtreg dependency and regenerate 
debian/control"; \
          false; \
        fi
+endif
 ifneq (,$(filter $(DEB_HOST_ARCH),s390))
        @echo explicitely fail the build for $(DEB_HOST_ARCH), patches not 
updated
 #else ifneq (,$(filter $(DEB_HOST_ARCH),armel))
_______________________________________________
Mailing list: https://launchpad.net/~openjdk
Post to     : openjdk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openjdk
More help   : https://help.launchpad.net/ListHelp

Reply via email to