[script][patch] Import Debian JNI library path patch

Author: JakubVanek

scripts/config.sh

@@ -134,6 +134,7 @@ fi
 # EV3
 if [ "$JDKPLATFORM" == "ev3" ]; then
   SFLT_NEEDED=true
+  eval "$(dpkg-architecture -s -a armel -A armel)"
 
 # invalid or unset platform
 else

scripts/fetch.sh

@@ -70,6 +70,7 @@ if [ ! -d "$JDKDIR" ]; then
   # apply the EV3-specific patches
   echo "[FETCH] Patching the source tree"
   patch -p1 -i "$SCRIPTDIR/$PATCHVER.patch"
+  patch -p1 -i "$SCRIPTDIR/libpath.patch"
 
 else
   echo "[FETCH] Directory for JDK repository exists, assuming everything has been done already." 2>&1

scripts/libpath.diff

@@ -0,0 +1,34 @@
+Index: b/src/hotspot/os/linux/os_linux.cpp
+===================================================================
+--- a/src/hotspot/os/linux/os_linux.cpp
++++ b/src/hotspot/os/linux/os_linux.cpp
+@@ -325,10 +325,10 @@ void os::init_system_properties_values()
+   //        1: ...
+   //        ...
+   //        7: The default directories, normally /lib and /usr/lib.
+-#if defined(AMD64) || (defined(_LP64) && defined(SPARC)) || defined(PPC64) || defined(S390)
+-  #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
++#ifdef DEB_MULTIARCH
++#define DEFAULT_LIBPATH	"/usr/lib/" DEB_MULTIARCH "/jni" ":/lib/" DEB_MULTIARCH ":/usr/lib/" DEB_MULTIARCH ":/usr/lib/jni:/lib:/usr/lib"
+ #else
+-  #define DEFAULT_LIBPATH "/lib:/usr/lib"
++  #define DEFAULT_LIBPATH "/usr/lib/jni:/lib:/usr/lib"
+ #endif
+ 
+ // Base path of extensions installed on the system.
+Index: b/make/hotspot/lib/CompileJvm.gmk
+===================================================================
+--- a/make/hotspot/lib/CompileJvm.gmk
++++ b/make/hotspot/lib/CompileJvm.gmk
+@@ -129,6 +129,11 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TAR
+   endif
+ endif
+ 
++DEB_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null || true)
++ifneq (,$(DEB_MULTIARCH))
++JVM_CFLAGS += -DDEB_MULTIARCH="\"$(DEB_MULTIARCH)\""
++endif
++
+ ifeq ($(OPENJDK_TARGET_OS), windows)
+   ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
+     RC_DESC := 64-Bit$(SPACE)