summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2018-01-19 18:05:18 +0100
committerAvatar Heiko Becker <heirecka@exherbo.org> 2018-01-20 13:02:26 +0100
commita4b992886ebc4ef2a9ccb6a29b7febaf251bfc42 (patch)
tree5a23ae30275976ecb6211ab3483093b5dd9a755f
parent77b7a511651bed49191e7d04d71e396ea619dbc4 (diff)
downloadoffice-master.tar.gz
office-master.tar.xz
libreoffice[java]: Fix build with java9HEADmaster
-rw-r--r--packages/app-office/libreoffice/files/libreoffice-Detect-libjawt-automatically-on-java9-too.patch33
-rw-r--r--packages/app-office/libreoffice/libreoffice-5.4.4.2.exheres-01
2 files changed, 34 insertions, 0 deletions
diff --git a/packages/app-office/libreoffice/files/libreoffice-Detect-libjawt-automatically-on-java9-too.patch b/packages/app-office/libreoffice/files/libreoffice-Detect-libjawt-automatically-on-java9-too.patch
new file mode 100644
index 0000000..36b2375
--- /dev/null
+++ b/packages/app-office/libreoffice/files/libreoffice-Detect-libjawt-automatically-on-java9-too.patch
@@ -0,0 +1,33 @@
+Upstream: yes, 6-0 branches and master
+
+From 047b4c14ada038204a1e1280742960db00a5d1f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
+Date: Tue, 12 Sep 2017 10:32:26 +0200
+Subject: [PATCH] Detect libjawt automatically on java9 too
+
+Change-Id: Ie8eb53a915682b7a188b1af4b2d435eb0cc9ff81
+---
+ configure.ac | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f616afef856e..4cd1700088d5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7000,7 +7000,12 @@ then
+ my_java_arch=$host_cpu
+ ;;
+ esac
+- JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
++ # This is where JDK9 puts the library
++ if test -e "$JAVA_HOME/lib/libjawt.so"; then
++ JAWTLIB="-L$JAVA_HOME/lib/ -ljawt"
++ else
++ JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
++ fi
+ AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])])
+ fi
+ AC_MSG_RESULT([$JAWTLIB])
+--
+2.16.0
+
diff --git a/packages/app-office/libreoffice/libreoffice-5.4.4.2.exheres-0 b/packages/app-office/libreoffice/libreoffice-5.4.4.2.exheres-0
index 3483d75..5aa49a8 100644
--- a/packages/app-office/libreoffice/libreoffice-5.4.4.2.exheres-0
+++ b/packages/app-office/libreoffice/libreoffice-5.4.4.2.exheres-0
@@ -48,6 +48,7 @@ DEFAULT_SRC_PREPARE_PATCHES+=(
"${FILES}"/${PN}-4.4.0.3-mdds-build.patch
"${FILES}"/${PN}-5.3.0.3-Fix-kde4-build-on-multiarch.patch
"${FILES}"/${PN}-5.3.4.2-kioclient5.patch
+ "${FILES}"/${PN}-Detect-libjawt-automatically-on-java9-too.patch
)
src_prepare() {