[openjfx] 01/01: * Fix installation into the jre architecture directory. * Enable verbose (debug) build for slow architectures.

[Matthias Klose]

This is an automated email from the git hooks/post-receive script.

doko pushed a commit to branch master
in repository openjfx.

commit 8d2c6c2c8cfc4de6bc5590648c48aa441c123b82
Author: Matthias Klose <doko at ubuntu.com>
Date:   Tue Oct 6 15:35:42 2015 +0200

      * Fix installation into the jre architecture directory.
      * Enable verbose (debug) build for slow architectures.
---
 debian/changelog |  1 +
 debian/rules     | 25 +++++++++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 858ee1a..dbb6d93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ openjfx (8u60-b27-1ubuntu1) UNRELEASED; urgency=medium
 
   [ Matthias Klose ]
   * Fix installation into the jre architecture directory.
+  * Enable verbose (debug) build for slow architectures.
 
  -- Matthias Klose <doko at ubuntu.com>  Tue, 06 Oct 2015 11:58:43 +0200
 
diff --git a/debian/rules b/debian/rules
index 1e52b83..823f664 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,29 @@
 #!/usr/bin/make -f
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+
+# gradle runs a long time without output
+ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf mips mipsel))
+  gradle_debug = --debug
+endif
 
 export JAVA_HOME    = /usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH)
 export OPENJFX_HOME = /usr/share/java/openjfx
 
-arch_map = alpha=alpha arm=arm armel=arm armhf=arm arm64=aarch64 amd64=amd64 hppa=parisc i386=i586 m68k=m68k mips=mips mipsel=mipsel mips64=mips64 mips64el=mips64el powerpc=ppc powerpcspe=ppc ppc64=ppc64 ppc64el=ppc64le sparc=sparc sparc64=sparc64 sh4=sh s390x=s390x ia64=ia64 m68k=m68k x32=x32
+build_arch_map =
+	alpha=alpha arm=arm armel=arm armhf=arm arm64=aarch64 amd64=amd64 hppa=parisc \
+	i386=i386 m68k=m68k mips=mips mipsel=mipsel mips64=mips64 mips64el=mips64el \
+	powerpc=ppc powerpcspe=ppc ppc64=ppc64 ppc64el=ppc64 \
+	sparc=sparc sparc64=sparc64 sh4=sh s390x=s390x ia64=ia64 m68k=m68k x32=x32
+jvm_arch_map = \
+	alpha=alpha arm=arm armel=arm armhf=arm arm64=aarch64 amd64=amd64 hppa=parisc \
+	i386=i386 m68k=m68k mips=mips mipsel=mipsel mips64=mips64 mips64el=mips64el \
+	powerpc=ppc powerpcspe=ppc ppc64=ppc64 ppc64el=ppc64le \
+	sparc=sparc sparc64=sparc64 sh4=sh s390x=s390x ia64=ia64 m68k=m68k x32=x32
 
-jvmarch := $(strip $(patsubst $(DEB_HOST_ARCH_CPU)=%, %, $(filter $(DEB_HOST_ARCH_CPU)=%, $(arch_map))))
+build_arch := $(strip $(patsubst $(DEB_HOST_ARCH_CPU)=%, %, $(filter $(DEB_HOST_ARCH_CPU)=%, $(build_arch_map))))
+jvm_arch   := $(strip $(patsubst $(DEB_HOST_ARCH_CPU)=%, %, $(filter $(DEB_HOST_ARCH_CPU)=%, $(jvm_arch_map))))
 
 %:
 	dh $@ 
@@ -27,7 +43,7 @@ override_dh_auto_build:
 	cp modules/web/src/main/java/com/sun/webkit/dom/JSObject.java    modules/web/build/linux/Release/WebCore/generated/java/com/sun/webkit/dom/
 	cp modules/web/src/main/java/com/sun/webkit/perf/PerfLogger.java modules/web/build/linux/Release/WebCore/generated/java/com/sun/webkit/perf/
 
-	gradle --offline --stacktrace --refresh-dependencies --gradle-user-home .gradle
+	gradle --offline --stacktrace $(gradle_debug) --refresh-dependencies --gradle-user-home .gradle
 
 override_dh_install:
 	dh_install -i
@@ -49,7 +65,8 @@ override_dh_install:
 	dh_link -popenjfx $(OPENJFX_HOME)/lib/ant-javafx.jar        $(JAVA_HOME)/lib/ant-javafx.jar
 	dh_link -popenjfx $(OPENJFX_HOME)/lib/javafx-mx.jar         $(JAVA_HOME)/lib/javafx-mx.jar
 
-	dh_install -plibopenjfx-jni build/sdk/rt/lib/$(jvmarch) $(JAVA_HOME)/jre/lib
+	ls -l build/sdk/rt/lib
+	dh_install -plibopenjfx-jni build/sdk/rt/lib/$(build_arch) $(JAVA_HOME)/jre/lib/$(jvm_arch)
 
 	dh_install -popenjfx-source build/javafx-src.zip $(JAVA_HOME)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git