diff options
Diffstat (limited to 'user/libreoffice/linux-musl.patch')
| -rw-r--r-- | user/libreoffice/linux-musl.patch | 41 |
1 files changed, 7 insertions, 34 deletions
diff --git a/user/libreoffice/linux-musl.patch b/user/libreoffice/linux-musl.patch index 3bd6ccdde..2641620cb 100644 --- a/user/libreoffice/linux-musl.patch +++ b/user/libreoffice/linux-musl.patch @@ -1,24 +1,15 @@ ---- 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*) +--- libreoffice-6.4.0.3/configure.ac 2020-01-22 23:14:16.000000000 +0000 ++++ libreoffice-6.4.0.3/configure.ac 2020-02-04 04:09:34.970114523 +0000 +@@ -612,7 +612,7 @@ solaris*) fi ;; -linux-gnu*|k*bsd*-gnu*) +linux-gnu*|linux-musl*|k*bsd*-gnu*) - test_gtk=yes build_gstreamer_1_0=yes - build_gstreamer_0_10=yes -@@ -4149,7 +4149,7 @@ kfreebsd*) + test_kf5=yes + test_gtk3_kde5=yes +@@ -4341,7 +4341,7 @@ kfreebsd*) esac ;; @@ -27,16 +18,7 @@ COM=GCC USING_X11=TRUE OS=LINUX -@@ -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" - ;; - -- linux-gnu*) -+ linux-gnu*|linux-musl*) - 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" -@@ -9854,21 +9854,6 @@ AC_SUBST(SYSTEM_LIBNUMBERTEXT_DATA) +@@ -10232,21 +10232,6 @@ AC_SUBST(SYSTEM_LIBNUMBERTEXT_DATA) AC_SUBST(ENABLE_LIBNUMBERTEXT) AC_SUBST(LIBNUMBERTEXT_CFLAGS) @@ -58,12 +40,3 @@ dnl ========================================= dnl Check for uuidgen dnl ========================================= -@@ -12828,7 +12813,7 @@ else - - case "$host_os" in - -- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) -+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) - if test "$ENABLE_JAVA" != ""; then - pathmunge "$JAVA_HOME/bin" "after" - fi |