From: Ting Liu <[email protected]> As the openjdk source was extracted during 'make patch-ecj' in do_configure, apply the patch via do_configure_append.
icedtea6-1.13.4/Makefile.am:1200:stamps/extract-openjdk.stamp: stamps/download.stamp | if OPENJDK_SRC_DIR_FOUND | if ! test -d openjdk ; then \ | cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk ; \ | fi | else | if USE_HG | if ! test -d openjdk ; then \ | cp -pPRl openjdk.hg openjdk ; \ | fi | else | set -e ; \ | if ! test -d openjdk ; \ | then \ | mkdir openjdk ; \ | $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \ | chmod -R ug+w openjdk ; \ | sh $(abs_top_srcdir)/fsg.sh ; \ | fi | endif | endif Signed-off-by: Ting Liu <[email protected]> --- ...njdk-remove-currency-data-generation-expi.patch | 25 ++++++++++++++++++++++ recipes-core/openjdk/openjdk-6-release-6b32.inc | 8 +++++++ 2 files changed, 33 insertions(+) create mode 100644 recipes-core/openjdk/openjdk-6-6b32/icedtea-openjdk-remove-currency-data-generation-expi.patch diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-openjdk-remove-currency-data-generation-expi.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-openjdk-remove-currency-data-generation-expi.patch new file mode 100644 index 0000000..6dd36af --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-6b32/icedtea-openjdk-remove-currency-data-generation-expi.patch @@ -0,0 +1,25 @@ +From 7df2fd1014a0c31f518be4f6a0018533f469d584 Mon Sep 17 00:00:00 2001 +From: Alex Gonzalez <[email protected]> +Date: Wed, 31 Dec 2014 16:07:32 +0100 +Subject: [PATCH] icedtea: openjdk: remove currency data generation expiration + date + +Signed-off-by: Alex Gonzalez <[email protected]> +--- + .../src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 3 --- + 1 file changed, 3 deletions(-) + +diff --git openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java +index bf335fa22c1d..0e421360fef9 100644 +--- openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java ++++ openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java +@@ -281,9 +281,6 @@ public class GenerateCurrencyData { + checkCurrencyCode(newCurrency); + String timeString = currencyInfo.substring(4, length - 4); + long time = format.parse(timeString).getTime(); +- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) { +- throw new RuntimeException("time is more than 10 years from present: " + time); +- } + specialCaseCutOverTimes[specialCaseCount] = time; + specialCaseOldCurrencies[specialCaseCount] = oldCurrency; + specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency); diff --git a/recipes-core/openjdk/openjdk-6-release-6b32.inc b/recipes-core/openjdk/openjdk-6-release-6b32.inc index fb7fb35..bf5e675 100644 --- a/recipes-core/openjdk/openjdk-6-release-6b32.inc +++ b/recipes-core/openjdk/openjdk-6-release-6b32.inc @@ -4,12 +4,20 @@ DEPENDS += "krb5" FILESPATH =. "${FILE_DIRNAME}/openjdk-6-6b32:" +ICEDTEAPATCHES += "file://icedtea-openjdk-remove-currency-data-generation-expi.patch;apply=no" + EXTRA_OECONF += "--disable-downloading \ --enable-system-zlib \ --enable-system-jpeg \ --enable-system-png \ --enable-system-gif \ " +do_configure_append () { + patch -p0 <${WORKDIR}/icedtea-openjdk-remove-currency-data-generation-expi.patch + cd openjdk-ecj + patch -p1 <${WORKDIR}/icedtea-openjdk-remove-currency-data-generation-expi.patch + cd .. +} OPENJDK_VERSION = "b32" OPENJDK_DATE = "15_jul_2014" -- 1.9.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
