diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2011-03-28 21:08:52 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2011-03-28 21:08:52 +0000 |
| commit | 6fbc8496ce8df2b726634ee7e98d161222b6fb0d (patch) | |
| tree | 8e8b878b61af6eaae733d6e7a49b0e6910fc2407 /java | |
| parent | Disable FETCH support by default, as it adds a new requirement to fetch(3) (diff) | |
Force libxul include directory and allow building IcedTea-Web plugin with
an ancient xulrunner (i.e., 1.9.2.9 and earlier). This commit should fix:
PR: ports/155381
Notes
Notes:
svn path=/head/; revision=271950
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk6/files/Makefile.plugin | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/java/openjdk6/files/Makefile.plugin b/java/openjdk6/files/Makefile.plugin index 900845191796..d9b6ce7e17ea 100644 --- a/java/openjdk6/files/Makefile.plugin +++ b/java/openjdk6/files/Makefile.plugin @@ -48,8 +48,12 @@ CFLAGS+= -DJDK_UPDATE_VERSION="\"${JDK_UPDATE_VERSION}\"" \ -DPLUGIN_NAME="\"${PLUGIN_NAME}\"" \ -DPLUGIN_VERSION="\"${PLUGIN_VERSION}\"" \ -DPACKAGE_URL="\"${PACKAGE_URL}\"" \ - -DMOZILLA_VERSION_COLLAPSED="${MOZILLA_VERSION2}" \ - ${PLUGIN_CFLAGS} + -DMOZILLA_VERSION_COLLAPSED="${MOZILLA_VERSION2}" +.if ${MOZILLA_VERSION2} >= 1090200 +CFLAGS+= ${PLUGIN_CFLAGS:S,/libxul/stable,/libxul,} +.else +CFLAGS+= ${PLUGIN_CFLAGS:S,/libxul/stable,/libxul/unstable,} +.endif LDFLAGS+= ${PLUGIN_LIBS} .include <bsd.lib.mk> |