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

[Lubos Lunak]

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

New commits:
commit 0718414fc2f32336b796b2760469fc50bf454961
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Apr 11 17:00:53 2011 +0200

    do not include 3+ from GPLv3+ in the make version

diff --git a/configure.in b/configure.in
index f9a30d4..f1a476e 100755
--- a/configure.in
+++ b/configure.in
@@ -1995,7 +1995,7 @@ if test -z "$GNUMAKE"; then
 fi
 
 AC_MSG_CHECKING([the GNU make version])
-_make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
+_make_version=`$GNUMAKE --version | grep GNU | grep -v GPL | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
 _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
 if test "$_make_longver" -ge "038100" ; then
     AC_MSG_RESULT([$GNUMAKE $_make_version])
commit 25dfe687a62fce1fa54e2f4e482cd82ecb1e45dc
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Apr 11 16:54:31 2011 +0200

    no 'hello world' printing from configure

diff --git a/configure.in b/configure.in
index bbeda5a..f9a30d4 100755
--- a/configure.in
+++ b/configure.in
@@ -2051,7 +2051,7 @@ if test "$GCC" = "yes" ; then
 #include <stdio.h>
 
 int main(char argc, char** argv) {
-   printf ("hello world\n");
+   printf ("");
    return 0;
 }
        ], HAVE_LD_HASH_STYLE=TRUE; WITH_LINKER_HASH_STYLE=$hash_style, HAVE_LD_HASH_STYLE=FALSE)
commit 6715c13e0e02f74276dc3d681f39bf5cb3192266
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Apr 11 16:48:11 2011 +0200

    $(WITH_LINKER_HASH_STYLE) also for gbuild

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index f124c59..3d8d9af 100755
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -128,7 +128,7 @@ gb_LinkTarget_LDFLAGS += \
 
 ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
 gb_LinkTarget_LDFLAGS += \
-	-Wl,--hash-style=both \
+	-Wl,--hash-style=$(WITH_LINKER_HASH_STYLE) \
 
 endif