Mercurial > hg > icedtea9
changeset 1638:9708fffb863d
Fix build breakage.
2009-02-13 Andrew John Hughes <ahughes@redhat.com>
* acinclude.m4:
Revert Rhino change so IcedTea6 builds
on Gentoo again.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Sat, 14 Feb 2009 01:12:44 +0000 |
| parents | 2f6c82818e1d |
| children | b858f5551ba7 f1fad53c5ab1 |
| files | ChangeLog acinclude.m4 |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Feb 14 00:44:26 2009 +0000 +++ b/ChangeLog Sat Feb 14 01:12:44 2009 +0000 @@ -1,5 +1,12 @@ 2009-02-12 Andrew John Hughes <ahughes@redhat.com> + * acinclude.m4: + Revert Rhino change so IcedTea6 builds + on Gentoo again. + +2009-02-12 Andrew John Hughes <ahughes@redhat.com> + + * patches/ecj/icedtea-hotspot-14.0b08.patch, * patches/hotspot/14.0b08/icedtea-6791168.patch, * patches/hotspot/14.0b08/icedtea-bytecodeInterpreter.patch, * patches/hotspot/14.0b08/icedtea-core-build.patch, @@ -26,6 +33,7 @@ * patches/hotspot/14.0b08/icedtea-zero-build.patch: Moved... * acinclude.m4: Make 'default' the default. * hotspot.map: Change 14.0b08 to default. + * patches/ecj/icedtea-hotspot-default.patch, * patches/hotspot/default/icedtea-6791168.patch, * patches/hotspot/default/icedtea-bytecodeInterpreter.patch, * patches/hotspot/default/icedtea-core-build.patch,
--- a/acinclude.m4 Sat Feb 14 00:44:26 2009 +0000 +++ b/acinclude.m4 Sat Feb 14 01:12:44 2009 +0000 @@ -588,8 +588,8 @@ RHINO_JAR=/usr/share/java/rhino.jar elif test -e "/usr/share/java/js.jar"; then RHINO_JAR=/usr/share/java/js.jar - elif test -e "/usr/share/rhino-1.7/lib/js.jar"; then - RHINO_JAR=/usr/share/rhino-1.7/lib/js.jar + elif test -e "/usr/share/rhino-1.6/lib/js.jar"; then + RHINO_JAR=/usr/share/rhino-1.6/lib/js.jar fi if test x"${RHINO_JAR}" = "xyes"; then AC_MSG_RESULT([not found])