core.git: Branch 'distro/collabora/co-25.04' - solenv/gbuild

[Andras Timar (via logerrit)]

 solenv/gbuild/extensions/pre_MergedLibsList.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f480371b3264c411f77b0731156f81670f92e7d0
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Jul 21 14:48:15 2025 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Jul 21 14:48:15 2025 +0200

    add OGLTrans target conditionally
    
    without this patch the build breaks when --enable-mpl-subset and
    --enable-mergelibs=more are passed to autogen.sh.
    
    *** used LinkTarget Library/libOGLTranslo.dylib not defined.  Stop.
    
    Change-Id: I610055da46fd1002e9b8d70a7db8964a0f9ad0db

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 3c780ec65199..2592112bd3d9 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -165,7 +165,7 @@ gb_MERGE_LIBRARY_LIST += \
        msforms \
        $(call gb_Helper_optional,DBCONNECTIVITY,mysql_jdbc) \
        $(call gb_Helper_optional,MARIADBC,$(call 
gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \
-       OGLTrans \
+       $(if $(ENABLE_OPENGL_TRANSITIONS),OGLTrans) \
        odbc \
        pdffilter \
        $(if $(BUILD_POSTGRESQL_SDBC),postgresql-sdbc) \