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 +++--- 9 files changed, 19 insertions(+), 27 deletions(-)
New commits: commit 88a40e70fe921680ed303b8ab69ca866ae67078e 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> 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 457105c7d9ede7a4d73d69d1c87306e88d57c0ac 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> 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 a395a395e52af67e943eaa80fc003954fe44efae 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> diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index 48c7cc3..46f081d 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 5f35b74bb1367a07b1f2d85c6665b31c906b9538 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> diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h index d952518..b3162f1 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 92c5bc7d6bc9dec429114a0f72f6f5989d70f731 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> diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index e9d91b4..b592151 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -1171,7 +1171,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 7970fa513006af45994122a0ec42486e7b32cbe6 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! Change-Id: I0230932618b396ec4d5bf7638a13e5a80a4fada0 Signed-off-by: Michael Stahl <mst...@redhat.com> 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 b505bda..3ae38b0 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 - #include <prex.h> #include <X11/Xlib.h> commit ee49e52c66c18b50d2e92105e75e10e69fe04bf8 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> diff --git a/config_host.mk.in b/config_host.mk.in index 7a5d42a..083e1d1 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -472,6 +472,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 3c61a70..0e928f6 100644 --- a/configure.ac +++ b/configure.ac @@ -4421,7 +4421,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" @@ -4977,6 +4977,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) @@ -4989,6 +4990,7 @@ AC_SUBST(NM) AC_SUBST(OBJDUMP) AC_SUBST(PKG_CONFIG) AC_SUBST(RANLIB) +AC_SUBST(READELF) AC_SUBST(STRIP) AC_SUBST(WINDRES) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits