From patchwork Fri Feb 1 10:02:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [meta-java, for, denzil] 4/4] openjdk-6: Remove the Xp header and library configure checks Date: Fri, 01 Feb 2013 10:02:48 -0000 From: Ting Liu X-Patchwork-Id: 43801 Message-Id: <1359712968-22554-5-git-send-email-b28495@freescale.com> To: Cc: b29882@freescale.com From: Ting Liu Xp isn't used anymore by recent jdk versions. Reference: http://icedtea.classpath.org/hg/icedtea7/raw-rev/a9324fa05b9d Signed-off-by: Ting Liu --- ...the-autoconf-Xp-header-and-library-checks.patch | 21 ++++++++++++++++++++ recipes-core/openjdk/openjdk-6-common.inc | 3 +- 2 files changed, 23 insertions(+), 1 deletions(-) create mode 100644 recipes-core/openjdk/openjdk-6-6b24/Remove-the-autoconf-Xp-header-and-library-checks.patch diff --git a/recipes-core/openjdk/openjdk-6-6b24/Remove-the-autoconf-Xp-header-and-library-checks.patch b/recipes-core/openjdk/openjdk-6-6b24/Remove-the-autoconf-Xp-header-and-library-checks.patch new file mode 100644 index 0000000..98a5a7c --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-6b24/Remove-the-autoconf-Xp-header-and-library-checks.patch @@ -0,0 +1,21 @@ +diff --git a/configure.ac b/configure.ac +index bd95501..8c7178c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -218,16 +218,6 @@ fi + AC_SUBST(XT_CFLAGS) + AC_SUBST(XT_LIBS) + +-dnl Check for libXp headers and libraries. +-PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) +-if test "x${XP_FOUND}" = xno +-then +- AC_MSG_ERROR([Could not find Xp - \ +- Try installing libXp-devel.]) +-fi +-AC_SUBST(XP_CFLAGS) +-AC_SUBST(XP_LIBS) +- + dnl Check for libX11 headers and libraries. + PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no]) + if test "x${X11_FOUND}" = xno diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc index 5990de7..35aee9d 100644 --- a/recipes-core/openjdk/openjdk-6-common.inc +++ b/recipes-core/openjdk/openjdk-6-common.inc @@ -10,7 +10,7 @@ ICEDTEA = "icedtea6-${ICEDTEA_VERSION}" S = "${WORKDIR}/${ICEDTEA}" B = "${S}/build" -INC_PR = "r22" +INC_PR = "r23" SRC_URI = "\ ${ICEDTEA_URI} \ @@ -23,6 +23,7 @@ SRC_URI = "\ ${OEPATCHES} \ ${ICEDTEAPATCHES} \ file://jvm.cfg \ + file://Remove-the-autoconf-Xp-header-and-library-checks.patch \ " JDKPN = "openjdk-6"