From 8a43a71f3b884248e6d4103385640fe870afca6f Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
Date: Thu, 10 Mar 2016 19:20:15 +0000
Subject: Set CHECK_SHLIBS_SUPPORTED=no for both the JRE and JDK, a bug in
 check-shlibs was masking test failures for the JDK package.

---
 lang/sun-jdk6/Makefile        | 6 +-----
 lang/sun-jre6/Makefile        | 3 +--
 lang/sun-jre6/Makefile.common | 4 +++-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/lang/sun-jdk6/Makefile b/lang/sun-jdk6/Makefile
index 05a444a1d24..7d2e8e63051 100644
--- a/lang/sun-jdk6/Makefile
+++ b/lang/sun-jdk6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2015/05/05 16:20:08 abs Exp $
+# $NetBSD: Makefile,v 1.37 2016/03/10 19:20:15 jperkin Exp $
 
 DISTNAME=	jdk-6u45-${DIST_OS}-${DIST_ARCH}
 PKGNAME=	sun-jdk6-6.0.45
@@ -17,10 +17,6 @@ MAKE_JOBS_SAFE=	no
 
 .include "../../lang/sun-jre6/Makefile.common"
 
-.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
-CHECK_SHLIBS_SUPPORTED=	no
-.endif
-
 # The 64-bit Solaris downloads for some inexplicable reason only contain
 # the additional 64-bit files, and you need the main 32-bit file too.
 .if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "x86_64"
diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index 81a5d9b23d8..93914d29eca 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2015/04/26 11:52:19 ryoon Exp $
+# $NetBSD: Makefile,v 1.45 2016/03/10 19:20:15 jperkin Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
@@ -40,7 +40,6 @@ CONF_FILES+=	${JAVA_HOME}/lib/${file}.default ${JAVA_HOME}/lib/${file}
 .endfor
 
 CHECK_FILES_SKIP+=	${JAVA_HOME}/lib/${JAVA_ARCH}/client/classes.jsa
-CHECK_SHLIBS_SUPPORTED=	NO
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sun-jre6
 PKG_SUPPORTED_OPTIONS=	sun-jre-jce
diff --git a/lang/sun-jre6/Makefile.common b/lang/sun-jre6/Makefile.common
index 38d6eb3089c..8517995ed4a 100644
--- a/lang/sun-jre6/Makefile.common
+++ b/lang/sun-jre6/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2013/03/01 09:54:12 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.21 2016/03/10 19:20:15 jperkin Exp $
 # used by lang/sun-jre6/Makefile
 # used by lang/sun-jdk6/Makefile
 
@@ -82,6 +82,8 @@ FETCH_MESSAGE+=	" Click Download for '${DOWNLOAD_NAME}', read and accept the"
 FETCH_MESSAGE+=	" license, then choose 'Linux self-extracting file'."
 .endif
 
+CHECK_SHLIBS_SUPPORTED=	no
+
 post-fetch:
 	@if ${TEST} ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; then	\
 		${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX};	\
-- 
cgit v1.2.3