diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2007-10-04 18:20:42 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2007-10-04 18:20:42 +0000 |
| commit | c30cfeb507665080be79c2d9cbed04b93bd8b1c4 (patch) | |
| tree | 2ecd3bc046a97389b40c3450737f46d93dc6da97 /java/jdk16/files | |
| parent | 4dbcc88d1e1627b1aa52af60e94380b68a25f200 (diff) | |
Fix build on i386 with WITHOUT_WEB option.
PR: ports/116700
Reported by: Michiel Boland (michiel at boland dot org)
Approved by: glewis (mentor)
Notes
Notes:
svn path=/head/; revision=200837
Diffstat (limited to 'java/jdk16/files')
| -rw-r--r-- | java/jdk16/files/patch-control-make-install-rules.gmk | 15 | ||||
| -rw-r--r-- | java/jdk16/files/patch-install-make-common-Pack.gmk | 13 |
2 files changed, 28 insertions, 0 deletions
diff --git a/java/jdk16/files/patch-control-make-install-rules.gmk b/java/jdk16/files/patch-control-make-install-rules.gmk new file mode 100644 index 000000000000..69c5f5431ac9 --- /dev/null +++ b/java/jdk16/files/patch-control-make-install-rules.gmk @@ -0,0 +1,15 @@ +$FreeBSD$ + +--- ../../control/make/install-rules.gmk 21 Jul 2006 17:21:00 -0000 1.1.1.2 ++++ ../../control/make/install-rules.gmk 6 Sep 2007 17:53:58 -0000 1.2 +@@ -32,6 +32,10 @@ + ALT_NEW_IMAGE_DIR=$(ALT_NEW_IMAGE_DIR) \ + ALT_BUNDLE_DATE=$(BUNDLE_DATE) + ++ifeq ($(BUILD_DEPLOY), true) ++INSTALL_BUILD_ARGUMENTS += INSTALL_DEPLOY=true ++endif ++ + ifeq ($(DEBUG_NAME), debug) + INSTALL_BUILD_ARGUMENTS += VARIANT=DBG + endif diff --git a/java/jdk16/files/patch-install-make-common-Pack.gmk b/java/jdk16/files/patch-install-make-common-Pack.gmk new file mode 100644 index 000000000000..87abed56a518 --- /dev/null +++ b/java/jdk16/files/patch-install-make-common-Pack.gmk @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../install/make/common/Pack.gmk 27 Jun 2007 18:48:09 -0000 1.2 ++++ ../../install/make/common/Pack.gmk 6 Sep 2007 17:53:58 -0000 1.4 +@@ -45,7 +45,7 @@ + # These are loaded from the ClassPath + CP_JRE_PACKED_JARS = lib/ext/localedata.jar + +-ifeq ($(ARCH_DATA_MODEL),32) ++ifeq ($(INSTALL_DEPLOY), true) + CP_JRE_PACKED_JARS += lib/plugin.jar + CP_JRE_PACKED_JARS += lib/javaws.jar + CP_JRE_PACKED_JARS += lib/deploy.jar |