Mercurial > hg > release > icedtea6-1.11
changeset 2954:a083335563ec
8027837: Generate CORBA sources before building code that depends on it.
2014-01-20 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* patches/openjdk/8027837-corba_build_dependency.patch:
Generate sources before building code that depends
on them.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Mon, 20 Jan 2014 18:26:44 +0000 |
| parents | cb0efad69ad3 |
| children | 526f393881d4 |
| files | ChangeLog Makefile.am patches/openjdk/8027837-corba_build_dependency.patch |
| diffstat | 3 files changed, 31 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jan 20 18:08:49 2014 +0000 +++ b/ChangeLog Mon Jan 20 18:26:44 2014 +0000 @@ -1,3 +1,11 @@ +2014-01-20 Andrew John Hughes <gnu.andrew@redhat.com> + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch. + * patches/openjdk/8027837-corba_build_dependency.patch: + Generate sources before building code that depends + on them. + 2013-11-21 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am:
--- a/Makefile.am Mon Jan 20 18:08:49 2014 +0000 +++ b/Makefile.am Mon Jan 20 18:26:44 2014 +0000 @@ -814,7 +814,8 @@ patches/openjdk/7162902-corba_fixes.patch \ patches/traceable.patch \ patches/openjdk/6893617-cnctx_always_uses_default_orb.patch \ - patches/d729448-32_bit_alignment.patch + patches/d729448-32_bit_alignment.patch \ + patches/openjdk/8027837-corba_build_dependency.patch if WITH_RHINO ICEDTEA_PATCHES += \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8027837-corba_build_dependency.patch Mon Jan 20 18:26:44 2014 +0000 @@ -0,0 +1,21 @@ +# HG changeset patch +# User coffeys +# Date 1384185131 0 +# Mon Nov 11 15:52:11 2013 +0000 +# Node ID c93c49524d58fd6f38b07db2a54fc644c1327a5f +# Parent 295b9963b97f12c43209dbe212b475e835f0a7d0 +8027837: JDK-8021257 causes CORBA build failure on emdedded platforms +Reviewed-by: dholmes + +diff -r 295b9963b97f -r c93c49524d58 make/Makefile +--- openjdk/corba/make/Makefile Fri Jan 17 23:21:27 2014 +0000 ++++ openjdk/corba/make/Makefile Mon Nov 11 15:52:11 2013 +0000 +@@ -158,7 +158,7 @@ + # + # CORBA + # +-SUBDIRS = tools javax org sun com ++SUBDIRS = tools sun/rmi javax org sun com + + build: + $(SUBDIRS-loop)