[Libreoffice-commits] .: 4 commits - configure.in set_soenv.in solenv/inc soltools/util

[Tor Lillqvist]

 configure.in               |    7 -------
 set_soenv.in               |    2 +-
 solenv/inc/unitools.mk     |    5 +++--
 soltools/util/makefile.pmk |    2 ++
 4 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 66a482f46b4c1a134a00a09f8e4748f4f9522095
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jul 3 16:46:16 2011 +0300

    Perhaps the GNU ld requirement is bogus on current (Open)Solaris descendants

diff --git a/configure.in b/configure.in
index e21c5fe..3550498 100755
--- a/configure.in
+++ b/configure.in
@@ -1636,13 +1636,6 @@ if test \( "$_os" != "WINNT" -o "$WITH_MINGW" = "yes" \) -a "$GCC" = "yes"; then
    else
       AC_MSG_RESULT([checked (gcc $_gcc_version)])
    fi
-   if test "$_os" = "SunOS"; then
-      AC_MSG_CHECKING([gcc linker])
-      if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then
-          AC_MSG_ERROR([failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris])
-      fi
-      AC_MSG_RESULT([ok (GNU ld)])
-   fi
 fi
 
 HAVE_LD_BSYMBOLIC_FUNCTIONS=
commit 7959929de85a96f6103e516cf9d7eca6ba0a3a1c
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jul 3 16:42:02 2011 +0300

    Update GNU{COPY,PATCH,MAKE} for Solaris
    
    There are lots of (Open)Solaris variants, but this is what happens to
    work for what I briefly experimented with, oi_148.

diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index f28f015..c07e5c3 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -117,9 +117,10 @@ COPYRECURSE=-r
 .ENDIF
 .IF "$(OS)"=="SOLARIS"
 AWK*=nawk
-GNUCOPY*=gnucp
-GNUPATCH*=gnupatch
+GNUCOPY*=/usr/gnu/bin/cp
+GNUPATCH*=/usr/gnu/bin/patch
 GNUTAR*=/usr/sfw/bin/gtar
+GNUMAKE=/usr/sfw/bin/make
 DEREFERENCE=
 .ELIF "$(OS)"=="AIX"
 AWK*=/opt/freeware/bin/awk
commit a066924649ac993b2d4da65a98c49c276ba7cfb9
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jul 3 16:37:39 2011 +0300

    Most likely pointless to pass -I $COMPATH/include when using gcc
    
    Surely gcc finds its default header location anyway.

diff --git a/set_soenv.in b/set_soenv.in
index 62283e1..022a86e 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1321,7 +1321,7 @@ if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
 $SOLARINC            .= '/SC5 ';
 }
 # Platform dependent include path at the top of this list of include paths
-if ($platform =~ m/solaris/)
+if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
 {
     $SOLARINC         .= $I.$COMPATH.$INCLUDE;
 }
commit 277a315b4cf6647e115a9927eb9fe495cea45611
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jul 3 16:18:59 2011 +0300

    No prod/include/CC/Cstd stuff with gcc

diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk
index 003cf1c..f00c98c 100755
--- a/soltools/util/makefile.pmk
+++ b/soltools/util/makefile.pmk
@@ -38,5 +38,7 @@ HELP_COMPATH:=$(subst,/binx, $(COMPATH:+"x"))
 .ELSE			# "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
 HELP_COMPATH:=$(COMPATH)
 .ENDIF			# "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
+.IF "$(COM)"!="GCC"
 SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/Cstd
 .ENDIF
+.ENDIF