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

[Bjoern Michaelsen]

 solenv/gbuild/Deliver.mk        |    4 ++--
 solenv/gbuild/gbuild.mk         |    4 ++--
 solenv/gbuild/platform/linux.mk |    6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 681c3fad7240cca5c04dd71117a8d22a3a830704
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Mar 21 14:01:31 2011 +0100

    enable optional deliver by hardlink with gb_Deliver_HARDLINK

diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
index d395c86..c2a5e08 100644
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@ -45,11 +45,11 @@ endef
 
 ifeq ($(strip $(gb_Deliver_GNUCOPY)),)
 define gb_Deliver_deliver
-mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) cp -f $(1) $(2) && touch -r $(1) $(2)
+mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -f) $(1) $(2) && touch -r $(1) $(2)
 endef
 else
 define gb_Deliver_deliver
-mkdir -p $(dir $(2)) && $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --force --preserve=timestamps $(1) $(2)
+mkdir -p $(dir $(2)) && $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) $(if $(gb_Deliver_HARDLINK),--link) --force --preserve=timestamps $(1) $(2)
 endef
 endif
 
commit 1ed2342c1e33c28ad048205c4a708fe7b39bfb17
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Mar 21 14:00:28 2011 +0100

    stripping on linking on linux unless SYMBOLS or DEBUG have been requested

diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 3a708b7..1251523 100755
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -141,6 +141,12 @@ gb_LinkTarget_LDFLAGS += \
 
 endif
 
+ifneq ($(gb_SYMBOL),$(true))
+gb_LinkTarget_LDFLAGS += \
+	-Wl,--strip-all \
+
+endif
+
 ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS := -O0
 else
commit 87ec325107b37dcdec0b83fb8a0629d5242dcc6c
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Mar 21 14:00:03 2011 +0100

    fixing gb_SYMBOL logic

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index d9479d1..358dfec 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -82,9 +82,9 @@ endif
 endif
 
 ifneq ($(strip $(SYMBOL)$(symbol)$(SYMBOLS)$(symbols)),)
-gb_SYMBOL := $(false)
-else
 gb_SYMBOL := $(true)
+else
+gb_SYMBOL := $(false)
 endif