bridges/Library_cpp_uno.mk | 8 +++-----
config_host.mk.in | 1 +
configure.ac | 4 +++-
extensions/Executable_pluginapp.bin.mk | 17 +----------------
extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 4 ----
sal/osl/unx/file.cxx | 2 +-
sal/osl/unx/system.h | 2 +-
shell/Module_shell.mk | 8 ++++++++
shell/source/unix/sysshell/recently_used_file.cxx | 2 +-
sysui/CustomTarget_solaris.mk | 6 +++---
10 files changed, 22 insertions(+), 32 deletions(-)
New commits:
commit d2a617aac6466e246de6209731791c1ce835ee62
Author: Richard PALO <rich...@netbsd.org>
Date: Sun Nov 9 18:15:45 2014 +0100
O_RDWR and O_CREAT are defined in fcntl.h
Change-Id: I568ee2c3f103777720f6c39340a5915b10aeebb4
Signed-off-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 88a40e70fe921680ed303b8ab69ca866ae67078e)
diff --git a/shell/source/unix/sysshell/recently_used_file.cxx
b/shell/source/unix/sysshell/recently_used_file.cxx
index 2189d0b..08f96a3 100644
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_file.cxx
@@ -27,7 +27,7 @@
#include <sys/file.h>
#include <sys/types.h>
#include <sys/stat.h>
-
+#include <fcntl.h>
#include <unistd.h>
const OUString RECENTLY_USED_FILE_NAME(".recently-used");
commit 7997129c449b6cbf4c5e7dd4e3a982dc23da7720
Author: Richard PALO <rich...@netbsd.org>
Date: Mon Nov 10 17:45:39 2014 +0100
update solaris directories being referenced
also borrowed from Gabriele Bulfon <gabriele.bulfon at sonicle.com>
Change-Id: I17787fbbf12f1bc8b3e78b8dd2e8b33679bab5b1
Signed-off-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 457105c7d9ede7a4d73d69d1c87306e88d57c0ac)
diff --git a/sysui/CustomTarget_solaris.mk b/sysui/CustomTarget_solaris.mk
index 9f671a8..ed264fe 100644
--- a/sysui/CustomTarget_solaris.mk
+++ b/sysui/CustomTarget_solaris.mk
@@ -45,11 +45,11 @@ $(solaris_WORKDIR)/%/postinstall:
$(solaris_SRCDIR)/postinstall
$(solaris_WORKDIR)/%/postremove: $(solaris_SRCDIR)/postremove
cat $< | tr -d "\015" > $@
-$(solaris_WORKDIR)/%/mailcap: $(solaris_SRCDIR)/prototype
+$(solaris_WORKDIR)/%/prototype: $(solaris_SRCDIR)/prototype
cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$*)/g" -e
"s_%SOURCE_$(call gb_CustomTarget_get_workdir,sysui/share)/$*_g" -e
"s/%ICONPREFIX/$(UNIXFILENAME.$*)/g" > $@
-$(solaris_WORKDIR)/%-desktop-integration.tar.gz: $(solaris_WORKDIR)/copyright
$(solaris_WORKDIR)/pkginfo $(solaris_WORKDIR)/depend $(solaris_WORKDIR)/mailcap
$(solaris_WORKDIR)/postinstall $(solaris_WORKDIR)/postremove
$(solaris_WORKDIR)/prototype $(call
gb_CustomTarget_get_workdir,sysui/share)/%/openoffice.org.xml
- pkgmk -l 1073741824 -r $(solaris_WORKDIR) -f
$(solaris_WORKDIR)/$*/prototype -o -d $(solaris_WORKDIR) ARCH=all
VERSION=$(PKGVERSION.$*)
+$(solaris_WORKDIR)/%-desktop-integration.tar.gz:
$(solaris_WORKDIR)/%/copyright $(solaris_WORKDIR)/%/pkginfo
$(solaris_WORKDIR)/%/depend $(solaris_WORKDIR)/%/mailcap
$(solaris_WORKDIR)/%/postinstall $(solaris_WORKDIR)/%/postremove
$(solaris_WORKDIR)/%/prototype $(call
gb_CustomTarget_get_workdir,sysui/share)/%/openoffice.org.xml
+# pkgmk -l 1073741824 -r $(solaris_WORKDIR) -f
$(solaris_WORKDIR)/$*/prototype -o -d $(solaris_WORKDIR) ARCH=all
VERSION=$(PKGVERSION.$*)
$(GNUTAR) -cf - -C $(solaris_WORKDIR) $*$(LIBO_MAJOR) -desktop-int |
gzip > $@
# vim: set noet sw=4 ts=4:
commit 329429cacf5e1117645bcfed52a15cbd720090a9
Author: Richard PALO <rich...@netbsd.org>
Date: Mon Nov 10 17:33:47 2014 +0100
Do as for Linux, borrowed from Gabriele Bulfon <gabriele.bulfon at
sonicle.com>
Change-Id: Id15c4b355591678023ae97b1183f8f3a01823084
Signed-off-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit a395a395e52af67e943eaa80fc003954fe44efae)
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 3c51964..27158e4 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -22,6 +22,14 @@ $(eval $(call gb_Module_add_targets,shell,\
endif
endif
+ifeq ($(OS),SOLARIS)
+ifeq ($(ENABLE_GIO),TRUE)
+$(eval $(call gb_Module_add_targets,shell,\
+ Library_losessioninstall \
+))
+endif
+endif
+
ifeq ($(ENABLE_GCONF),TRUE)
$(eval $(call gb_Module_add_targets,shell,\
Library_gconfbe \
commit 46fe02b89b2a7f93930f16a399d48efaae0232a4
Author: Richard PALO <rich...@netbsd.org>
Date: Mon Nov 10 17:30:44 2014 +0100
improve SOLARIS guard
Change-Id: Ic5edb7c0977b6c589329cd80616aa320d6cc929b
Signed-off-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 5f35b74bb1367a07b1f2d85c6665b31c906b9538)
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 3a0babd..2cdf7fd 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -43,7 +43,7 @@
#include <sys/types.h>
/* Make sockets of type AF_UNIX use underlying FS rights */
-#ifdef SOLARIS
+#if defined(SOLARIS) && !defined(_XOPEN_SOURCE)
# define _XOPEN_SOURCE 500
# include <sys/socket.h>
# undef _XOPEN_SOURCE
commit 821b016a5054c69ef64a341c1d0c390ec31d86cc
Author: Richard PALO <rich...@netbsd.org>
Date: Mon Nov 10 17:28:59 2014 +0100
SOLARIS can use/should use posix_madvise under certain conditions.
Change-Id: Idc40752b4beee932b5912e6df9fe6acb15571201
Signed-off-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 92c5bc7d6bc9dec429114a0f72f6f5989d70f731)
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index a7eaac1..705b807 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1167,7 +1167,7 @@ SAL_CALL osl_mapFile (
// OS simultaneously pages in the rest); on other platforms, it remains
// to be evaluated whether madvise or equivalent is available and
// actually useful:
-#if defined MACOSX
+#if defined MACOSX || ( defined(SOLARIS) && ( !defined(__XOPEN_OR_POSIX) ||
defined(_XPG6) || defined(__EXTENSIONS__) ) )
int e = posix_madvise(p, nLength, POSIX_MADV_WILLNEED);
if (e != 0)
{
commit 062e19093e3244eea9e0003e344a5400a74ad43c
Author: Richard PALO <rich...@netbsd.org>
Date: Mon Nov 10 17:27:46 2014 +0100
cleanup improper SOLARIS linker libs and options
and, most importantly, forget MOTIF!
Signed-off-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 7970fa513006af45994122a0ec42486e7b32cbe6)
Conflicts:
extensions/source/plugin/inc/plugin/unx/plugcon.hxx
Change-Id: I0230932618b396ec4d5bf7638a13e5a80a4fada0
diff --git a/extensions/Executable_pluginapp.bin.mk
b/extensions/Executable_pluginapp.bin.mk
index e24390e..96a25cc 100644
--- a/extensions/Executable_pluginapp.bin.mk
+++ b/extensions/Executable_pluginapp.bin.mk
@@ -33,15 +33,7 @@ $(eval $(call gb_Executable_use_libraries,pluginapp.bin,\
sal \
))
-ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Executable_add_libs,pluginapp.bin,\
- -lXm \
- -lXt \
- -lXext \
- -lX11 \
- -ldl \
-))
-else ifeq ($(filter-out FREEBSD NETBSD OPENBSD DRAGONFLY,$(OS)),)
+ifeq ($(filter-out FREEBSD NETBSD OPENBSD DRAGONFLY,$(OS)),)
$(eval $(call gb_Executable_add_libs,pluginapp.bin,\
-lXt \
-lXext \
@@ -72,13 +64,6 @@ $(eval $(call gb_Executable_use_externals,pluginapp.bin,\
gtk \
))
-# the orignal dmakefile said: don't ask, it's ugly
-ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Executable_set_ldflags,pluginapp.bin,\
- -z nodefs \
-))
-endif
-
endif
# vim:set noet sw=4 ts=4:
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 0d8f787..6b9acb8 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -35,10 +35,6 @@
#include <vector>
#include <plugin/unx/mediator.hxx>
-#if defined SOLARIS
-# define USE_MOTIF
-#endif
-
#define Window XLIB_Window
#define Font XLIB_Font
#define KeyCode XLIB_KeyCode
commit e1484cbda84eb4450437382f63bacdf020467ef0
Author: Richard PALO <rich...@netbsd.org>
Date: Mon Nov 10 17:25:47 2014 +0100
READELF needs to be defined for unix such as SOLARIS
Change-Id: I749fa8a19e00957a3f83f41e029687b435a3a903
Signed-off-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit ee49e52c66c18b50d2e92105e75e10e69fe04bf8)
diff --git a/config_host.mk.in b/config_host.mk.in
index 36a6866..200c384 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -467,6 +467,7 @@ export PYTHON_VERSION_MINOR=@PYTHON_VERSION_MINOR@
export RANLIB=@RANLIB@
export RAPTOR_MAJOR=@RAPTOR_MAJOR@
export RASQAL_MAJOR=@RASQAL_MAJOR@
+export READELF=@READELF@
export REDLAND_CFLAGS=$(gb_SPACE)@REDLAND_CFLAGS@
export REDLAND_LIBS=$(gb_SPACE)@REDLAND_LIBS@
export REDLAND_MAJOR=@REDLAND_MAJOR@
diff --git a/configure.ac b/configure.ac
index adb9084..3426484 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4685,7 +4685,7 @@ if test "$cross_compiling" = "yes"; then
(
unset COM GUIBASE OS CPUNAME
unset CC CXX SYSBASE CFLAGS
- unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
+ unset AR NM OBJDUMP PKG_CONFIG RANLIB READELF STRIP
unset CPPUNIT_CFLAGS CPPUNIT_LIBS
unset LIBXML_CFLAGS LIBXML_LIBS LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC
test -n "$CC_FOR_BUILD" && export CC="$CC_FOR_BUILD"
@@ -5262,6 +5262,7 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
AC_CHECK_TOOL(NM,nm)
AC_CHECK_TOOL(OBJDUMP,objdump)
AC_CHECK_TOOL(RANLIB,ranlib)
+ AC_CHECK_TOOL(READELF,readelf)
AC_CHECK_TOOL(STRIP,strip)
if test "$_os" = "WINNT"; then
AC_CHECK_TOOL(DLLTOOL,dlltool)
@@ -5274,6 +5275,7 @@ AC_SUBST(NM)
AC_SUBST(OBJDUMP)
AC_SUBST(PKG_CONFIG)
AC_SUBST(RANLIB)
+AC_SUBST(READELF)
AC_SUBST(STRIP)
AC_SUBST(WINDRES)
commit 623c646102d28ec53c38e737b7bf735702eee7f6
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Jun 23 10:54:19 2014 +0200
fdo#71000: Fix SOLARIS-INTEL case
Thanks to Dagobert Michelsen for noticing.
Change-Id: Ife333e74c145ad71c451cb60ba9a8ee4222a2183
(cherry picked from commit 94b2fe9b00c28e12bbd98ade8c5a31179c290da0)
Signed-off-by: Michael Stahl <mst...@redhat.com>
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index c6ab9a0..d929c868 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -63,6 +63,9 @@ else ifeq ($(OS),MACOSX)
bridges_SELECTED_BRIDGE := gcc3_macosx_intel
bridge_asm_objects := call
bridge_exception_objects := cpp2uno except uno2cpp
+else ifeq ($(OS),SOLARIS)
+bridges_SELECTED_BRIDGE := gcc3_solaris_intel
+bridge_exception_objects := cpp2uno except uno2cpp
else ifeq ($(COM),MSC)
bridges_SELECTED_BRIDGE := msvc_win32_intel
bridge_exception_objects := cpp2uno dllinit uno2cpp
@@ -145,11 +148,6 @@ bridges_SELECTED_BRIDGE := gcc3_macosx_powerpc
bridge_noopt_objects := uno2cpp
bridge_exception_objects := cpp2uno except
-else ifeq ($(OS)-$(CPUNAME),SOLARIS-INTEL)
-
-bridges_SELECTED_BRIDGE := gcc3_solaris_intel
-bridge_exception_objects := cpp2uno except uno2cpp
-
else ifeq ($(OS)-$(CPUNAME),SOLARIS-SPARC)
bridges_SELECTED_BRIDGE := gcc3_solaris_sparc
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
