[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - connectivity/source download

[Christian Lohmaier]

 connectivity/source/drivers/postgresql/makefile.mk |   11 ++---------
 download                                           |    3 ++-
 2 files changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 968dee3f4e392753d1663d8a5fc2f73e696003e1
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Thu Dec 15 15:36:30 2011 +0100

    -Wl,-dead_strip_dylibs is not supported with XCode 2.5, align with master

diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk
index c99deae..cc6a4df 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -91,16 +91,9 @@ LIBPQ_DEP_LIBS+=\
 .ENDIF
 .ELSE
 LIBPQ_LINK=$(OUTDIR)/lib/libpq.a
-.IF "$(OS)"=="MACOSX"
-LIBPQ_DEP_LIBS += -Wl,-dead_strip_dylibs
-.ELSE
-LIBPQ_DEP_LIBS += -Wl,--as-needed
-.ENDIF
+LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX $(NULL) -Wl,--as-needed)
 .INCLUDE : $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk
-.IF "$(OS)"=="MACOSX"
-.ELSE
-LIBPQ_DEP_LIBS += -Wl,--no-as-needed
-.ENDIF
+LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX $(NULL) -Wl,--no-as-needed)
 .ENDIF
 POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql
 POSTGRESQL_LIB=
commit c3add9d8919a8d10a695cb69c513d94aa1a8f757
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Thu Dec 15 14:18:19 2011 +0100

    when using linked git, use the same branch as the main repo

diff --git a/download b/download
index c889a46..cf9f8c1 100755
--- a/download
+++ b/download
@@ -52,8 +52,9 @@ if [ -d .git ] ; then
     else
         # space-saving clone from another local workdir
         mkdir clone
+        branch=$(git symbolic-ref HEAD | cut -d"/" -f 3)
         for i in $GIT_REPO_NAMES ; do
-            bin/git-new-workdir $GIT_LINK_SRC/$i clone/$i
+            bin/git-new-workdir $GIT_LINK_SRC/$i clone/$i $branch
             for d in clone/$i/* ; do
                 if [ "${d}" != "clone/$i/git-hooks" ]; then
                     ln -sfn ${d} $(basename ${d})