diff options
Diffstat (limited to 'community/libreoffice/linux-musl.patch')
| -rw-r--r-- | community/libreoffice/linux-musl.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/community/libreoffice/linux-musl.patch b/community/libreoffice/linux-musl.patch index f9b6bd7646..5fbf6b31cd 100644 --- a/community/libreoffice/linux-musl.patch +++ b/community/libreoffice/linux-musl.patch @@ -1,6 +1,6 @@ ---- libreoffice-4.4.0.3/configure.ac.orig 2015-01-22 22:05:28.000000000 -0200 -+++ libreoffice-4.4.0.3/configure.ac 2015-02-02 20:11:20.639411153 -0200 -@@ -569,7 +569,7 @@ +--- libreoffice-5.3.0.3/configure.ac.orig 2017-01-26 22:22:46.000000000 +0000 ++++ libreoffice-5.3.0.3/configure.ac 2017-02-08 13:14:16.777547599 +0000 +@@ -652,7 +652,7 @@ fi ;; @@ -9,16 +9,16 @@ test_gtk=yes build_gstreamer_1_0=yes build_gstreamer_0_10=yes -@@ -4058,7 +4058,7 @@ +@@ -4170,7 +4170,7 @@ esac ;; -linux-gnu*) +linux-gnu*|linux-musl*) COM=GCC - GUIBASE=unx + USING_X11=TRUE OS=LINUX -@@ -6967,7 +6967,7 @@ +@@ -7197,7 +7197,7 @@ test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; @@ -27,7 +27,7 @@ JAVAINC="-I$JAVA_HOME/include" JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" -@@ -9429,21 +9429,6 @@ +@@ -9748,21 +9748,6 @@ fi AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA) @@ -49,12 +49,12 @@ dnl ========================================= dnl Check for the Windows SDK. dnl ========================================= -@@ -12741,7 +12726,7 @@ +@@ -12775,7 +12760,7 @@ case "$host_os" in - aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) + aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) - if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then + if test "$ENABLE_JAVA" != ""; then pathmunge "$JAVA_HOME/bin" "after" fi |