[Libreoffice-commits] .: 3 commits - RepositoryFixes.mk solenv/gbuild

[Robert Nagy]

 RepositoryFixes.mk               |    2 +-
 solenv/gbuild/platform/unxgcc.mk |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9d04423c39f53e68b2977d932cafe7cc0bde76ed
Merge: 1be6de4... fb6b4ef...
Author: Robert Nagy <robert at openbsd.org>
Date:   Sun Apr 3 22:16:36 2011 +0200

    Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap

commit 1be6de47c93d9ead8ce2005e7bfd1956be7265c7
Author: Robert Nagy <robert at openbsd.org>
Date:   Sun Apr 3 22:13:19 2011 +0200

    add -Wl,--sysroot=$(SYSBASE) to gb_LinkTarget_LDFLAGS only if SYSBASE is !nil

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 5b5d76f..e52684f 100755
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -105,6 +105,8 @@ endif
 ifneq ($(strip $(SYSBASE)),)
 gb_CXXFLAGS += --sysroot=$(SYSBASE)
 gb_CFLAGS += --sysroot=$(SYSBASE)
+gb_LinkTarget_LDFLAGS += \
+	-Wl,--sysroot=$(SYSBASE)
 endif
 gb_LinkTarget_EXCEPTIONFLAGS := \
 	-DEXCEPTIONS_ON \
@@ -116,7 +118,6 @@ gb_LinkTarget_NOEXCEPTIONFLAGS := \
 	-fno-exceptions \
 
 gb_LinkTarget_LDFLAGS += \
-	-Wl,--sysroot=$(SYSBASE) \
 	-Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
 	-Wl,-z,combreloc \
 	$(subst -L../lib , ,$(SOLARLIB)) \
commit 243289560f631c96526fe183c91b8df8973c9831
Author: Robert Nagy <robert at openbsd.org>
Date:   Sun Apr 3 22:10:37 2011 +0200

    filter some library names on *BSD too just like on LINUX

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 877419b..15a0f87 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -30,7 +30,7 @@
 
 # Make has no support for 'or' clauses in conditionals,
 # we use a filter expression instead.
-ifneq (,$(filter LINUX DRAGONFLY, $(OS)))
+ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
 gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))