blob: d5aab951befab6a11646e99f9dab607c4b9ecd9f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
$NetBSD: patch-ak,v 1.6 2013/06/15 09:31:05 jperkin Exp $
Additional rpaths.
--- jdk/make/common/Defs-bsd.gmk.orig 2013-05-29 03:57:57.000000000 +0000
+++ jdk/make/common/Defs-bsd.gmk
@@ -336,8 +336,8 @@ Z_ORIGIN_FLAG/zero = -Xlinker -z -Xlink
LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY))
-LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN
-LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/%)
+LDFLAGS_COMMON += -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}/server -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}
+
#
# -L paths for finding and -ljava
@@ -399,7 +399,7 @@ endif
# the library itself should not.
#
VM_NAME = server
-JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
+JVMLIB = -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH} -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
JAVALIB = -ljava $(JVMLIB)
#
@@ -462,6 +462,14 @@ ifeq ($(OS_VENDOR), OpenBSD)
SYSTEM_ZLIB = true
endif
+ifeq ($(OS_VENDOR), NetBSD)
+ SYSTEM_ZLIB = true
+endif
+
+ifeq ($(OS_VENDOR), DragonFlyBSD)
+ SYSTEM_ZLIB = true
+endif
+
#
# Japanese manpages
#
|
