diff options
Diffstat (limited to 'user/libreoffice/linux-musl.patch')
| -rw-r--r-- | user/libreoffice/linux-musl.patch | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/user/libreoffice/linux-musl.patch b/user/libreoffice/linux-musl.patch index 5fbf6b31c..3bd6ccdde 100644 --- a/user/libreoffice/linux-musl.patch +++ b/user/libreoffice/linux-musl.patch @@ -1,6 +1,15 @@ ---- 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 @@ +--- libreoffice-6.2.1.2/configure.ac ++++ libreoffice-6.2.1.2/configure.ac +@@ -462,7 +462,7 @@ if test -n "$with_android_ndk"; then + # (A 64-bit ld.gold grows to much over 10 gigabytes of virtual space when linking such a .so if + # all objects have been built with debug information.) + case $build_os in +- linux-gnu*) ++ linux-gnu*|linux-musl*) + ndk_build_os=linux + ;; + darwin*) +@@ -592,7 +592,7 @@ solaris*) fi ;; @@ -9,7 +18,7 @@ test_gtk=yes build_gstreamer_1_0=yes build_gstreamer_0_10=yes -@@ -4170,7 +4170,7 @@ +@@ -4149,7 +4149,7 @@ kfreebsd*) esac ;; @@ -18,7 +27,7 @@ COM=GCC USING_X11=TRUE OS=LINUX -@@ -7197,7 +7197,7 @@ +@@ -7277,7 +7277,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; @@ -27,9 +36,9 @@ 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" -@@ -9748,21 +9748,6 @@ - fi - AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA) +@@ -9854,21 +9854,6 @@ AC_SUBST(SYSTEM_LIBNUMBERTEXT_DATA) + AC_SUBST(ENABLE_LIBNUMBERTEXT) + AC_SUBST(LIBNUMBERTEXT_CFLAGS) -dnl *************************************** -dnl testing libc version for Linux... @@ -47,9 +56,9 @@ -fi - dnl ========================================= - dnl Check for the Windows SDK. + dnl Check for uuidgen dnl ========================================= -@@ -12775,7 +12760,7 @@ +@@ -12828,7 +12813,7 @@ else case "$host_os" in |