configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d8e46307cd8190c93c0b60e394475536b40e3a46
Author: David Tardon <dtar...@redhat.com>
Date: Tue Sep 27 22:06:04 2016 +0200
fix build on 32-bit ARM on latest Rawhide
Change-Id: If00c42235d6ec92634dc8c23fdcbb50e332ffa68
(cherry picked from commit 99d2240ab618b4877af99234e8897315c00ad01b)
Reviewed-on: https://gerrit.libreoffice.org/29343
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 8366bef..d271db2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7180,7 +7180,8 @@ then
else
case "$host_cpu" in
arm*)
- my_java_arch=arm
+ AS_IF([test -e "$JAVA_HOME/jre/lib/aarch32/libjawt.so"],
[my_java_arch=aarch32], [my_java_arch=arm])
+ JAVA_ARCH=$my_java_arch
;;
i*86)
my_java_arch=i386
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
