mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-01 11:18:09 -07:00
2cc8e49653
Closes: https://bugs.gentoo.org/964602 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
69 lines
2.6 KiB
Diff
69 lines
2.6 KiB
Diff
From 1b4e37d71506e6ad19f15190907852978507fc6a Mon Sep 17 00:00:00 2001
|
|
From: Andrew Caudwell <acaudwell@gmail.com>
|
|
Date: Wed, 13 Aug 2025 13:56:09 +1200
|
|
Subject: [PATCH] Fixed build with Boost 1.89.0 by no longer linking boost
|
|
system.
|
|
|
|
Increased minimum required version of Boost to 1.69.
|
|
|
|
Updated ax_boost_base.m4 macro
|
|
---
|
|
configure.ac | 3 +-
|
|
m4/ax_boost_base.m4 | 8 +--
|
|
2 files changed, 5 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 7220260b..4cbd354b 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -46,8 +46,7 @@ AC_CHECK_FUNCS([IMG_LoadPNG_RW], , AC_MSG_ERROR([SDL2_image with PNG support req
|
|
AC_CHECK_FUNCS([IMG_LoadJPG_RW], , AC_MSG_ERROR([SDL2_image with JPEG support required. Please see INSTALL]))
|
|
|
|
#BOOST
|
|
-AX_BOOST_BASE([1.46], , AC_MSG_ERROR(Boost Filesystem >= 1.46 is required. Please see INSTALL))
|
|
-AX_BOOST_SYSTEM
|
|
+AX_BOOST_BASE([1.69], , AC_MSG_ERROR(Boost Filesystem >= 1.69 is required. Please see INSTALL))
|
|
AX_BOOST_FILESYSTEM
|
|
|
|
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
|
|
diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4
|
|
index 6c944b16..9d5a08c6 100644
|
|
--- a/m4/ax_boost_base.m4
|
|
+++ b/m4/ax_boost_base.m4
|
|
@@ -10,7 +10,7 @@
|
|
#
|
|
# Test for the Boost C++ libraries of a particular version (or newer)
|
|
#
|
|
-# If no path to the installed boost library is given the macro searchs
|
|
+# If no path to the installed boost library is given the macro searches
|
|
# under /usr, /usr/local, /opt, /opt/local and /opt/homebrew and evaluates
|
|
# the $BOOST_ROOT environment variable. Further documentation is available
|
|
# at <http://randspringer.de/boost/index.html>.
|
|
@@ -33,7 +33,7 @@
|
|
# and this notice are preserved. This file is offered as-is, without any
|
|
# warranty.
|
|
|
|
-#serial 51
|
|
+#serial 55
|
|
|
|
# example boost program (need to pass version)
|
|
m4_define([_AX_BOOST_BASE_PROGRAM],
|
|
@@ -114,7 +114,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
|
|
AS_CASE([${host_cpu}],
|
|
[x86_64],[libsubdirs="lib64 libx32 lib lib64"],
|
|
[mips*64*],[libsubdirs="lib64 lib32 lib lib64"],
|
|
- [ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k],[libsubdirs="lib64 lib lib64"],
|
|
+ [ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k|loongarch64],[libsubdirs="lib64 lib lib64"],
|
|
[libsubdirs="lib"]
|
|
)
|
|
|
|
@@ -289,6 +289,8 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
|
|
else
|
|
AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
|
|
fi
|
|
+ BOOST_LDFLAGS=""
|
|
+ BOOST_CPPFLAGS=""
|
|
# execute ACTION-IF-NOT-FOUND (if present):
|
|
ifelse([$3], , :, [$3])
|
|
else
|