[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 3 commits - bin/distro-install-desktop-integration bridges/Library_cpp_uno.mk configure.ac extensions/Library_npsoplugin.mk vcl/Executable_xid_fullscreen_on_all_monitors.mk

[Baptiste Daroussin]

 bin/distro-install-desktop-integration           |    2 +-
 bridges/Library_cpp_uno.mk                       |    2 +-
 configure.ac                                     |    2 +-
 extensions/Library_npsoplugin.mk                 |    2 ++
 vcl/Executable_xid_fullscreen_on_all_monitors.mk |    2 ++
 5 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 560e41d50a946c2c548671f4e0a0c6f5dcd4066c
Author: Baptiste Daroussin <bapt at FreeBSD.org>
Date:   Tue Jun 10 18:32:51 2014 +0200

    Filter out OS not needing -ldl
    
    Change-Id: I5863de6d8b1f0fe2419ea7419b1ff90087bb513d
    Reviewed-on: https://gerrit.libreoffice.org/9715
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit a5a17ccdbc870b475e6a2dc076a780b55e16ccab)

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index f56a1d3..c6ab9a0 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -199,7 +199,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	$(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \
 ))
 
-ifeq ($(filter ANDROID WNT,$(OS)),)
+ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
 $(eval $(call gb_Library_add_libs,gcc3_uno,\
 	-ldl \
 ))
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 4f385d9..9178a9d 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -23,9 +23,11 @@ $(eval $(call gb_Library_use_static_libraries,npsoplugin,\
 
 ifneq ($(OS),WNT)
 
+ifeq ($(filter ANDROID DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
 $(eval $(call gb_Library_add_libs,npsoplugin,\
 	-ldl \
 ))
+endif
 
 $(eval $(call gb_Library_use_external,npsoplugin,gtk))
 
diff --git a/vcl/Executable_xid_fullscreen_on_all_monitors.mk b/vcl/Executable_xid_fullscreen_on_all_monitors.mk
index 5f9c127..ee17162 100644
--- a/vcl/Executable_xid_fullscreen_on_all_monitors.mk
+++ b/vcl/Executable_xid_fullscreen_on_all_monitors.mk
@@ -9,9 +9,11 @@
 
 $(eval $(call gb_Executable_Executable,xid-fullscreen-on-all-monitors))
 
+ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
 $(eval $(call gb_Executable_add_libs,xid-fullscreen-on-all-monitors,\
     -ldl \
 ))
+endif
 
 $(eval $(call gb_Executable_add_cobjects,xid-fullscreen-on-all-monitors,\
     vcl/unx/gtk/window/xid_fullscreen_on_all_monitors \
commit 476eec28198379c9279febc1ec2d07f4f2369c27
Author: Baptiste Daroussin <bapt at FreeBSD.org>
Date:   Tue Jun 10 18:58:19 2014 +0200

    Do not hard code bash path
    
    Change-Id: I24ee2599ffe8029c3d3888de49cff8bfd0a368e0
    Reviewed-on: https://gerrit.libreoffice.org/9723
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 098b0bf8630f233fe7d3eba49c85a98929ce9929)

diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index 18107e0..40ad98c 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -115,7 +115,7 @@ sed -i \
     export KDEMAINDIR=$PREFIXDIR
     export GNOMEDIR=$PREFIXDIR
     export GNOME_MIME_THEME=hicolor
-    /bin/bash ./create_tree.sh
+    bash ./create_tree.sh
 )
 cd -
 rm -rf $sysui_temp
commit cba10428496f6685d71b6ffecefc4f4bfce088d5
Author: Baptiste Daroussin <bapt at FreeBSD.org>
Date:   Tue Jun 10 18:22:53 2014 +0200

    On FreeBSD x86_64 is named amd64
    
    Change-Id: I14c653f8b3fe0dc9855aa51643cfc40cbccb763e
    Reviewed-on: https://gerrit.libreoffice.org/9714
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 93152e2633c3da2b1993c69857baf11edada705e)

diff --git a/configure.ac b/configure.ac
index 7d27e92..d2ffa7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4235,7 +4235,7 @@ freebsd*)
         PLATFORMID=freebsd_x86
         OUTPATH=unxfbsdi
         ;;
-    x86_64)
+    x86_64|amd64)
         CPUNAME=X86_64
         RTL_ARCH=X86_64
         PLATFORMID=freebsd_x86_64