diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2007-08-05 20:39:49 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2007-08-05 20:39:49 +0000 |
| commit | 4d5c7602538b84c33564b815fa72eb9d9df9df21 (patch) | |
| tree | efc2ebc2871a752a96936699d197a99ad0cb5e67 /java/jdk16/files/patch-deploy-common-Defs-bsd.gmk | |
| parent | . Forced commit to note repo copy of jdk15 to jdk16. (diff) | |
. A native port for JDK 1.6.0 (aka 6.0) Update 1.
Notes
Notes:
svn path=/head/; revision=197135
Diffstat (limited to 'java/jdk16/files/patch-deploy-common-Defs-bsd.gmk')
| -rw-r--r-- | java/jdk16/files/patch-deploy-common-Defs-bsd.gmk | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/java/jdk16/files/patch-deploy-common-Defs-bsd.gmk b/java/jdk16/files/patch-deploy-common-Defs-bsd.gmk new file mode 100644 index 000000000000..ea2e763f4e5a --- /dev/null +++ b/java/jdk16/files/patch-deploy-common-Defs-bsd.gmk @@ -0,0 +1,29 @@ +$FreeBSD$ + +--- ../../deploy/make/common/Defs-bsd.gmk.orig Sun Jul 29 23:03:29 2007 ++++ ../../deploy/make/common/Defs-bsd.gmk Sun Jul 29 23:03:29 2007 +@@ -23,8 +23,8 @@ + JUMP_EXE = $(BIN_DIR)/javaws + CLASSPATH_SEP = $(CLASSPATH_SEPARATOR) + PATH_SEP = / +-X11DIR = /usr/X11R6 +-LOCALDIR = /usr/local ++X11DIR = ${X11BASE} ++LOCALDIR = ${LOCALBASE} + ifneq ($(OS_VENDOR), NetBSD) + LIBS = -L$(X11DIR)/lib -lX11 -L$(LOCALDIR)/lib -liconv + else +@@ -43,11 +43,11 @@ + $(BSD_INCLUDES) -D_ALLBSD_SOURCE + + ifeq ($(OS_VENDOR), FreeBSD) +-LINK_FLAGS_COMMON = -pthread ++LINK_FLAGS_COMMON = ${PTHREAD_LIBS} + endif + + ifeq ($(OS_VENDOR), OpenBSD) +-LINK_FLAGS_COMMON = -pthread ++LINK_FLAGS_COMMON = ${PTHREAD_LIBS} + endif + + C_FLAGS_OPT = |