summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authortnn <tnn>2015-06-13 14:55:52 +0000
committertnn <tnn>2015-06-13 14:55:52 +0000
commitaab8745afa7f1cfdb01f73060a5a541ceb7b2823 (patch)
tree6c473b4fc2b07bc4c2a0c2de3c2d2030342f557d /lang
parent0f241e9c7c5c114c1c672e5eb1b86637813dc211 (diff)
downloadpkgsrc-aab8745afa7f1cfdb01f73060a5a541ceb7b2823.tar.gz
Disable use of C++ precompiled headers.
My benchmark shows that they make the build at least 10% slower.
Diffstat (limited to 'lang')
-rw-r--r--lang/openjdk7/Makefile3
-rw-r--r--lang/openjdk8/Makefile3
-rw-r--r--lang/openjdk8/distinfo3
-rw-r--r--lang/openjdk8/patches/patch-hotspot_src_share_vm_ci_ciTypeFlow.cpp14
4 files changed, 20 insertions, 3 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index 7d971add3d9..6abcc4cc22e 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2015/06/09 15:03:43 tnn Exp $
+# $NetBSD: Makefile,v 1.101 2015/06/13 14:55:52 tnn Exp $
DISTNAME= openjdk-1.7.80-20150609
PKGNAME= openjdk7-1.7.80
@@ -51,6 +51,7 @@ MAKE_ENV+= ZLIB_LIBS="-L${BUILDLINK_PREFIX.zlib}/lib -lz"
MAKE_ENV+= ALT_PARALLEL_COMPILE_JOBS=${MAKE_JOBS:U1}
MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS}
+MAKE_ENV+= USE_PRECOMPILED_HEADER=0
MAKE_ENV+= HOTSPOT_BUILD_USER=pkgsrc
MAKE_ENV+= NO_DOCS=true
diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile
index b410367233a..ea0923692cc 100644
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2015/06/10 13:29:57 tnn Exp $
+# $NetBSD: Makefile,v 1.16 2015/06/13 14:55:52 tnn Exp $
DISTNAME= openjdk-1.8.45-20150610
PKGNAME= openjdk8-1.8.45
@@ -50,6 +50,7 @@ CONFIGURE_ARGS+= --disable-freetype-bundling
CONFIGURE_ARGS+= --with-jobs=${MAKE_JOBS:U1}
CONFIGURE_ARGS+= --with-num-cores=${MAKE_JOBS:U1}
CONFIGURE_ARGS+= --with-memory-size=768
+CONFIGURE_ARGS+= --disable-precompiled-headers
CONFIGURE_ARGS+= --disable-ccache
CONFIGURE_ARGS+= --with-user-release-suffix=pkgsrc_${PKGVERSION}
CONFIGURE_ARGS+= --with-update-version=u${PKGVERSION_NOREV:S/1.8.//}
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index 3961f471592..fcb8427fc97 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2015/06/10 13:29:57 tnn Exp $
+$NetBSD: distinfo,v 1.19 2015/06/13 14:55:52 tnn Exp $
SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
@@ -56,6 +56,7 @@ SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = e87
SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp) = 6311d68db9064afc470f1d9fd37e63011899659a
SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp) = 4fa018be66fad39aa0a922dfb86c79661a7379f2
SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = 69a4ff639488bec525cb5bbccaca10dae0d7dc4d
+SHA1 (patch-hotspot_src_share_vm_ci_ciTypeFlow.cpp) = 2d827ade6fcf0ba08fcd0390472cda17772bc0c5
SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293
SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = cab48bc272fc67f3326e663dc6feb94fe56ec79f
SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 76bae0aab5528a6c020d2fdd5ba7c1ffa132aca2
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_ci_ciTypeFlow.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_ci_ciTypeFlow.cpp
new file mode 100644
index 00000000000..eb8fb3957a3
--- /dev/null
+++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_ci_ciTypeFlow.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-hotspot_src_share_vm_ci_ciTypeFlow.cpp,v 1.1 2015/06/13 14:55:52 tnn Exp $
+
+compile.hpp:807:22: error: inline function 'Compile::locate_node_notes' is not defined [-Werror,-Wundefined-inline]
+
+--- hotspot/src/share/vm/ci/ciTypeFlow.cpp.orig 2015-06-13 14:19:09.000000000 +0000
++++ hotspot/src/share/vm/ci/ciTypeFlow.cpp
+@@ -36,6 +36,7 @@
+ #include "interpreter/bytecodes.hpp"
+ #include "memory/allocation.inline.hpp"
+ #include "opto/compile.hpp"
++#include "opto/node.hpp"
+ #include "runtime/deoptimization.hpp"
+ #include "utilities/growableArray.hpp"
+