diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2018-11-16 17:30:17 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2018-11-16 17:30:17 +0000 |
| commit | 93c79b58f99906f2602836d1cd94591b5f8f3c85 (patch) | |
| tree | 89a55b3427a2303b35d46d8bd4679023bd86e614 /java/openjdk8/files | |
| parent | Clean up Makefile (should be part of r484963) (diff) | |
- Fix reversed ccache version detection logic. Enable ccache support.
- Use '-pthread' for Clang. Clang supports '-pthread' on all BSDs except
for Darwin. [1]
Reported by: Achilleas Mantzios <achill@matrix.gatewaynet.com> [1]
Tested by: Achilleas Mantzios <achill@matrix.gatewaynet.com> [1]
Diffstat (limited to 'java/openjdk8/files')
4 files changed, 47 insertions, 0 deletions
diff --git a/java/openjdk8/files/patch-common_autoconf_build-performance.m4 b/java/openjdk8/files/patch-common_autoconf_build-performance.m4 new file mode 100644 index 000000000000..e54d13e29f53 --- /dev/null +++ b/java/openjdk8/files/patch-common_autoconf_build-performance.m4 @@ -0,0 +1,11 @@ +--- common/autoconf/build-performance.m4.orig ++++ common/autoconf/build-performance.m4 +@@ -213,7 +213,7 @@ AC_DEFUN([BPERF_SETUP_CCACHE_USAGE], + # precompiled headers. + AC_MSG_CHECKING([if ccache supports precompiled headers]) + HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split(@S|@3, a, "."); if (a@<:@1@:>@ >= 3 && (a@<:@2@:>@ > 1 || (a@<:@2@:>@ == 1 && a@<:@3@:>@ >= 4))) print "yes"; else print "no"; }') 2> /dev/null` +- if test "x$HAS_GOOD_CCACHE" = xyes; then ++ if test "x$HAS_GOOD_CCACHE" != xyes; then + AC_MSG_RESULT([no, disabling ccache]) + CCACHE= + else diff --git a/java/openjdk8/files/patch-common_autoconf_generated-configure.sh b/java/openjdk8/files/patch-common_autoconf_generated-configure.sh new file mode 100644 index 000000000000..5d23acb86040 --- /dev/null +++ b/java/openjdk8/files/patch-common_autoconf_generated-configure.sh @@ -0,0 +1,11 @@ +--- common/autoconf/generated-configure.sh.orig ++++ common/autoconf/generated-configure.sh +@@ -36760,7 +36760,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5 + $as_echo_n "checking if ccache supports precompiled headers... " >&6; } + HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split($3, a, "."); if (a[1] >= 3 && (a[2] > 1 || (a[2] == 1 && a[3] >= 4))) print "yes"; else print "no"; }') 2> /dev/null` +- if test "x$HAS_GOOD_CCACHE" = xyes; then ++ if test "x$HAS_GOOD_CCACHE" != xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5 + $as_echo "no, disabling ccache" >&6; } + CCACHE= diff --git a/java/openjdk8/files/patch-hotspot_make_bsd_makefiles_gcc.make b/java/openjdk8/files/patch-hotspot_make_bsd_makefiles_gcc.make new file mode 100644 index 000000000000..83d105676172 --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_make_bsd_makefiles_gcc.make @@ -0,0 +1,12 @@ +--- hotspot/make/bsd/makefiles/gcc.make.orig ++++ hotspot/make/bsd/makefiles/gcc.make +@@ -200,6 +200,9 @@ ifeq ($(USE_CLANG),) + CFLAGS += -fvisibility=hidden + endif + else ++ ifneq ($(OS_VENDOR), Darwin) ++ CFLAGS += -pthread ++ endif + CFLAGS += -fvisibility=hidden + endif + diff --git a/java/openjdk8/files/patch-hotspot_make_bsd_makefiles_vm.make b/java/openjdk8/files/patch-hotspot_make_bsd_makefiles_vm.make new file mode 100644 index 000000000000..fa416a9ac585 --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_make_bsd_makefiles_vm.make @@ -0,0 +1,13 @@ +--- hotspot/make/bsd/makefiles/vm.make.orig ++++ hotspot/make/bsd/makefiles/vm.make +@@ -132,6 +132,10 @@ LIBS += -lm + + ifeq ($(USE_CLANG),) + LIBS += -pthread ++else ++ ifneq ($(OS_VENDOR), Darwin) ++ LIBS += -pthread ++ endif + endif + + # By default, link the *.o into the library, not the executable. |