Mercurial > hg > release > icedtea7-2.6
changeset 2646:d0b14be8cbf8 icedtea-2.4-branchpoint
PR1276: Synchronise CACAO rules between IcedTea6/7/8 where possible
2013-06-07 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR1276: Synchronise CACAO rules between IcedTea6/7/8
where possible
* NEWS: Updated.
2011-02-23 Andrew John Hughes <ahughes@redhat.com>
* acinclude.m4:
(IT_WITH_CACAO_SRC_DIR): Renamed from
IT_CHECK_WITH_CACAO_SRC_DIR.
* configure.ac: Synchronise naming.
2011-02-21 Andrew John Hughes <ahughes@redhat.com>
Ensure all our macros have an IT_ prefix.
* acinclude.m4:
(IT_CHECK_WITH_CACAO_SRC_DIR): Renamed from
AC_CHECK_WITH_CACAO_SRC_DIR.
* configure.ac: Synchronise naming.
2010-01-16 Andrew John Hughes <ahughes@redhat.com>
* acinclude.m4:
(AC_CHECK_WITH_CACAO_SRC_DIR): Quote checking
output.
2009-10-01 Robert Schuster <robertschuster@fsfe.org>
* configure.ac: Added --with-cacao-src-dir option.
* acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR.
* Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Fri, 07 Jun 2013 20:28:52 +0100 |
| parents | 66008a8b7417 |
| children | c80657a5e6e4 |
| files | ChangeLog Makefile.am NEWS acinclude.m4 configure.ac |
| diffstat | 5 files changed, 66 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jun 06 19:52:57 2013 +0100 +++ b/ChangeLog Fri Jun 07 20:28:52 2013 +0100 @@ -1,3 +1,36 @@ +2013-06-07 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR1276: Synchronise CACAO rules between IcedTea6/7/8 + where possible + * NEWS: Updated. + +2011-02-23 Andrew John Hughes <ahughes@redhat.com> + + * acinclude.m4: + (IT_WITH_CACAO_SRC_DIR): Renamed from + IT_CHECK_WITH_CACAO_SRC_DIR. + * configure.ac: Synchronise naming. + +2011-02-21 Andrew John Hughes <ahughes@redhat.com> + + Ensure all our macros have an IT_ prefix. + * acinclude.m4: + (IT_CHECK_WITH_CACAO_SRC_DIR): Renamed from + AC_CHECK_WITH_CACAO_SRC_DIR. + * configure.ac: Synchronise naming. + +2010-01-16 Andrew John Hughes <ahughes@redhat.com> + + * acinclude.m4: + (AC_CHECK_WITH_CACAO_SRC_DIR): Quote checking + output. + +2009-10-01 Robert Schuster <robertschuster@fsfe.org> + + * configure.ac: Added --with-cacao-src-dir option. + * acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR. + * Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used. + 2013-06-06 Andrew John Hughes <gnu.andrew@member.fsf.org> S7191872: Xrender: No text displayed using @@ -251,6 +284,8 @@ 2013-04-24 Andrew John Hughes <gnu.andrew@member.fsf.org> + PR1278: Synchronise CACAO versions between IcedTea6/7/8 + where possible * patches/cacao/jsig.patch: Removed. * Makefile.am:
--- a/Makefile.am Thu Jun 06 19:52:57 2013 +0100 +++ b/Makefile.am Fri Jun 07 20:28:52 2013 +0100 @@ -1088,6 +1088,8 @@ stamps/download-cacao.stamp: if BUILD_CACAO if !USE_SYSTEM_CACAO +if USE_ALT_CACAO_SRC_DIR +else if USE_ALT_CACAO_SRC_ZIP ln -sf $(ALT_CACAO_SRC_ZIP) $(CACAO_SRC_ZIP) endif @@ -1109,6 +1111,7 @@ fi endif endif +endif mkdir -p stamps touch $@ @@ -1288,6 +1291,13 @@ stamps/extract-cacao.stamp: stamps/download-cacao.stamp if BUILD_CACAO if !USE_SYSTEM_CACAO +if USE_ALT_CACAO_SRC_DIR + if ! test -d cacao ; \ + then \ + mkdir -p cacao/cacao ; \ + cp -r $(ALT_CACAO_SRC_DIR)/* cacao/cacao/ ; \ + fi +else set -e ; \ if ! test -d cacao/cacao ; \ then \ @@ -1300,6 +1310,7 @@ fi endif endif +endif mkdir -p stamps touch $@
--- a/NEWS Thu Jun 06 19:52:57 2013 +0100 +++ b/NEWS Fri Jun 07 20:28:52 2013 +0100 @@ -843,6 +843,8 @@ - Clang fix for the i386 backend - Fix rt-timing - Moved rt-timing.{c,h} to C++ + - PR1278: Synchronise CACAO versions between IcedTea6/7/8 where possible + - PR1276: Synchronise CACAO rules between IcedTea6/7/8 where possible * JamVM - JSR 335: (lambda expressions) initial hack - JEP 171: Implement fence methods in sun.misc.Unsafe
--- a/acinclude.m4 Thu Jun 06 19:52:57 2013 +0100 +++ b/acinclude.m4 Fri Jun 07 20:28:52 2013 +0100 @@ -815,6 +815,23 @@ AC_SUBST(ALT_CACAO_SRC_ZIP) ]) +AC_DEFUN([IT_WITH_CACAO_SRC_DIR], +[ + AC_MSG_CHECKING([for a CACAO source directory]) + AC_ARG_WITH([cacao-src-dir], + [AS_HELP_STRING(--with-cacao-src-dir,specify the location of the Cacao sources)], + [ + ALT_CACAO_SRC_DIR=${withval} + AM_CONDITIONAL(USE_ALT_CACAO_SRC_DIR, test x = x) + ], + [ + ALT_CACAO_SRC_DIR="not specified" + AM_CONDITIONAL(USE_ALT_CACAO_SRC_DIR, test x != x) + ]) + AC_MSG_RESULT(${ALT_CACAO_SRC_DIR}) + AC_SUBST(ALT_CACAO_SRC_DIR) +]) + AC_DEFUN([IT_ENABLE_HG], [ AC_REQUIRE([IT_WITH_PROJECT])