rpm/aegisub
SHA256
1
0
Fork 0
forked from pool/aegisub
Code Pull Requests Activity
a2853f2a9d
aegisub/ax_boost-files.patch

218 lines
7.5 KiB
Diff
Raw Normal View History

Accepting request 885165 from home:susnux:branches:multimedia:apps Upstream orphaned (or at least inactive), use active wangqr fork OBS-URL: https://build.opensuse.org/request/show/885165 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=72
2021-04-14 08:12:00 +02:00
diff -Nur Aegisub-3.3.2/m4macros/ax_boost_base.m4 new/m4macros/ax_boost_base.m4
--- Aegisub-3.3.2/m4macros/ax_boost_base.m4 2020-12-19 15:20:15.000000000 +0100
+++ new/m4macros/ax_boost_base.m4 2021-04-13 22:19:25.017774629 +0200
@@ -33,7 +33,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 42
+#serial 49
# example boost program (need to pass version)
m4_define([_AX_BOOST_BASE_PROGRAM],
@@ -113,8 +113,9 @@
dnl are found, e.g. when only header-only libraries are installed!
AS_CASE([${host_cpu}],
[x86_64],[libsubdirs="lib64 libx32 lib lib64"],
- [ppc64|s390x|sparc64|aarch64|ppc64le],[libsubdirs="lib64 lib lib64"],
- [libsubdirs="lib"],
+ [mips*64*],[libsubdirs="lib64 lib32 lib lib64"],
+ [ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k],[libsubdirs="lib64 lib lib64"],
+ [libsubdirs="lib"]
)
dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
@@ -122,6 +123,7 @@
dnl are almost assuredly the ones desired.
AS_CASE([${host_cpu}],
[i?86],[multiarch_libsubdir="lib/i386-${host_os}"],
+ [armv7l],[multiarch_libsubdir="lib/arm-${host_os}"],
[multiarch_libsubdir="lib/${host_cpu}-${host_os}"]
)
@@ -298,4 +300,4 @@
CPPFLAGS="$CPPFLAGS_SAVED"
LDFLAGS="$LDFLAGS_SAVED"
-])
\ Kein Zeilenumbruch am Dateiende.
+])
diff -Nur Aegisub-3.3.2/m4macros/ax_boost_chrono.m4 new/m4macros/ax_boost_chrono.m4
--- Aegisub-3.3.2/m4macros/ax_boost_chrono.m4 2020-12-19 15:20:15.000000000 +0100
+++ new/m4macros/ax_boost_chrono.m4 2021-04-13 22:19:25.877782628 +0200
@@ -29,7 +29,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 4
+#serial 5
AC_DEFUN([AX_BOOST_CHRONO],
[
@@ -105,7 +105,7 @@
fi
if test "x$ax_lib" = "x"; then
- AC_MSG_ERROR(Could not find a version of the library!)
+ AC_MSG_ERROR(Could not find a version of the Boost::Chrono library!)
fi
if test "x$link_chrono" = "xno"; then
AC_MSG_ERROR(Could not link against $ax_lib !)
diff -Nur Aegisub-3.3.2/m4macros/ax_boost_filesystem.m4 new/m4macros/ax_boost_filesystem.m4
--- Aegisub-3.3.2/m4macros/ax_boost_filesystem.m4 2020-12-19 15:20:15.000000000 +0100
+++ new/m4macros/ax_boost_filesystem.m4 2021-04-13 22:19:26.849791671 +0200
@@ -31,7 +31,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 27
+#serial 28
AC_DEFUN([AX_BOOST_FILESYSTEM],
[
@@ -104,7 +104,7 @@
fi
if test "x$ax_lib" = "x"; then
- AC_MSG_ERROR(Could not find a version of the library!)
+ AC_MSG_ERROR(Could not find a version of the Boost::Filesystem library!)
fi
if test "x$link_filesystem" != "xyes"; then
AC_MSG_ERROR(Could not link against $ax_lib !)
diff -Nur Aegisub-3.3.2/m4macros/ax_boost_locale.m4 new/m4macros/ax_boost_locale.m4
--- Aegisub-3.3.2/m4macros/ax_boost_locale.m4 2020-12-19 15:20:15.000000000 +0100
+++ new/m4macros/ax_boost_locale.m4 2021-04-13 22:19:27.869801159 +0200
@@ -29,7 +29,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 2
+#serial 3
AC_DEFUN([AX_BOOST_LOCALE],
[
@@ -106,7 +106,7 @@
fi
if test "x$ax_lib" = "x"; then
- AC_MSG_ERROR(Could not find a version of the library!)
+ AC_MSG_ERROR(Could not find a version of the Boost::Locale library!)
fi
if test "x$link_locale" = "xno"; then
AC_MSG_ERROR(Could not link against $ax_lib !)
diff -Nur Aegisub-3.3.2/m4macros/ax_boost_system.m4 new/m4macros/ax_boost_system.m4
--- Aegisub-3.3.2/m4macros/ax_boost_system.m4 2020-12-19 15:20:15.000000000 +0100
+++ new/m4macros/ax_boost_system.m4 2021-04-13 22:19:30.397824673 +0200
@@ -31,7 +31,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 19
+#serial 20
AC_DEFUN([AX_BOOST_SYSTEM],
[
@@ -108,7 +108,7 @@
fi
if test "x$ax_lib" = "x"; then
- AC_MSG_ERROR(Could not find a version of the library!)
+ AC_MSG_ERROR(Could not find a version of the Boost::System library!)
fi
if test "x$link_system" = "xno"; then
AC_MSG_ERROR(Could not link against $ax_lib !)
diff -Nur Aegisub-3.3.2/m4macros/ax_boost_thread.m4 new/m4macros/ax_boost_thread.m4
--- Aegisub-3.3.2/m4macros/ax_boost_thread.m4 2020-12-19 15:20:15.000000000 +0100
+++ new/m4macros/ax_boost_thread.m4 2021-04-13 22:19:31.365833679 +0200
@@ -30,7 +30,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 31
+#serial 33
AC_DEFUN([AX_BOOST_THREAD],
[
@@ -67,13 +67,24 @@
[AC_LANG_PUSH([C++])
CXXFLAGS_SAVE=$CXXFLAGS
- if test "x$host_os" = "xsolaris" ; then
- CXXFLAGS="-pthreads $CXXFLAGS"
- elif test "x$host_os" = "xmingw32" ; then
- CXXFLAGS="-mthreads $CXXFLAGS"
- else
- CXXFLAGS="-pthread $CXXFLAGS"
- fi
+ case "x$host_os" in
+ xsolaris )
+ CXXFLAGS="-pthreads $CXXFLAGS"
+ break;
+ ;;
+ xmingw32 )
+ CXXFLAGS="-mthreads $CXXFLAGS"
+ break;
+ ;;
+ *android* )
+ break;
+ ;;
+ * )
+ CXXFLAGS="-pthread $CXXFLAGS"
+ break;
+ ;;
+ esac
+
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM(
[[@%:@include <boost/thread/thread.hpp>]],
@@ -84,13 +95,23 @@
AC_LANG_POP([C++])
])
if test "x$ax_cv_boost_thread" = "xyes"; then
- if test "x$host_os" = "xsolaris" ; then
- BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
- elif test "x$host_os" = "xmingw32" ; then
- BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
- else
- BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
- fi
+ case "x$host_os" in
+ xsolaris )
+ BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
+ break;
+ ;;
+ xmingw32 )
+ BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
+ break;
+ ;;
+ *android* )
+ break;
+ ;;
+ * )
+ BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
+ break;
+ ;;
+ esac
AC_SUBST(BOOST_CPPFLAGS)
@@ -130,7 +151,7 @@
fi
if test "x$ax_lib" = "x"; then
- AC_MSG_ERROR(Could not find a version of the library!)
+ AC_MSG_ERROR(Could not find a version of the Boost::Thread library!)
fi
if test "x$link_thread" = "xno"; then
AC_MSG_ERROR(Could not link against $ax_lib !)
@@ -148,6 +169,9 @@
xmingw32 )
break;
;;
+ *android* )
+ break;
+ ;;
* )
BOOST_THREAD_LIB="$BOOST_THREAD_LIB -lpthread"
break;
Copy Permalink