diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-25 23:15:13 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-25 23:15:13 +0000 |
| commit | 8776c921c743a9d55434ae182a5b63fa09a1be96 (patch) | |
| tree | af4fc854b6dd2f53a08eb2ffdc0e5b730c214b6a /java | |
| parent | - Mark BROKEN on -CURRENT: error: conflicting types for 'fexecve' (diff) | |
- Fix patch reject after xorg cleanup
Submitted by: pointyhat via pav
Notes
Notes:
svn path=/head/; revision=211992
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdk14/files/patch-plugin::common::config.gmk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/java/jdk14/files/patch-plugin::common::config.gmk b/java/jdk14/files/patch-plugin::common::config.gmk index 95e1c36717aa..853ddbcd8ba1 100644 --- a/java/jdk14/files/patch-plugin::common::config.gmk +++ b/java/jdk14/files/patch-plugin::common::config.gmk @@ -1,21 +1,21 @@ -$FreeBSD$ - ---- ../../deploy/make/plugin/common/config.gmk.orig Wed Nov 12 16:53:30 2003 -+++ ../../deploy/make/plugin/common/config.gmk Wed Nov 12 16:53:43 2003 -@@ -52,7 +52,6 @@ +--- ../../deploy/make/plugin/common/config.gmk.orig 2008-04-26 01:00:47.000000000 +0200 ++++ ../../deploy/make/plugin/common/config.gmk 2008-04-26 01:11:03.000000000 +0200 +@@ -52,16 +52,15 @@ ifeq ($(PLATFORM), bsd) PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/src/solaris -- LOCALBASE = /usr/X11R6 - OTHER_LDFLAGS = -L$(LOCALBASE)/lib +- X11BASE = /usr/X11R6 + OTHER_LDFLAGS = -L$(X11BASE)/lib ifeq (,$(filter-out DragonFly NetBSD,$(TRUE_PLATFORM))) - OTHER_LDFLAGS += -Wl,-R$(LOCALBASE)/lib -@@ -61,7 +60,7 @@ +- OTHER_LDFLAGS += -Wl,-R$(X11BASE)/lib ++ OTHER_LDFLAGS += -Wl,-R$(LOCALBASE)/lib + endif + DEF_SVR4 = # include search paths # XXXBSD: these should be defined in other place -- CPPFLAGS1 += -I$(LOCALBASE)/include -I/usr/local/include -+ CPPFLAGS1 += -I$(LOCALBASE)/include -I${LOCALBASE}/include +- CPPFLAGS1 += -I$(X11BASE)/include -I/usr/local/include ++ CPPFLAGS1 += -I${LOCALBASE}/include ifeq ($(TRUE_PLATFORM), FreeBSD) LDFLAGS_COMMON += -pthread |