$NetBSD$ --- j2se/make/common/Defs-bsd.gmk.orig 2011-01-07 22:58:59.000000000 +0000 +++ j2se/make/common/Defs-bsd.gmk @@ -349,6 +349,10 @@ EXTRA_LIBS += -pthread # -L paths for finding and -ljava # LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) +ifeq ($(TRUE_PLATFORM), $(filter $(TRUE_PLATFORM), NetBSD, DragonFly)) +LDFLAGS_COMMON += -Wl,-rpath $(LIBDIR)/$(LIBARCH) +LDFLAGS_COMMON += -Wl,-rpath /usr/pkg/java/jdk-1.5.0/jre/lib/$(LIBARCH) +endif LDFLAGS_OPT = -Xlinker -O1 -Wl,-soname=$(LIB_PREFIX)$(LIBRARY)$(OPT_SUFFIX).$(LIBRARY_SUFFIX) LDFLAGS_DBG = -Wl,-soname=$(LIB_PREFIX)$(LIBRARY)$(DBG_SUFFIX).$(LIBRARY_SUFFIX) @@ -400,6 +404,10 @@ endif VM_NAME = server JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) JVMLIB += -ljvm$(SUFFIX) +ifeq ($(TRUE_PLATFORM), $(filter $(TRUE_PLATFORM), NetBSD, DragonFly)) +JVMLIB += -Wl,-rpath $(LIBDIR)/$(LIBARCH)/$(VM_NAME) +JVMLIB += -Wl,-rpath /usr/pkg/java/jdk-1.5.0/jre/lib/$(LIBARCH)/$(VM_NAME) +endif JAVALIB = -ljava$(SUFFIX) $(JVMLIB) # @@ -423,6 +431,9 @@ override HAVE_SIGIGNORE = true else override HAVE_SIGIGNORE = false endif +ifeq ($(TRUE_PLATFORM), FreeBSD) +override HAVE_SIGIGNORE = true +endif override LEX_LIBRARY = -lfl ifeq ($(STATIC_CXX),true) override LIBCXX = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic @@ -491,6 +502,14 @@ ifeq ($(TRUE_PLATFORM), OpenBSD) SYSTEM_ZLIB = true endif +ifeq ($(TRUE_PLATFORM), NetBSD) + SYSTEM_ZLIB = true +endif + +ifeq ($(TRUE_PLATFORM), DragonFly) + SYSTEM_ZLIB = true +endif + # # Japanese manpages #