RepositoryExternal.mk | 1 - config_host.mk.in | 1 - external/liborcus/ExternalProject_liborcus.mk | 2 +- m4/ax_boost_filesystem.m4 | 5 ----- 4 files changed, 1 insertion(+), 8 deletions(-)
New commits: commit b9ab69288319874177660e545ec1de082448ca8f Author: Thorsten Behrens <[email protected]> AuthorDate: Wed Sep 17 12:48:04 2025 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Wed Sep 17 15:00:35 2025 +0200 Cleanup BOOST_SYSTEM_LIB after upgrade to boost 1.89 Fixup after 421a66fc52c0749aab511e03e7d590399503ad1e which left some BOOST_SYSTEM_LIB usage, breaking system-boost builds. Change-Id: I64bdcc163a954927684a83bf1c1ef98238acf9c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191078 Reviewed-by: Xisco Fauli <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> Tested-by: Jenkins diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d820115f40de..ce5a2ee5f75b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3404,7 +3404,6 @@ $(call gb_LinkTarget_add_libs,$(1),\ $(if $(SYSTEM_BOOST), \ $(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \ - $(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \ ) endef diff --git a/config_host.mk.in b/config_host.mk.in index 48d2ed3d76dc..143576c3aa9a 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -48,7 +48,6 @@ export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ export BOOST_FILESYSTEM_LIB=@BOOST_FILESYSTEM_LIB@ export BOOST_IOSTREAMS_LIB=@BOOST_IOSTREAMS_LIB@ export BOOST_LDFLAGS=@BOOST_LDFLAGS@ -export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@ export BOX2D_CFLAGS=@BOX2D_CFLAGS@ export BOX2D_LIBS=@BOX2D_LIBS@ export BRAND_INTRO_IMAGES=@BRAND_INTRO_IMAGES@ diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index d9bd86da7e12..3fc01cbb448d 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -38,7 +38,7 @@ ifneq ($(SYSTEM_ZLIB),) liborcus_LIBS+=-lz endif ifneq ($(SYSTEM_BOOST),) -liborcus_LIBS+=$(BOOST_SYSTEM_LIB) $(BOOST_IOSTREAMS_LIB) $(BOOST_FILESYSTEM_LIB) +liborcus_LIBS+=$(BOOST_IOSTREAMS_LIB) $(BOOST_FILESYSTEM_LIB) else liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboost_iostreams -lboost_filesystem endif diff --git a/m4/ax_boost_filesystem.m4 b/m4/ax_boost_filesystem.m4 index 12f7bc5e2ebc..be77f81618bc 100644 --- a/m4/ax_boost_filesystem.m4 +++ b/m4/ax_boost_filesystem.m4 @@ -63,10 +63,6 @@ AC_DEFUN([AX_BOOST_FILESYSTEM], LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" export LDFLAGS - LIBS_SAVED=$LIBS - LIBS="$LIBS $BOOST_SYSTEM_LIB" - export LIBS - AC_CACHE_CHECK(whether the Boost::Filesystem library is available, ax_cv_boost_filesystem, [AC_LANG_PUSH([C++]) @@ -113,6 +109,5 @@ AC_DEFUN([AX_BOOST_FILESYSTEM], CPPFLAGS="$CPPFLAGS_SAVED" LDFLAGS="$LDFLAGS_SAVED" - LIBS="$LIBS_SAVED" fi ])
