/hg/icedtea7: PR1276: Synchronise CACAO rules between IcedTea6/7...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jun 7 12:29:01 PDT 2013
changeset d0b14be8cbf8 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=d0b14be8cbf8
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jun 07 20:28:52 2013 +0100
PR1276: Synchronise CACAO rules between IcedTea6/7/8 where possible
2013-06-07 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1276: Synchronise CACAO rules between IcedTea6/7/8
where possible
* NEWS: Updated.
2011-02-23 Andrew John Hughes <ahughes at 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 at 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 at redhat.com>
* acinclude.m4:
(AC_CHECK_WITH_CACAO_SRC_DIR): Quote checking
output.
2009-10-01 Robert Schuster <robertschuster at 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.
diffstat:
ChangeLog | 35 +++++++++++++++++++++++++++++++++++
Makefile.am | 11 +++++++++++
NEWS | 2 ++
acinclude.m4 | 17 +++++++++++++++++
configure.ac | 1 +
5 files changed, 66 insertions(+), 0 deletions(-)
diffs (141 lines):
diff -r 66008a8b7417 -r d0b14be8cbf8 ChangeLog
--- 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 at member.fsf.org>
+
+ PR1276: Synchronise CACAO rules between IcedTea6/7/8
+ where possible
+ * NEWS: Updated.
+
+2011-02-23 Andrew John Hughes <ahughes at 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 at 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 at redhat.com>
+
+ * acinclude.m4:
+ (AC_CHECK_WITH_CACAO_SRC_DIR): Quote checking
+ output.
+
+2009-10-01 Robert Schuster <robertschuster at 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 at member.fsf.org>
S7191872: Xrender: No text displayed using
@@ -251,6 +284,8 @@
2013-04-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
+ PR1278: Synchronise CACAO versions between IcedTea6/7/8
+ where possible
* patches/cacao/jsig.patch:
Removed.
* Makefile.am:
diff -r 66008a8b7417 -r d0b14be8cbf8 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 $@
diff -r 66008a8b7417 -r d0b14be8cbf8 NEWS
--- 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
diff -r 66008a8b7417 -r d0b14be8cbf8 acinclude.m4
--- 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])
diff -r 66008a8b7417 -r d0b14be8cbf8 configure.ac
--- a/configure.ac Thu Jun 06 19:52:57 2013 +0100
+++ b/configure.ac Fri Jun 07 20:28:52 2013 +0100
@@ -167,6 +167,7 @@
IT_ENABLE_CACAO
IT_WITH_CACAO_HOME
IT_WITH_CACAO_SRC_ZIP
+IT_WITH_CACAO_SRC_DIR
IT_ENABLE_JAMVM
IT_WITH_JAMVM_SRC_ZIP
More information about the distro-pkg-dev
mailing list