baf0d4b282
on omniORB
37 lines
1.2 KiB
Text
37 lines
1.2 KiB
Text
$NetBSD: patch-aa,v 1.1.1.1 2010/09/02 15:20:36 drochner Exp $
|
|
|
|
--- mk/beforeauto.mk.in.orig 2003-10-29 19:18:36.000000000 +0000
|
|
+++ mk/beforeauto.mk.in
|
|
@@ -352,6 +352,7 @@ endef
|
|
# Patterns for various file types
|
|
#
|
|
LibPathPattern = -L%
|
|
+LibRPathPattern = -Wl,-R%
|
|
LibNoDebugPattern = lib%.a
|
|
LibDebugPattern = lib%.a
|
|
LibPattern = lib%.a
|
|
@@ -411,6 +412,7 @@ endef
|
|
#
|
|
|
|
IMPORT_LIBRARY_FLAGS = $(patsubst %,$(LibPathPattern),$(IMPORT_LIBRARY_DIRS))
|
|
+IMPORT_LIBRARY_FLAGS += $(patsubst %,$(LibRPathPattern),$(IMPORT_LIBRARY_DIRS))
|
|
|
|
define CXXExecutable
|
|
(set -x; \
|
|
@@ -1005,6 +1007,16 @@ OMNITHREAD_POSIX_CPPFLAGS = -DUsePthread
|
|
OMNITHREAD_LIB += -pthread
|
|
endif
|
|
|
|
+ifdef NetBSD
|
|
+IMPORT_CPPFLAGS += -D__netbsd__
|
|
+OMNITHREAD_CPPFLAGS = -D_REENTRANT -D_THREAD_SAFE
|
|
+OMNITHREAD_POSIX_CPPFLAGS = -DUsePthread -DPthreadDraftVersion=10
|
|
+OMNITHREAD_LIB += -pthread
|
|
+CLINKOPTIONS = $(CDEBUGFLAGS) $(COPTIONS) -Wl,-rpath,$(INSTALLLIBDIR)
|
|
+CXXLINKOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) -Wl,-rpath,$(INSTALLLIBDIR)
|
|
+SharedLibraryPlatformLinkFlagsTemplate = $(CXXLINKOPTIONS) -shared -Wl,-soname,$$soname
|
|
+endif
|
|
+
|
|
###################
|
|
ifdef OSR5
|
|
IMPORT_CPPFLAGS += -D__osr5__
|