Mercurial > hg > release > icedtea6-1.13
changeset 3275:3b10a198e6d6
PR3205: Builds fails with pch disabled
2016-12-23 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR3205: Builds fails with pch disabled
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* NEWS: Updated.
* patches/openjdk/8169448-pr3205-pch_failure.patch:
Backport patch from b41 to fix build failure when
building without pre-compiled headers.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Sun, 01 Jan 2017 05:21:54 +0000 |
| parents | 20feeb77624f |
| children | 47d928687363 |
| files | ChangeLog Makefile.am NEWS patches/openjdk/8169448-pr3205-pch_failure.patch |
| diffstat | 4 files changed, 36 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Aug 25 03:50:31 2016 +0100 +++ b/ChangeLog Sun Jan 01 05:21:54 2017 +0000 @@ -1,3 +1,13 @@ +2016-12-23 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR3205: Builds fails with pch disabled + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch. + * NEWS: Updated. + * patches/openjdk/8169448-pr3205-pch_failure.patch: + Backport patch from b41 to fix build failure when + building without pre-compiled headers. + 2016-08-24 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add 1.13.13 section.
--- a/Makefile.am Thu Aug 25 03:50:31 2016 +0100 +++ b/Makefile.am Sun Jan 01 05:21:54 2017 +0000 @@ -623,7 +623,8 @@ patches/pr3137-alt_button_order.patch \ patches/openjdk/6260348-pr3068.patch \ patches/openjdk/6961123-pr2975.patch \ - patches/pr2800-missing_resources.patch + patches/pr2800-missing_resources.patch \ + patches/openjdk/8169448-pr3205-pch_failure.patch if WITH_RHINO ICEDTEA_PATCHES += \
--- a/NEWS Thu Aug 25 03:50:31 2016 +0100 +++ b/NEWS Sun Jan 01 05:21:54 2017 +0000 @@ -14,6 +14,9 @@ New in release 1.13.13 (2016-10-XX): +* Bug fixes + - PR3205: Builds fails with pch disabled + New in release 1.13.12 (2016-08-24): * Security fixes
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8169448-pr3205-pch_failure.patch Sun Jan 01 05:21:54 2017 +0000 @@ -0,0 +1,21 @@ +# HG changeset patch +# User andrew +# Date 1478656400 0 +# Wed Nov 09 01:53:20 2016 +0000 +# Node ID bbe3dc5410163bc7fb2dfbe5eb6969bbf71edc6d +# Parent 1943edc6f06aa1f026b4e6fa9ccc8b2d60243ca7 +8169448: OpenJDK 6 fails to build without pre-compiled headers +Summary: psPromotionManager.hpp is missing an import for psOldGen +Reviewed-by: omajid + +diff --git a/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp b/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp +--- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp +@@ -25,6 +25,7 @@ + #ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_HPP + #define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_HPP + ++#include "gc_implementation/parallelScavenge/psOldGen.hpp" + #include "gc_implementation/parallelScavenge/psPromotionLAB.hpp" + #include "memory/allocation.hpp" + #include "utilities/taskqueue.hpp"