Added support for ARM VFP/hard-float JDK releases

[sven/java-package.git] / lib / jdk.sh

diff --git a/lib/jdk.sh b/lib/jdk.sh
index 7ae61f024590da6e6b20f2bfb3eba600c7728527..ae8d96f9b9f8ea8e2d76025d75ab5a6ec229d780 100644 (file)
--- a/lib/jdk.sh
+++ b/lib/jdk.sh
@@ -3,7 +3,7 @@ j2sdk_control() {
     j2se_control
     java_browser_plugin="java-browser-plugin, "
     depends="\${shlibs:Depends}"
-    if [ "${DEB_BUILD_ARCH:0:3}" = "arm" ]; then
+    if [ "${DEB_BUILD_ARCH:0:3}" = "arm" -a "${j2se_arch}" != "arm-vfp-hflt" ]; then
         # ARM is only softfloat ATM so if building on armhf
         # force the dependencies to pickup cross platform fu
         if [ "${DEB_BUILD_ARCH}" == "armhf" ]; then