/hg/icedtea: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Mar 20 17:28:14 PDT 2013
changeset 0f2eee121cdd in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0f2eee121cdd
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Mar 20 23:04:14 2013 +0000
PR1346: Filter out -j option to make.
2013-03-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR1346: Filter out -j option to make
* Makefile.am:
(ICEDTEA_MAKE): Remove -j flag if present
as OpenJDK build chokes on it.
(ICEDTEA_ENV): Set JOBS to value of ${PARALLEL_JOBS}.
(icedtea): Use ICEDTEA_MAKE.
(icedtea-debug): Likewise.
(icedtea-boot): Likewise.
* NEWS: Updated.
changeset ccf39d9b37b2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ccf39d9b37b2
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 28 21:55:51 2011 +0100
Update list of JDKs to check. Only check for IcedTea6 VMs when not bootstrapping until PR716 is fixed.
2011-09-27 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
(AC_CHECK_FOR_JDK): Look for IcedTea7 JDKs.
Don't check for IcedTea6 JDKs when bootstrapping
until PR716 is fixed.
changeset 04e4a665e0da in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=04e4a665e0da
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Mar 21 00:25:11 2013 +0000
PR1347: Update list of checked JDKs
2013-03-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR1347: Update list of checked JDKs
* acinclude.m4:
(IT_CHECK_FOR_JDK): Split out GCJ_VMS and don't
include for now, until it uses a new enough ecj.
Remove ICEDTEA6_VMS and add ICEDTEA8_VMS.
(IT_DIAMOND_CHECK): Add target 7 so javac succeeds
when it can.
* NEWS: Updated.
changeset fa408e2cd92e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fa408e2cd92e
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Mar 21 00:27:57 2013 +0000
Fix path on not-enabled NSS patch too.
2013-03-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/nss-not-enabled-config.patch:
Fix path on this version too.
diffstat:
ChangeLog | 35 +++++++++++++++++++++++++++++++++++
Makefile.am | 10 ++++++----
NEWS | 6 +++++-
acinclude.m4 | 12 +++++++-----
patches/nss-not-enabled-config.patch | 4 ++--
5 files changed, 55 insertions(+), 12 deletions(-)
diffs (147 lines):
diff -r 14ea939ddd75 -r fa408e2cd92e ChangeLog
--- a/ChangeLog Fri Mar 15 19:22:26 2013 +0000
+++ b/ChangeLog Thu Mar 21 00:27:57 2013 +0000
@@ -1,3 +1,38 @@
+2013-03-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * patches/nss-not-enabled-config.patch:
+ Fix path on this version too.
+
+2013-03-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR1347: Update list of checked JDKs
+ * acinclude.m4:
+ (IT_CHECK_FOR_JDK): Split out GCJ_VMS and don't
+ include for now, until it uses a new enough ecj.
+ Remove ICEDTEA6_VMS and add ICEDTEA8_VMS.
+ (IT_DIAMOND_CHECK): Add target 7 so javac succeeds
+ when it can.
+ * NEWS: Updated.
+
+2011-09-27 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * acinclude.m4:
+ (IT_CHECK_FOR_JDK): Look for IcedTea7 JDKs.
+ Don't check for IcedTea6 JDKs when bootstrapping
+ until PR716 is fixed.
+
+2013-03-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR1346: Filter out -j option to make
+ * Makefile.am:
+ (ICEDTEA_MAKE): Remove -j flag if present
+ as OpenJDK build chokes on it.
+ (ICEDTEA_ENV): Set JOBS to value of ${PARALLEL_JOBS}.
+ (icedtea): Use ICEDTEA_MAKE.
+ (icedtea-debug): Likewise.
+ (icedtea-boot): Likewise.
+ * NEWS: Updated.
+
2013-03-14 Andrew John Hughes <gnu_andrew at member.fsf.org>
Bump to OpenJDK b80.
diff -r 14ea939ddd75 -r fa408e2cd92e Makefile.am
--- a/Makefile.am Fri Mar 15 19:22:26 2013 +0000
+++ b/Makefile.am Thu Mar 21 00:27:57 2013 +0000
@@ -108,6 +108,7 @@
# Flags
IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
+ICEDTEA_MAKE=$(subst -j,JOBS=,$(MAKE))
# Conditional defintions
@@ -321,7 +322,8 @@
DEBUG_BINARIES="true" \
DISABLE_INTREE_EC="true" \
LOG="debug" SCTP_WERROR= \
- POST_STRIP_CMD= STRIP_POLICY="no_strip"
+ POST_STRIP_CMD= STRIP_POLICY="no_strip" \
+ JOBS="$(PARALLEL_JOBS)"
if ENABLE_CACAO
ICEDTEA_ENV += \
@@ -1378,7 +1380,7 @@
touch $@
stamps/icedtea.stamp: stamps/icedtea-configure.stamp
- $(ARCH_PREFIX) $(MAKE) \
+ $(ARCH_PREFIX) $(ICEDTEA_MAKE) \
$(ICEDTEA_ENV) \
-C $(BUILD_OUTPUT_DIR) \
$(ICEDTEA_BUILD_TARGET)
@@ -1451,7 +1453,7 @@
touch $@
stamps/icedtea-debug.stamp: stamps/icedtea-debug-configure.stamp
- $(ARCH_PREFIX) $(MAKE) \
+ $(ARCH_PREFIX) $(ICEDTEA_MAKE) \
$(ICEDTEA_ENV) \
-C $(DEBUG_BUILD_OUTPUT_DIR) \
$(ICEDTEA_BUILD_TARGET)
@@ -1551,7 +1553,7 @@
touch $@
stamps/icedtea-boot.stamp: stamps/icedtea-boot-configure.stamp
- $(ARCH_PREFIX) $(MAKE) \
+ $(ARCH_PREFIX) $(ICEDTEA_MAKE) \
$(ICEDTEA_ENV_BOOT) \
-C $(BOOT_BUILD_OUTPUT_DIR) \
images
diff -r 14ea939ddd75 -r fa408e2cd92e NEWS
--- a/NEWS Fri Mar 15 19:22:26 2013 +0000
+++ b/NEWS Thu Mar 21 00:27:57 2013 +0000
@@ -10,7 +10,11 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 3.0 beta 1 (2011-XX-XX):
+New in release 3.0 beta 1 (2013-XX-XX):
+
+* Bug fixes
+ - PR1346: Filter out -j option to make
+ - PR1347: Update list of checked JDKs
New in release 2.0 (2011-XX-XX):
diff -r 14ea939ddd75 -r fa408e2cd92e acinclude.m4
--- a/acinclude.m4 Fri Mar 15 19:22:26 2013 +0000
+++ b/acinclude.m4 Thu Mar 21 00:27:57 2013 +0000
@@ -1138,11 +1138,13 @@
])
if test -z "${SYSTEM_JDK_DIR}"; then
if test "x${enable_bootstrap}" = "xyes"; then
- BOOTSTRAP_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk /usr/lib/jvm/cacao";
+ GCJ_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk";
+ BOOTSTRAP_VMS="/usr/lib/jvm/cacao";
fi
- for dir in ${BOOTSTRAP_VMS} /usr/lib/jvm/java-openjdk \
- /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \
- /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea ; do
+ ICEDTEA7_VMS="/usr/lib/jvm/icedtea7 /usr/lib/jvm/java-1.7.0-openjdk"
+ ICEDTEA8_VMS="/usr/lib/jvm/icedtea8 /usr/lib/jvm/java-1.8.0-openjdk"
+ for dir in ${BOOTSTRAP_VMS} ${ICEDTEA8_VMS} ${ICEDTEA7_VMS} \
+ /usr/lib/jvm/java-openjdk /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea ; do
if test -d $dir; then
SYSTEM_JDK_DIR=$dir
break
@@ -1682,7 +1684,7 @@
}
}]
EOF
- if $JAVAC -cp . $JAVACFLAGS -source 7 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVAC -cp . $JAVACFLAGS -source 7 -target 7 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
it_cv_diamond=no;
else
it_cv_diamond=yes;
diff -r 14ea939ddd75 -r fa408e2cd92e patches/nss-not-enabled-config.patch
--- a/patches/nss-not-enabled-config.patch Fri Mar 15 19:22:26 2013 +0000
+++ b/patches/nss-not-enabled-config.patch Thu Mar 21 00:27:57 2013 +0000
@@ -1,5 +1,5 @@
---- openjdk.orig/jdk/src/share/lib/security/java.security 2009-08-25 11:43:59.000000000 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security 2009-08-27 14:23:54.000000000 +0100
+--- openjdk.orig/jdk/src/share/lib/security/java.security-linux 2009-08-25 11:43:59.000000000 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-linux 2009-08-27 14:23:54.000000000 +0100
@@ -51,6 +51,10 @@
security.provider.6=com.sun.security.sasl.Provider
security.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI
More information about the distro-pkg-dev
mailing list