/hg/icedtea: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Mar 25 12:59:17 PDT 2013
changeset 4b0fee4fb143 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4b0fee4fb143
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Mar 25 19:23:33 2013 +0000
PR1357: Make XRender mandatory
2013-03-25 Andrew John Hughes <gnu_andrew at member.fsf.org>
* THANKYOU: Add Michal Vyskocil.
* NEWS: Updated.
2013-03-21 Michal Vyskocil <mvyskocil at suse.cz>
PR1357: Make XRender mandatory
* configure.ac:
(XRENDER): Make it mandatory.
changeset f4763c22ae76 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f4763c22ae76
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Mar 25 19:57:59 2013 +0000
PR1325: Only add classes to rt-source-files.txt if the class (or one or more of its methods/fields) are actually missing from the boot JDK
2012-08-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR1325: Only add classes to rt-source-files.txt if the
class (or one or more of its methods/fields)
are actually missing from the boot JDK
* Makefile.am:
(rt-source-files.txt): Remove dead ICEDTEA_BOOTSTRAP_DIRS
which has not been set for some time.
(rt-class-files.stamp): Replace LACKS_SUN_AWT_TOOLKIT
conditional with test of contents of ICEDTEA_BOOTSTRAP_CLASSES.
Note; need to use grep as field contains whitespace.
(rt.stamp): Likewise.
* configure.ac:
Remove sun.awt.SunToolkit check.
* NEWS: Updated.
diffstat:
ChangeLog | 27 +++++++++++++++++++++++++++
Makefile.am | 40 ++++++++++++++++++----------------------
NEWS | 3 +++
THANKYOU | 1 +
configure.ac | 12 ++++--------
5 files changed, 53 insertions(+), 30 deletions(-)
diffs (146 lines):
diff -r fa408e2cd92e -r f4763c22ae76 ChangeLog
--- a/ChangeLog Thu Mar 21 00:27:57 2013 +0000
+++ b/ChangeLog Mon Mar 25 19:57:59 2013 +0000
@@ -1,3 +1,30 @@
+2012-08-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR1325: Only add classes to rt-source-files.txt if the
+ class (or one or more of its methods/fields)
+ are actually missing from the boot JDK
+ * Makefile.am:
+ (rt-source-files.txt): Remove dead ICEDTEA_BOOTSTRAP_DIRS
+ which has not been set for some time.
+ (rt-class-files.stamp): Replace LACKS_SUN_AWT_TOOLKIT
+ conditional with test of contents of ICEDTEA_BOOTSTRAP_CLASSES.
+ Note; need to use grep as field contains whitespace.
+ (rt.stamp): Likewise.
+ * configure.ac:
+ Remove sun.awt.SunToolkit check.
+ * NEWS: Updated.
+
+2013-03-25 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * THANKYOU: Add Michal Vyskocil.
+ * NEWS: Updated.
+
+2013-03-21 Michal Vyskocil <mvyskocil at suse.cz>
+
+ PR1357: Make XRender mandatory
+ * configure.ac:
+ (XRENDER): Make it mandatory.
+
2013-03-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/nss-not-enabled-config.patch:
diff -r fa408e2cd92e -r f4763c22ae76 Makefile.am
--- a/Makefile.am Thu Mar 21 00:27:57 2013 +0000
+++ b/Makefile.am Mon Mar 25 19:57:59 2013 +0000
@@ -2063,10 +2063,6 @@
rt-source-files.txt: $(OPENJDK_BOOT_TREE)
rm -f $@
- for dir in $(ICEDTEA_BOOTSTRAP_DIRS) ; \
- do \
- $(FIND) $(abs_top_builddir)/$$dir -name '*.java' >> $@; \
- done
for files in $(ICEDTEA_BOOTSTRAP_CLASSES) ; \
do \
echo $$files >> $@ ; \
@@ -2075,28 +2071,28 @@
stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt
mkdir -p lib/rt
-if LACKS_SUN_AWT_TOOLKIT
- $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d lib/rt \
- -classpath $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
- -sourcepath '$(SOURCEPATH_DIRS)' \
- -bootclasspath \'\' @rt-source-files.txt ;
-endif
+ if echo $(ICEDTEA_BOOTSTRAP_CLASSES) | grep '\S' &> /dev/null ; then \
+ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d lib/rt \
+ -classpath $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
+ -sourcepath '$(SOURCEPATH_DIRS)' \
+ -bootclasspath \'\' @rt-source-files.txt ; \
+ fi
mkdir -p stamps
touch $@
stamps/rt.stamp: stamps/rt-class-files.stamp
-if LACKS_SUN_AWT_TOOLKIT
- (set -e ; \
- cd lib/rt ; \
- for dirs in $(ICEDTEA_BOOTSTRAP_RESOURCES) ; \
- do \
- destpath=`echo $$dirs|sed -e 's#$(LANGTOOLS)/##' -e 's#$(SHARE)/##'` ; \
- mkdir -p `dirname $$destpath` ; \
- cp -a ../../$$dirs $$destpath ; \
- done ; \
- $(ZIP) -qur $(STAGE1_BOOT_DIR)/jre/lib/rt.jar \
- com java javax sun );
-endif
+ if echo $(ICEDTEA_BOOTSTRAP_CLASSES) | grep '\S' &> /dev/null ; then \
+ (set -e ; \
+ cd lib/rt ; \
+ for dirs in $(ICEDTEA_BOOTSTRAP_RESOURCES) ; \
+ do \
+ destpath=`echo $$dirs|sed -e 's#$(LANGTOOLS)/##' -e 's#$(SHARE)/##'` ; \
+ mkdir -p `dirname $$destpath` ; \
+ cp -a ../../$$dirs $$destpath ; \
+ done ; \
+ $(ZIP) -qur $(STAGE1_BOOT_DIR)/jre/lib/rt.jar \
+ com java javax sun ); \
+ fi
mkdir -p stamps
touch $@
diff -r fa408e2cd92e -r f4763c22ae76 NEWS
--- a/NEWS Thu Mar 21 00:27:57 2013 +0000
+++ b/NEWS Mon Mar 25 19:57:59 2013 +0000
@@ -15,6 +15,9 @@
* Bug fixes
- PR1346: Filter out -j option to make
- PR1347: Update list of checked JDKs
+ - PR1357: Make XRender mandatory
+ - PR1325: Only add classes to rt-source-files.txt if the class (or one or more of its methods/fields)
+ are actually missing from the boot JDK
New in release 2.0 (2011-XX-XX):
diff -r fa408e2cd92e -r f4763c22ae76 THANKYOU
--- a/THANKYOU Thu Mar 21 00:27:57 2013 +0000
+++ b/THANKYOU Mon Mar 25 19:57:59 2013 +0000
@@ -7,3 +7,4 @@
Alon Bar-Lev (alon.barlev at gmail.com)
C. K. Jester-Young (cky944 at gmail.com)
Damien Raude-Morvan (drazzib at drazzib.com)
+Michal Vyskocil (mvyskocil at suse.cz)
diff -r fa408e2cd92e -r f4763c22ae76 configure.ac
--- a/configure.ac Thu Mar 21 00:27:57 2013 +0000
+++ b/configure.ac Mon Mar 25 19:57:59 2013 +0000
@@ -115,7 +115,6 @@
IT_PR40630_CHECK
IT_CHECK_FOR_CLASS([JAVAX_ANNOTATION_RESOURCE], [javax.annotation.Resource])
IT_GETDTDTYPE_CHECK
-IT_CHECK_FOR_CLASS([SUN_AWT_TOOLKIT], [sun.awt.SunToolkit])
IT_CHECK_ENABLE_WARNINGS
IT_DIAMOND_CHECK
@@ -212,14 +211,11 @@
AC_SUBST(XINERAMA_CFLAGS)
AC_SUBST(XINERAMA_LIBS)
-if test "x${ENABLE_XRENDER}" = "xyes"
+PKG_CHECK_MODULES(XRENDER, xrender, [XRENDER_FOUND=yes], [XRENDER_FOUND=no])
+if test "x${XRENDER_FOUND}" = xno
then
- PKG_CHECK_MODULES(XRENDER, xrender, [XRENDER_FOUND=yes], [XRENDER_FOUND=no])
- if test "x${XRENDER_FOUND}" = xno
- then
- AC_MSG_ERROR([Could not find Xrender extension - \
-Try installing libXrender-devel or configure --disable-xrender.])
- fi
+ AC_MSG_ERROR([Could not find Xrender extension - \
+Try installing libXrender-devel.])
fi
if test "x${ENABLE_SYSTEMTAP}" = xyes; then
More information about the distro-pkg-dev
mailing list