diff options
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch b/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch new file mode 100644 index 0000000..b783613 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From c530da1c0269d1e9a875670943446876227fdb71 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jens Rehsack <rehsack@gmail.com> | ||
3 | Date: Thu, 2 Jan 2020 13:51:40 +0100 | ||
4 | Subject: [PATCH 08/10] autoconf: fix shark build (common) | ||
5 | |||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
7 | --- | ||
8 | common/autoconf/libraries.m4 | 5 +++-- | ||
9 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 | ||
12 | index 727f018..91d2b5c 100644 | ||
13 | --- a/common/autoconf/libraries.m4 | ||
14 | +++ b/common/autoconf/libraries.m4 | ||
15 | @@ -1079,8 +1079,9 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP], | ||
16 | fi | ||
17 | fi | ||
18 | done | ||
19 | - llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//') | ||
20 | + llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//; s/\..*$//') | ||
21 | LLVM_CFLAGS="${LLVM_CFLAGS} -DSHARK_LLVM_VERSION=${llvm_version}" | ||
22 | + AS_IF([test $llvm_version -ge 34], [LLVM_CFLAGS="${LLVM_CFLAGS} -std=gnu++11"]) | ||
23 | |||
24 | unset LLVM_LDFLAGS | ||
25 | for flag in $("${LLVM_CONFIG}" --ldflags); do | ||
26 | @@ -1093,7 +1094,7 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP], | ||
27 | done | ||
28 | |||
29 | unset LLVM_LIBS | ||
30 | - for flag in $("${LLVM_CONFIG}" --libs ${llvm_components}); do | ||
31 | + for flag in $("${LLVM_CONFIG}" --libs --system-libs ${llvm_components}); do | ||
32 | if echo "${flag}" | grep -q '^-l'; then | ||
33 | if test "${LLVM_LIBS}" != ""; then | ||
34 | LLVM_LIBS="${LLVM_LIBS} " | ||
35 | -- | ||
36 | 2.24.1 | ||
37 | |||