From patchwork Tue Aug 29 08:46:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Maohui Lei (Fujitsu)" X-Patchwork-Id: 29625 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27E86C83F12 for ; Tue, 29 Aug 2023 08:47:09 +0000 (UTC) Received: from esa2.hc1455-7.c3s2.iphmx.com (esa2.hc1455-7.c3s2.iphmx.com [207.54.90.48]) by mx.groups.io with SMTP id smtpd.web11.13107.1693298821014255635 for ; Tue, 29 Aug 2023 01:47:01 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: fujitsu.com, ip: 207.54.90.48, mailfrom: leimaohui@fujitsu.com) X-IronPort-AV: E=McAfee;i="6600,9927,10816"; a="129895191" X-IronPort-AV: E=Sophos;i="6.02,210,1688396400"; d="scan'208";a="129895191" Received: from unknown (HELO oym-r2.gw.nic.fujitsu.com) ([210.162.30.90]) by esa2.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2023 17:46:58 +0900 Received: from oym-m3.gw.nic.fujitsu.com (oym-nat-oym-m3.gw.nic.fujitsu.com [192.168.87.60]) by oym-r2.gw.nic.fujitsu.com (Postfix) with ESMTP id C1214CD7E2 for ; Tue, 29 Aug 2023 17:46:55 +0900 (JST) Received: from kws-ab3.gw.nic.fujitsu.com (kws-ab3.gw.nic.fujitsu.com [192.51.206.21]) by oym-m3.gw.nic.fujitsu.com (Postfix) with ESMTP id 9D278D9461 for ; Tue, 29 Aug 2023 17:46:54 +0900 (JST) Received: from ubuntu20.g08.fujitsu.local (unknown [10.167.225.227]) by kws-ab3.gw.nic.fujitsu.com (Postfix) with ESMTP id E91AF20074703; Tue, 29 Aug 2023 17:46:53 +0900 (JST) From: leimaohui@fujitsu.com To: yocto@lists.yoctoproject.org Cc: Lei Maohui Subject: [yocto] [meta-java][PATCH] icedtea7-native: Fix build error after autoconf upgraded to 2.73 according to https://github.com/wocaishiliuke/openjdk7. Date: Tue, 29 Aug 2023 16:46:52 +0800 Message-Id: <20230829084652.158404-1-leimaohui@fujitsu.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSS-9.1.0.1417-9.0.0.1002-27842.006 X-TM-AS-User-Approved-Sender: Yes X-TMASE-Version: IMSS-9.1.0.1417-9.0.1002-27842.006 X-TMASE-Result: 10--12.670400-10.000000 X-TMASE-MatchedRID: LHRmwHvTUTFaZ4LjXsl/UgqfFInLO1+qUuVVTCQr62p8ibT62vGkpyG+ TaaivvuasjsyhyqHuLbKSyLhniwKzSGIqlqmIVBSzYK5U+QI3O7BOVz0Jwcxl0fyM5VfgjG2jcR qQigdY11P5YO2/a1BTPn8DBBcI1eukTgVTZl1A7gK3Ma88LL+blK6+0HOVoSoNS9A3X1uuODO/T 5SZgJlw1XgL+88Anj15Rux3Mg53v9cQbUsJeVYropEbqc+UneT2I8NUKi360ZAzPYUSDzxTJlA4 IpB7gNOln/QwCeLmNJ4Xern/Fx5bKPiydWxsrCob/oIJuUAIuHjLrHqvAiSy57fzNec2D1DwyTc 3j7CJZ9Dd9yjJz2qcDN+Ymt5o2e0JUbhFArRKjkAPmNKDWsW0NDZ1FFTJUymv1CkpN/HBgwQXwq fovFY4RFvJgBDDVbLOWEuWhfvco1c415zKJPWMMOC5QFrchIlN7FjQ+zMUh5GXh0VnXIBtq+0gl vEogpj7QHQxPxLQSRftuJwrFEhTbkblkrgCLv43QfwsVk0UbtuRXh7bFKB7hWkdChCg+24qzM2e HPE5/Dq+N5IX/vvM1tiO6eCB67ZaAZk0sEcY14= X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 29 Aug 2023 08:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/60912 From: Lei Maohui openjdk-boot/hotspot/src/share/vm/code/dependencies.hpp:169:72: error: enumerator value for ‘all_types’ is not an integer constant | 169 | all_types = ((1 << TYPE_LIMIT) - 1) & ((-1) << FIRST_TYPE), | ../../../../../src/share/native/com/sun/java/util/jar/pack/jni.cpp:224:12: error: cannot convert ‘bool’ to ‘jobject’ {aka ‘_jobject*’} in return | 224 | return false; | | ^~~~~ ..... Signed-off-by: Lei Maohui --- recipes-core/icedtea/icedtea7-native.inc | 3 + .../0001-For-autoconf-2.73.patch | 942 ++++++++++++++++++ 2 files changed, 945 insertions(+) create mode 100644 recipes-core/icedtea/openjdk-7-03b147/0001-For-autoconf-2.73.patch diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index 0f317bb..1ea2ffa 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc @@ -58,6 +58,7 @@ SRC_URI = " \ file://timezoneszip.patch \ file://sigsegv.patch;apply=no \ file://vframeArray_Fix_sigsegv.patch;apply=no \ + file://0001-For-autoconf-2.73.patch;apply=no \ " S = "${WORKDIR}/${ICEDTEA}" @@ -158,6 +159,7 @@ do_configure:append() { patch -p1 < ${WORKDIR}/jaxws_fix_NullPointerException.patch patch -p1 < ${WORKDIR}/sigsegv.patch patch -p1 < ${WORKDIR}/vframeArray_Fix_sigsegv.patch + patch -p1 < ${WORKDIR}/0001-For-autoconf-2.73.patch } EXTRA_OEMAKE = ' \ @@ -169,6 +171,7 @@ EXTRA_OEMAKE = ' \ ${OEMAKE_BUILD_HEADLESS_ONLY} \ DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \ UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \ + LDD=: \ ' do_compile() { diff --git a/recipes-core/icedtea/openjdk-7-03b147/0001-For-autoconf-2.73.patch b/recipes-core/icedtea/openjdk-7-03b147/0001-For-autoconf-2.73.patch new file mode 100644 index 0000000..6a392cd --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/0001-For-autoconf-2.73.patch @@ -0,0 +1,942 @@ +From aa44766ea0dd9cf3cb19b5a148c222a360fc447a Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Tue, 29 Aug 2023 05:42:41 +0000 +Subject: [PATCH] For autoconf-2.73. + +icedtea7-native met a lot of build issues after autoconf upgraded to 2.73. +Reference to https://github.com/wocaishiliuke/openjdk7, submitted these +patches to avoid build errors. + +Upstream-Status: Inappropriate +Signed-off-by: Lei Maohui +--- + .../hotspot/make/linux/makefiles/gcc.make | 2 +- + .../src/share/vm/code/dependencies.hpp | 2 +- + .../gc_implementation/g1/concurrentMark.cpp | 10 +- + .../hotspot/src/share/vm/prims/unsafe.cpp | 276 +++++++++--------- + .../native/com/sun/java/util/jar/pack/jni.cpp | 2 +- + openjdk/hotspot/make/linux/makefiles/gcc.make | 2 +- + .../src/share/vm/code/dependencies.hpp | 2 +- + .../gc_implementation/g1/concurrentMark.cpp | 10 +- + openjdk/hotspot/src/share/vm/prims/unsafe.cpp | 276 +++++++++--------- + .../native/com/sun/java/util/jar/pack/jni.cpp | 2 +- + 10 files changed, 292 insertions(+), 292 deletions(-) + +diff --git a/openjdk-boot/hotspot/make/linux/makefiles/gcc.make b/openjdk-boot/hotspot/make/linux/makefiles/gcc.make +index 9e63c5c5..dd6d5473 100644 +--- a/openjdk-boot/hotspot/make/linux/makefiles/gcc.make ++++ b/openjdk-boot/hotspot/make/linux/makefiles/gcc.make +@@ -143,7 +143,7 @@ else + endif + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++WARNINGS_ARE_ERRORS = -Wno-all + + # Except for a few acceptable ones + # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit +diff --git a/openjdk-boot/hotspot/src/share/vm/code/dependencies.hpp b/openjdk-boot/hotspot/src/share/vm/code/dependencies.hpp +index 2b8b2afe..74364e89 100644 +--- a/openjdk-boot/hotspot/src/share/vm/code/dependencies.hpp ++++ b/openjdk-boot/hotspot/src/share/vm/code/dependencies.hpp +@@ -166,7 +166,7 @@ class Dependencies: public ResourceObj { + LG2_TYPE_LIMIT = 4, // assert(TYPE_LIMIT <= (1<aborting()) { + THROW_IOE(uPtr->get_abort_message()); +- return false; ++ return 0; + } + + // We have fetched all the files. +diff --git a/openjdk/hotspot/make/linux/makefiles/gcc.make b/openjdk/hotspot/make/linux/makefiles/gcc.make +index 9e63c5c5..dd6d5473 100644 +--- a/openjdk/hotspot/make/linux/makefiles/gcc.make ++++ b/openjdk/hotspot/make/linux/makefiles/gcc.make +@@ -143,7 +143,7 @@ else + endif + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++WARNINGS_ARE_ERRORS = -Wno-all + + # Except for a few acceptable ones + # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit +diff --git a/openjdk/hotspot/src/share/vm/code/dependencies.hpp b/openjdk/hotspot/src/share/vm/code/dependencies.hpp +index 2b8b2afe..74364e89 100644 +--- a/openjdk/hotspot/src/share/vm/code/dependencies.hpp ++++ b/openjdk/hotspot/src/share/vm/code/dependencies.hpp +@@ -166,7 +166,7 @@ class Dependencies: public ResourceObj { + LG2_TYPE_LIMIT = 4, // assert(TYPE_LIMIT <= (1<aborting()) { + THROW_IOE(uPtr->get_abort_message()); +- return false; ++ return 0; + } + + // We have fetched all the files. +-- +2.34.1