[Git][java-team/lwjgl][master] 2 commits: Use the arch specific version of OpenJDK 8, otherwise the build will fail

[Markus Koschany]

Markus Koschany pushed to branch master at Debian Java Maintainers / lwjgl


Commits:
ded68e0a by Markus Koschany at 2018-07-28T20:16:52Z
Use the arch specific version of OpenJDK 8, otherwise the build will fail

on non-amd64 architectures.

- - - - -
311e2f12 by Markus Koschany at 2018-07-28T20:17:56Z
Update changelog

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lwjgl (2.9.3+dfsg-3) unstable; urgency=medium
+
+  * Team upload.
+  * Use the arch specific version of OpenJDK 8, otherwise the build will fail
+    on non-amd64 architectures.
+
+ -- Markus Koschany <apo at debian.org>  Sat, 28 Jul 2018 22:17:25 +0200
+
 lwjgl (2.9.3+dfsg-2) unstable; urgency=medium
 
   [ tony mancill ]


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,8 @@ TMPDIR  := $(NAME)-$(VERSION)
 TAR     := ../$(NAME)_$(VERSION).orig.tar.gz
 TARDFSG := ../$(NAME)_$(VERSION)+dfsg.orig.tar.gz
 
-export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-$(DEB_HOST_ARCH)
 export PATH:=$(JAVA_HOME)/bin:$(PATH)
 
 # NOTE: jutils is explicitly included here (without a depends in our control



View it on GitLab: https://salsa.debian.org/java-team/lwjgl/compare/7292c6529ef46592924ca609c489f44141082568...311e2f126da5df3deed7c165aa01796abfd73fc7

-- 
View it on GitLab: https://salsa.debian.org/java-team/lwjgl/compare/7292c6529ef46592924ca609c489f44141082568...311e2f126da5df3deed7c165aa01796abfd73fc7
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180728/bc7c3248/attachment.html>