Attachment 96967 Details for Bug 77098 – Fix NetBSD build

[patch] Fix NetBSD build

libreoffice-netbsd.diff (text/plain), 1.22 KB, created by Ryo ONODERA on 2014-04-06 04:02:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryo ONODERA

Created: 2014-04-06 04:02:48 UTC

Size: 1.22 KB

patch

obsolete

>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:

Actions: View | Splinter Review

Attachments on bug 77098: 96967

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.