Sun Mar 22 21:22:20 2020 UTC ()
Disable some more warnings for clang. Make sure to use visibility
attributes like with gcc.
(joerg)
diff -r1.142 -r1.143 pkgsrc/lang/openjdk7/Makefile
diff -r1.93 -r1.94 pkgsrc/lang/openjdk7/distinfo
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_cpu_x86_vm_jni__x86.h
--- pkgsrc/lang/openjdk7/Attic/Makefile 2020/03/10 22:10:24 1.142
+++ pkgsrc/lang/openjdk7/Attic/Makefile 2020/03/22 21:22:20 1.143
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.142 2020/03/10 22:10:24 wiz Exp $
+# $NetBSD: Makefile,v 1.143 2020/03/22 21:22:20 joerg Exp $
JDK_MICRO= 141
DISTNAME= openjdk-1.7.${JDK_MICRO}-20170813
@@ -50,7 +50,7 @@
BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts
NO_CONFIGURE= yes
-USE_LANGUAGES= c c++03
+USE_LANGUAGES= c gnu++03
USE_TOOLS+= gmake pax unzip:run zip:run # patch
UNLIMIT_RESOURCES= datasize stacksize
WRKSRC= ${WRKDIR}/openjdk
@@ -154,14 +154,16 @@
-Wno-tautological-compare \
-Wno-delete-non-virtual-dtor \
-Wno-return-type -Wno-unused-parameter \
- -Wno-parentheses-equality -Wno-empty-body
+ -Wno-parentheses-equality -Wno-empty-body \
+ -Wno-sizeof-array-div
CWRAPPERS_APPEND.cxx+= -Wno-parentheses -Wno-sign-conversion \
-Wno-shorten-64-to-32 -Wno-conversion \
-Wno-unused-value -Wno-switch-enum -Wno-switch \
-Wno-tautological-compare \
-Wno-delete-non-virtual-dtor \
-Wno-return-type -Wno-unused-parameter \
- -Wno-parentheses-equality -Wno-empty-body
+ -Wno-parentheses-equality -Wno-empty-body \
+ -Wno-sizeof-array-div
. if ${OPSYS} != "FreeBSD"
_WRAP_EXTRA_ARGS.CXX+= -Wno-new-returns-null
CWRAPPERS_APPEND.cxx+= -Wno-new-returns-null
--- pkgsrc/lang/openjdk7/Attic/distinfo 2019/09/22 15:16:26 1.93
+++ pkgsrc/lang/openjdk7/Attic/distinfo 2020/03/22 21:22:20 1.94
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.93 2019/09/22 15:16:26 tnn Exp $
+$NetBSD: distinfo,v 1.94 2020/03/22 21:22:20 joerg Exp $
SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
@@ -85,6 +85,7 @@
SHA1 (patch-hotspot_make_solaris_makefiles_product.make) = 6105c8e7f8b612e70957bccf7313384488388aa5
SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 8a034088ca3c9f5a625849b772dd51f65fad0b43
SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = d72c16b90479c5df0dc33f3b30916b0552dcc17a
+SHA1 (patch-hotspot_src_cpu_x86_vm_jni__x86.h) = 30c4e22a666f9155032bff3c61f77ead61a77b14
SHA1 (patch-hotspot_src_cpu_zero_vm_cppInterpreter__zero.cpp) = 273e588661fd82411c9f7b48f2bf142bbc8caebb
SHA1 (patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp) = 9f7acf1eff3baba430880be9fd0f6148056dd088
SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = dcd83b65a7d74e153a3e1c44f8c7980827ec20c7
$NetBSD: patch-hotspot_src_cpu_x86_vm_jni__x86.h,v 1.1 2020/03/22 21:22:20 joerg Exp $
--- hotspot/src/cpu/x86/vm/jni_x86.h.orig 2020-03-22 17:50:27.459024653 +0000
+++ hotspot/src/cpu/x86/vm/jni_x86.h
@@ -28,7 +28,7 @@
#if defined(SOLARIS) || defined(LINUX) || defined(_ALLBSD_SOURCE)
-#if defined(__GNUC__) && (__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2)
+#if defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2) || defined(__clang__))
#define JNIEXPORT __attribute__((visibility("default")))
#define JNIIMPORT __attribute__((visibility("default")))
#else