[Libreoffice-commits] core.git: solenv/gbuild

[Ryo ONODERA]

 solenv/gbuild/platform/NETBSD_INTEL_GCC.mk  |    1 -
 solenv/gbuild/platform/NETBSD_X86_64_GCC.mk |    1 -
 2 files changed, 2 deletions(-)

New commits:
commit 02e0be069e57e724c51f23e2e31b77657a6a1d3d
Author: Ryo ONODERA <ryoon at netbsd.org>
Date:   Mon Apr 7 13:41:02 2014 +0200

    Fix LD_LIBRARY_PATH for NetBSD.
    
    LibreOffice 4 NetBSD build fails with wrong LD_LIBRARY_PATH.
    LD_LIBRARY_PATH setting in solenv/gbuild/platform/NETBSD_INTEL_GCC.mk and
    solenv/gbuild/platform/NETBSD_X86_64_GCC.mk is not needed.
    Attached patch should fix amd64 (x86_64) and i386 build.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=77098
    
    Signed-off-by: Thomas Klausner <wiz at NetBSD.org>

diff --git a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
index 48a138d..9d61dca 100644
--- a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
@@ -16,7 +16,6 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 
 NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
 
-gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(NB_ADD_LIBPATH)
 gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:$(NB_ADD_LIBPATH)
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
index fc8b8ad..861ac0c 100644
--- a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
@@ -15,7 +15,6 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 
 NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
 
-gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(NB_ADD_LIBPATH)
 gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:$(NB_ADD_LIBPATH)
 
 # vim: set noet sw=4: