mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-09-21 13:41:20 +02:00
0e02cb55fb
Co-Authored-By: Rasmus Thomsen <oss@cogitri.dev>
Squashed commits:
community/libreoffice: force ant using OpenJDK 11
community/libreoffice: upgrade to 7.1.5.2
community/libreoffice: disable java
community/libreoffice: upgrade to 7.2.0.4
community/libreoffice: upgrade to 7.2.1.2
community/libreoffice: downgrade external skia source to expected version
community/libreoffice: fix issues with newer freetype
community/libreoffice: remove backtrace references and use vendored libcmis
Also removed sdk subpackage, doesn't seem to exist anymore
community/libreoffice: disable on armhf
/builds/alpine/aports/community/libreoffice/src/libreoffice-7.2.1.2/workdir/UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/spin_lock.cpp:83:9: error: instruction requires: armv6k
YIELD_PROCESSOR;
^
community/libreoffice: build with clang rather than gcc
community/libreoffice: upgrade to 7.2.2.2
61 lines
1.7 KiB
Diff
61 lines
1.7 KiB
Diff
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -612,7 +612,7 @@
|
|
fi
|
|
;;
|
|
|
|
-linux-gnu*|k*bsd*-gnu*)
|
|
+linux-gnu*|linux-musl*|k*bsd*-gnu*)
|
|
using_freetype_fontconfig=yes
|
|
using_x11=yes
|
|
build_skia=yes
|
|
@@ -4353,7 +4353,7 @@
|
|
esac
|
|
;;
|
|
|
|
-linux-gnu*)
|
|
+linux-gnu*|linux-musl*)
|
|
COM=GCC
|
|
USING_X11=TRUE
|
|
OS=LINUX
|
|
@@ -7672,7 +7672,7 @@
|
|
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"
|
|
@@ -10260,21 +10260,6 @@
|
|
AC_SUBST(ENABLE_LIBNUMBERTEXT)
|
|
AC_SUBST(LIBNUMBERTEXT_CFLAGS)
|
|
|
|
-dnl ***************************************
|
|
-dnl testing libc version for Linux...
|
|
-dnl ***************************************
|
|
-if test "$_os" = "Linux"; then
|
|
- AC_MSG_CHECKING([whether libc is >= 2.1.1])
|
|
- exec 6>/dev/null # no output
|
|
- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC)
|
|
- exec 6>&1 # output on again
|
|
- if test "$HAVE_LIBC"; then
|
|
- AC_MSG_RESULT([yes])
|
|
- else
|
|
- AC_MSG_ERROR([no, upgrade libc])
|
|
- fi
|
|
-fi
|
|
-
|
|
dnl =========================================
|
|
dnl Check for uuidgen
|
|
dnl =========================================
|
|
@@ -12812,7 +12812,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" != ""; then
|
|
pathmunge "$JAVA_HOME/bin" "after"
|
|
fi
|