$NetBSD: patch-ak,v 1.6 2013/06/15 09:31:05 jperkin Exp $

Additional rpaths.

--- jdk/make/common/Defs-bsd.gmk.orig	2014-01-25 07:34:08.000000000 +0000
+++ jdk/make/common/Defs-bsd.gmk
@@ -185,9 +185,9 @@ ifndef FASTDEBUG_OPTIMIZATION_LEVEL
 endif
 
 CC_OPT/NONE     = 
-CC_OPT/LOWER    = -O2
-CC_OPT/HIGHER   = -O3
-CC_OPT/HIGHEST  = -O3
+CC_OPT/LOWER    = 
+CC_OPT/HIGHER   =
+CC_OPT/HIGHEST  =
 
 CC_OPT          = $(CC_OPT/$(OPTIMIZATION_LEVEL))
 
@@ -315,6 +315,7 @@ ifneq ($(PRODUCT), java)
   CPPFLAGS_DBG    += -DLOGGING 
 endif
 
+CPPFLAGS_COMMON+=-O
 # Libraries need to locate other libraries at runtime, and you can tell
 #   a library where to look by way of the dynamic runpaths (RPATH or RUNPATH)
 #   buried inside the .so. The $ORIGIN says to look relative to where
@@ -336,8 +337,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 +400,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 +463,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
 #
