diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2007-03-06 04:34:38 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2007-03-06 04:34:38 +0000 |
| commit | d9924e7b58b9d0ca025fe4602fa35ab867e22cdd (patch) | |
| tree | ef7dfe3a3ef7a8cddeddefbfddf59a74a1598a9b /java | |
| parent | . When we update the time zone data, delete the temporary copy of the old (diff) | |
. 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.
Notes
Notes:
svn path=/head/; revision=186629
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdk15/files/patch-j2se::common::Defs-bsd.gmk | 20 | ||||
| -rw-r--r-- | java/jdk16/files/patch-j2se::common::Defs-bsd.gmk | 20 |
2 files changed, 34 insertions, 6 deletions
diff --git a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk b/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk index cad7b38ea1a0..c7530004bd26 100644 --- a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk +++ b/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk @@ -1,7 +1,7 @@ $FreeBSD$ ---- ../../j2se/make/common/Defs-bsd.gmk.orig Sun Dec 10 11:49:52 2006 -+++ ../../j2se/make/common/Defs-bsd.gmk Sun Dec 10 21:48:51 2006 +--- ../../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/ @@ -11,7 +11,7 @@ $FreeBSD$ endif # Allow the user to override the default value... ifdef ALT_DEVTOOLS_PATH -@@ -434,7 +434,7 @@ +@@ -432,7 +432,7 @@ override LIBTHREAD = override MOOT_PRIORITIES = true override NO_INTERRUPTIBLE_IO = false @@ -20,3 +20,17 @@ $FreeBSD$ 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 + diff --git a/java/jdk16/files/patch-j2se::common::Defs-bsd.gmk b/java/jdk16/files/patch-j2se::common::Defs-bsd.gmk index cad7b38ea1a0..c7530004bd26 100644 --- a/java/jdk16/files/patch-j2se::common::Defs-bsd.gmk +++ b/java/jdk16/files/patch-j2se::common::Defs-bsd.gmk @@ -1,7 +1,7 @@ $FreeBSD$ ---- ../../j2se/make/common/Defs-bsd.gmk.orig Sun Dec 10 11:49:52 2006 -+++ ../../j2se/make/common/Defs-bsd.gmk Sun Dec 10 21:48:51 2006 +--- ../../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/ @@ -11,7 +11,7 @@ $FreeBSD$ endif # Allow the user to override the default value... ifdef ALT_DEVTOOLS_PATH -@@ -434,7 +434,7 @@ +@@ -432,7 +432,7 @@ override LIBTHREAD = override MOOT_PRIORITIES = true override NO_INTERRUPTIBLE_IO = false @@ -20,3 +20,17 @@ $FreeBSD$ 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 + |