[Libreoffice-commits] .: solenv/inc

[François Tigeot]

 solenv/inc/unx.mk     |   12 ++----------
 solenv/inc/unxnbsd.mk |   28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 10 deletions(-)

New commits:
commit 35f58c38306e5c32df3eb013bfaa251d6d7d13ce
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Sun May 22 10:35:33 2011 +0200

    Unify all NetBSD .mk configuration files

diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index b1ba2fe..88361b9 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -119,16 +119,8 @@
 .INCLUDE : unxlnga.mk
 .ENDIF
 
-.IF "$(COM)$(OS)$(CPU)" == "GCCNETBSDI"
-.INCLUDE : unxbsdi3.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCNETBSDX"
-.INCLUDE : unxbsdx3.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCNETBSDS"
-.INCLUDE : unxbsds.mk
+.IF "$(COM)$(OS)" == "GCCNETBSD"
+.INCLUDE : unxnbsd.mk
 .ENDIF
 
 .IF "$(COM)$(OS)" == "GCCFREEBSD"
diff --git a/solenv/inc/unxnbsd.mk b/solenv/inc/unxnbsd.mk
new file mode 100644
index 0000000..6b8d256
--- /dev/null
+++ b/solenv/inc/unxnbsd.mk
@@ -0,0 +1,28 @@
+#
+# mk file for NetBSD
+#
+
+# arch specific defines
+.IF "$(CPUNAME)" == "INTEL"
+CDEFS+=-DX86
+.ENDIF
+
+.IF "$(CPUNAME)" == "X86_64"
+CDEFS+=-DX86_64
+BUILD64=1
+.ENDIF
+
+.INCLUDE : unxgcc.mk
+
+# default linker flags
+# NetBSD has no support for using relative paths with $ORIGIN
+LINKFLAGSRUNPATH_UREBIN=
+LINKFLAGSRUNPATH_OOO=
+LINKFLAGSRUNPATH_SDK=
+LINKFLAGSRUNPATH_BRAND=
+
+LINKFLAGSDEFS=-Wl,--ignore-unresolved-symbol,environ
+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=nb