From 66294020b6eaa2801310149fcb720537a60a69da Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 12 May 2015 10:52:58 +0200 Subject: [PATCH] add ppc64le patch --- ...r-powepc64-and-powepc64le-can-differ.patch | 34 +++++++++++++++++++ libreoffice.spec | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-java-dir-for-powepc64-and-powepc64le-can-differ.patch diff --git a/0001-java-dir-for-powepc64-and-powepc64le-can-differ.patch b/0001-java-dir-for-powepc64-and-powepc64le-can-differ.patch new file mode 100644 index 0000000..4863441 --- /dev/null +++ b/0001-java-dir-for-powepc64-and-powepc64le-can-differ.patch @@ -0,0 +1,34 @@ +From 7a66dbe982623be620ad6ac426fe689a434e5f51 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Tue, 12 May 2015 10:37:53 +0200 +Subject: [PATCH] java dir for powepc64 and powepc64le can differ + +E.g., RHEL >= 7.1 uses ppc64le for reasons listed in +https://bugs.openjdk.java.net/browse/JDK-8073139 . + +Change-Id: I982e65cdf99999e8a5ed23cf444ccb2aee764c4c +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 26071dc..55157a9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -6997,9 +6997,12 @@ then + powerpc) + my_java_arch=ppc + ;; +- powerpc64*) ++ powerpc64) + my_java_arch=ppc64 + ;; ++ powerpc64le) ++ AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le"], [my_java_arch=ppc64le], [my_java_arch=ppc64]) ++ ;; + x86_64) + my_java_arch=amd64 + ;; +-- +2.4.0 + diff --git a/libreoffice.spec b/libreoffice.spec index aa0a2c0..79838db 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -181,7 +181,7 @@ BuildRequires: firebird-libfbembed BuildRequires: glm-devel BuildRequires: kdelibs4-devel BuildRequires: openCOLLADA-devel -BuildRequires: pkgconfig(glew) +BuildRequires: pkgconfig(glew) >= 1.10.0 BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libabw-0.1) BuildRequires: pkgconfig(libcdr-0.1) @@ -312,6 +312,7 @@ Patch15: 0001-add-X-TryExec-entries-to-desktop-files.patch # not upstreamed Patch16: 0001-disable-PSD-import-test-which-deadlocks-on-ARM.patch Patch17: 0001-ppc64-do-not-use-asm-block-to-retrieve-args.patch +Patch18: 0001-java-dir-for-powepc64-and-powepc64le-can-differ.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice