You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2026/09/18 02:46:40 UTC

(openoffice) branch trunk updated (57cd559d06 -> 19109cc7d4)

This is an automated email from the ASF dual-hosted git repository.

DonLewisFreeBSD pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


    from 57cd559d06 Restore compatibility with provided files
     new 00754beec5 FreeBSD also needs gb_CFGEXPRECOMMAND
     new 19109cc7d4 testtools bridgetest fails on FreeBSD x86

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 main/solenv/gbuild/platform/freebsd.mk       | 3 +++
 main/testtools/source/bridgetest/makefile.mk | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)


(openoffice) 01/02: FreeBSD also needs gb_CFGEXPRECOMMAND

Posted by tr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

DonLewisFreeBSD pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 00754beec5d69d2fe085905a63a4da988411546d
Author: Don Lewis <tr...@apache.org>
AuthorDate: Thu Sep 17 17:29:34 2026 -0700

    FreeBSD also needs gb_CFGEXPRECOMMAND
    
    gb_CFGEXPRECOMMAND is needed to set LD_LIBRARY_PATH for cfgex to
    build the officecfg module.
---
 main/solenv/gbuild/platform/freebsd.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/main/solenv/gbuild/platform/freebsd.mk b/main/solenv/gbuild/platform/freebsd.mk
index e449708dfb..21869f33fb 100644
--- a/main/solenv/gbuild/platform/freebsd.mk
+++ b/main/solenv/gbuild/platform/freebsd.mk
@@ -518,6 +518,9 @@ gb_Library_COMPONENTPREFIXES := \
     URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
     NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
 
+# Configuration
+gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
 # UnoApiTarget
 
 gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc


(openoffice) 02/02: testtools bridgetest fails on FreeBSD x86

Posted by tr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

DonLewisFreeBSD pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 19109cc7d4e1f4b665df04c118b6691809eb39b0
Author: Don Lewis <tr...@apache.org>
AuthorDate: Thu Sep 17 17:40:22 2026 -0700

    testtools bridgetest fails on FreeBSD x86
    
    Skip bridgetest on FreeBSD x86 because it fails.
---
 main/testtools/source/bridgetest/makefile.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/testtools/source/bridgetest/makefile.mk b/main/testtools/source/bridgetest/makefile.mk
index ca4b8fdd7d..ed93f0ed67 100644
--- a/main/testtools/source/bridgetest/makefile.mk
+++ b/main/testtools/source/bridgetest/makefile.mk
@@ -134,8 +134,8 @@ ALLTAR: \
 
 runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
         $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" || "$(OS)$(CPU)"=="SOLARISS" || "$(OS)$(CPU)"=="FREEBSDP"
-	@echo "Mac OSX PPC GCC and Solaris fails this test! likely broken UNO bridge. Fix me."
+.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" || "$(OS)$(CPU)"=="SOLARISS" || "$(OS)$(CPU)"=="FREEBSDP" || "$(OS)$(CPU)"=="FREEBSDI"
+	@echo "Mac OSX PPC GCC X86 and Solaris fails this test! likely broken UNO bridge. Fix me."
 .ELSE
         cd $(DLLDEST) && $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \
 		-ro uno_services.rdb -ro uno_types.rdb \