void-packages/srcpkgs/libreoffice/patches/musl-java.patch

45 lines
1.7 KiB
Diff

diff --git a/configure.ac b/configure.ac
index 2c65a1200f69..ba4e6eb953ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8829,7 +8829,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
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"
@@ -14569,7 +14569,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
diff --git a/configure b/configure
index d738aec..80a8878 100755
--- a/configure
+++ b/configure
@@ -21502,7 +21502,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
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"
@@ -43329,7 +43329,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