[Libreoffice-commits] .: 3 commits - desktop/Executable_oosplash.mk sfx2/Module_sfx2.mk solenv/gbuild solenv/inc

Michael Stahl mst at kemper.freedesktop.org
Tue Jul 10 09:46:45 PDT 2012


 desktop/Executable_oosplash.mk    |    4 ++--
 sfx2/Module_sfx2.mk               |    2 +-
 solenv/gbuild/platform/solaris.mk |   10 +++++-----
 solenv/inc/unxsogi.mk             |    2 +-
 solenv/inc/unxsogs.mk             |    2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit b84e197e696e2d29616abde0f5e84484eef2ddc8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jul 10 18:42:42 2012 +0200

    gbuild: Solaris: fix gb_LinkTarget_LDFLAGS:
    
    This was accidentally commented out, and thus SOLARLIB was not in
    effect; fixing this should obviate the need for any
    -L$(gb_Library_OUTDIRLOCATION).

diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 523be83..054398c 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -147,6 +147,7 @@ gb_LinkTarget_LDFLAGS += \
 endif
 
 #JAD#	-Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
+
 gb_LinkTarget_LDFLAGS += \
 	-L$(SYSBASE)/lib \
 	-L$(SYSBASE)/usr/lib \
@@ -301,9 +302,9 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
-define gb_Library__get_rpath
-$(if $(1),$(strip '-Wl,-rpath,$(1)' -L$(gb_Library_OUTDIRLOCATION)))
 #JAD#'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
+define gb_Library__get_rpath
+$(if $(1),$(strip '-Wl,-rpath,$(1)'))
 endef
 
 define gb_Library_get_rpath
@@ -363,7 +364,7 @@ gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
 gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
 
 define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH := -L$(gb_Library_OUTDIRLOCATION)
+$(call gb_LinkTarget_get_target,$(2)) : RPATH :=
 
 endef
 
commit 7d7b41cf12a7026ea583e34dbb31196a884db65b
Author: Pierre-Eric Pelloux-Prayer <pierre-eric at lanedo.com>
Date:   Mon Jul 9 11:52:50 2012 +0200

    solaris/intel: update .mk files to fix build errors
    
    Change-Id: Iba306cde71eb5efeed29a4a44cefa19a47bac84b

diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index a75f11a..a4451f3 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -80,8 +80,8 @@ endif
 
 ifeq ($(OS),SOLARIS)
 
-$(eval $(call gb_Executable_use_libraries,oosplash,\
-    socket \
+$(eval $(call gb_Executable_add_libs,oosplash,\
+    -lsocket \
 ))
 
 endif
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index 81b501a..1e316eb 100644
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\
 ))
 endif
 
-ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
+ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD SOLARIS, $(OS)))
 ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
 $(eval $(call gb_Module_add_targets,sfx2,\
     Library_qstart \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 8639793..523be83 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -302,7 +302,7 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
 define gb_Library__get_rpath
-$(if $(1),$(strip '-Wl,-rpath,$(1)' '-L$(gb_Library_OUTDIRLOCATION)'))
+$(if $(1),$(strip '-Wl,-rpath,$(1)' -L$(gb_Library_OUTDIRLOCATION)))
 #JAD#'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
 endef
 
@@ -312,7 +312,6 @@ endef
 
 define gb_Library_Library_platform
 $(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1))
-
 endef
 
 
@@ -364,7 +363,7 @@ gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
 gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
 
 define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH :=
+$(call gb_LinkTarget_get_target,$(2)) : RPATH := -L$(gb_Library_OUTDIRLOCATION)
 
 endef
 
@@ -408,8 +407,8 @@ define gb_InstallModuleTarget_InstallModuleTarget_platform
 $(call gb_InstallModuleTarget_add_defs,$(1),\
 	$(gb_CPUDEFS) \
 	$(gb_OSDEFS) \
-	-DCOMID=C52 \
-	-DCOMNAME=sunpro5 \
+	-DCOMID=gcc3 \
+	-DCOMNAME=gcc3 \
 	$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
 )
 
commit 88da060b47b46da506a6760f7b24cd95cfc6a8f6
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jul 10 18:14:02 2012 +0200

    solenv/inc: SOLAR_JAVA should not be overwritten here.
    
    SOLAR_JAVA should really be set by configure.
    
    Thanks to Pierre-Eric Pelloux-Prayer <pierre-eric at lanedo.com> for the
    hint.

diff --git a/solenv/inc/unxsogi.mk b/solenv/inc/unxsogi.mk
index 49ca1f3..7187556 100644
--- a/solenv/inc/unxsogi.mk
+++ b/solenv/inc/unxsogi.mk
@@ -29,7 +29,7 @@
 ASM=/usr/ccs/bin/as
 AFLAGS=-P
 
-SOLAR_JAVA=TRUE
+SOLAR_JAVA*=TRUE
 JAVAFLAGSDEBUG=-g
 
 # _PTHREADS is needed for the stl
diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk
index 6a17f59..a415143 100644
--- a/solenv/inc/unxsogs.mk
+++ b/solenv/inc/unxsogs.mk
@@ -29,7 +29,7 @@
 ASM=/usr/ccs/bin/as
 AFLAGS=-P
 
-SOLAR_JAVA=TRUE
+SOLAR_JAVA*=TRUE
 JAVAFLAGSDEBUG=-g
 
 # _PTHREADS is needed for the stl


More information about the Libreoffice-commits mailing list