ports/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk
Greg Lewis d9924e7b58 . Don't statically link with libXm any more. The Open Motif port no longer
uses hacks to compile libXm.a with PIC objects, which means trying to
  statically link with it breaks the build on amd64.
2007-03-06 04:34:38 +00:00

36 lines
1 KiB
Text

$FreeBSD$
--- ../../j2se/make/common/Defs-bsd.gmk.orig Sun Mar 4 21:27:49 2007
+++ ../../j2se/make/common/Defs-bsd.gmk Sun Mar 4 21:29:16 2007
@@ -180,7 +180,7 @@
ifeq ($(TRUE_PLATFORM), NetBSD)
DEVTOOLS_PATH = /usr/pkg/bin/
else
-DEVTOOLS_PATH = /usr/local/bin/
+DEVTOOLS_PATH = $(LOCALBASE)/bin/
endif
# Allow the user to override the default value...
ifdef ALT_DEVTOOLS_PATH
@@ -432,7 +432,7 @@
override LIBTHREAD =
override MOOT_PRIORITIES = true
override NO_INTERRUPTIBLE_IO = false
-override OPENWIN_HOME = /usr/X11R6
+override OPENWIN_HOME = $(X11BASE)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib
override OTHER_M4FLAGS = -DGNU_ASSEMBLER
override SUN_CMM_SUBDIR =
@@ -463,10 +463,10 @@
# Motif settings
#
# XXX: OpenBSD confirm static motif still causes issues - truk
-ifeq ($(TRUE_PLATFORM), OpenBSD)
-STATIC_MOTIF=false
-else
+ifeq ($(TRUE_PLATFORM), NetBSD)
STATIC_MOTIF=true
+else
+STATIC_MOTIF=false
endif
LIBM=-lm