1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
From: Ignacio Losiggio <iglosiggio@gmail.com>
Date: Wed, 28 Mar 2018 15:53:57 -0300
Subject: Use system libraries in the start script
Forwarded: not-needed
---
build/linux/dist/arduino | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
index e31ab34..7b3007f 100755
--- a/build/linux/dist/arduino
+++ b/build/linux/dist/arduino
@@ -26,7 +26,9 @@ do
done
export CLASSPATH
-LD_LIBRARY_PATH=$APPDIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+DEB_HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH`
+
+LD_LIBRARY_PATH="/usr/lib/jni/${DEB_HOST_MULTIARCH}:/usr/lib/${DEB_HOST_MULTIARCH}:/usr/lib/jni${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
export LD_LIBRARY_PATH
export PATH="${APPDIR}/java/bin:${PATH}"
@@ -46,5 +48,5 @@ if [[ "$@" != *"--"* ]] ; then
JAVA_OPTIONS+=("-splash:$APPDIR/lib/splash.png")
fi
-"$JAVA" "${JAVA_OPTIONS[@]}" processing.app.Base "$@"
+"$JAVA" "${JAVA_OPTIONS[@]}" processing.app.Base "$@"
|
