components/runtime/openjdk-7/patches/patch-ak.patch

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