diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2020-04-21 13:00:22 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-11-09 14:29:49 +0100 |
commit | f66b83882e076f339dd89e88165bd7bac121f9ff (patch) | |
tree | ca7eafceb9735f4c5cb5d2d574bf94b42d6c29b6 /recipes-core/openjdk/patches-openjdk-14/0001-make-autoconf-remove-hard-dependency-on-cups.patch | |
parent | 6e84638d77ac921aac46649095bca5ddbde94d2a (diff) | |
download | meta-java-f66b83882e076f339dd89e88165bd7bac121f9ff.tar.gz |
openjdk-14: add 14.0.1g0hl1n/jdk14
Add support for OpenJDK and OpenJRE v14.0.1.
This version of OpenJDK is bootstrapped from a host-provided JDK. The
host provided JDK is used to build openjdk-14-native. The native build
is then used as build-jdk for the cross version.
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-14/0001-make-autoconf-remove-hard-dependency-on-cups.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-14/0001-make-autoconf-remove-hard-dependency-on-cups.patch | 154 |
1 files changed, 154 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-14/0001-make-autoconf-remove-hard-dependency-on-cups.patch b/recipes-core/openjdk/patches-openjdk-14/0001-make-autoconf-remove-hard-dependency-on-cups.patch new file mode 100644 index 0000000..51999b6 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-14/0001-make-autoconf-remove-hard-dependency-on-cups.patch | |||
@@ -0,0 +1,154 @@ | |||
1 | From 3f77089a24c5073c59321d0ac5fdfe5057d8c06b Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Leitner <richard.leitner@skidata.com> | ||
3 | Date: Wed, 13 May 2020 13:34:33 +0200 | ||
4 | Subject: [PATCH 1/2] make: autoconf: remove hard dependency on cups | ||
5 | |||
6 | In our native build we don't want to have a dependency on cups, | ||
7 | therefore enable --without-cups for all platforms. | ||
8 | |||
9 | Upstream-Status: Inappropriate [disable feature] | ||
10 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
11 | --- | ||
12 | make/autoconf/lib-cups.m4 | 30 ++++++++++++------------------ | ||
13 | make/autoconf/libraries.m4 | 8 -------- | ||
14 | make/autoconf/spec.gmk.in | 1 + | ||
15 | make/lib/Awt2dLibraries.gmk | 13 ++++++++++++- | ||
16 | 4 files changed, 25 insertions(+), 27 deletions(-) | ||
17 | |||
18 | diff --git a/make/autoconf/lib-cups.m4 b/make/autoconf/lib-cups.m4 | ||
19 | index 0a7df8b381..e8b6a683a3 100644 | ||
20 | --- a/make/autoconf/lib-cups.m4 | ||
21 | +++ b/make/autoconf/lib-cups.m4 | ||
22 | @@ -34,25 +34,18 @@ AC_DEFUN_ONCE([LIB_SETUP_CUPS], | ||
23 | AC_ARG_WITH(cups-include, [AS_HELP_STRING([--with-cups-include], | ||
24 | [specify directory for the cups include files])]) | ||
25 | |||
26 | - if test "x$NEEDS_LIB_CUPS" = xfalse; then | ||
27 | - if (test "x${with_cups}" != x && test "x${with_cups}" != xno) || \ | ||
28 | - (test "x${with_cups_include}" != x && test "x${with_cups_include}" != xno); then | ||
29 | - AC_MSG_WARN([[cups not used, so --with-cups[-*] is ignored]]) | ||
30 | - fi | ||
31 | + | ||
32 | + WITH_CUPS="false" | ||
33 | + if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno; then | ||
34 | + AC_MSG_WARN([Disable the use of cups.]) | ||
35 | CUPS_CFLAGS= | ||
36 | else | ||
37 | - CUPS_FOUND=no | ||
38 | - | ||
39 | - if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno; then | ||
40 | - AC_MSG_ERROR([It is not possible to disable the use of cups. Remove the --without-cups option.]) | ||
41 | - fi | ||
42 | - | ||
43 | if test "x${with_cups}" != x; then | ||
44 | AC_MSG_CHECKING([for cups headers]) | ||
45 | if test -s "${with_cups}/include/cups/cups.h"; then | ||
46 | CUPS_CFLAGS="-I${with_cups}/include" | ||
47 | - CUPS_FOUND=yes | ||
48 | - AC_MSG_RESULT([$CUPS_FOUND]) | ||
49 | + WITH_CUPS="true" | ||
50 | + AC_MSG_RESULT([$WITH_CUPS]) | ||
51 | else | ||
52 | AC_MSG_ERROR([Can't find 'include/cups/cups.h' under ${with_cups} given with the --with-cups option.]) | ||
53 | fi | ||
54 | @@ -61,25 +54,26 @@ AC_DEFUN_ONCE([LIB_SETUP_CUPS], | ||
55 | AC_MSG_CHECKING([for cups headers]) | ||
56 | if test -s "${with_cups_include}/cups/cups.h"; then | ||
57 | CUPS_CFLAGS="-I${with_cups_include}" | ||
58 | - CUPS_FOUND=yes | ||
59 | - AC_MSG_RESULT([$CUPS_FOUND]) | ||
60 | + WITH_CUPS="true" | ||
61 | + AC_MSG_RESULT([$WITH_CUPS]) | ||
62 | else | ||
63 | AC_MSG_ERROR([Can't find 'cups/cups.h' under ${with_cups_include} given with the --with-cups-include option.]) | ||
64 | fi | ||
65 | fi | ||
66 | - if test "x$CUPS_FOUND" = xno; then | ||
67 | + if test "x$WITH_CUPS" = "xfalse"; then | ||
68 | # Are the cups headers installed in the default /usr/include location? | ||
69 | AC_CHECK_HEADERS([cups/cups.h cups/ppd.h], [ | ||
70 | - CUPS_FOUND=yes | ||
71 | + WITH_CUPS="true" | ||
72 | CUPS_CFLAGS= | ||
73 | DEFAULT_CUPS=yes | ||
74 | ]) | ||
75 | fi | ||
76 | - if test "x$CUPS_FOUND" = xno; then | ||
77 | + if test "x$WITH_CUPS" = "xfalse"; then | ||
78 | HELP_MSG_MISSING_DEPENDENCY([cups]) | ||
79 | AC_MSG_ERROR([Could not find cups! $HELP_MSG ]) | ||
80 | fi | ||
81 | fi | ||
82 | |||
83 | AC_SUBST(CUPS_CFLAGS) | ||
84 | + AC_SUBST(WITH_CUPS) | ||
85 | ]) | ||
86 | diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 | ||
87 | index 5f16f08b20..8d64c6e8b7 100644 | ||
88 | --- a/make/autoconf/libraries.m4 | ||
89 | +++ b/make/autoconf/libraries.m4 | ||
90 | @@ -59,14 +59,6 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES], | ||
91 | NEEDS_LIB_FONTCONFIG=true | ||
92 | fi | ||
93 | |||
94 | - # Check if cups is needed | ||
95 | - if test "x$OPENJDK_TARGET_OS" = xwindows; then | ||
96 | - # Windows have a separate print system | ||
97 | - NEEDS_LIB_CUPS=false | ||
98 | - else | ||
99 | - NEEDS_LIB_CUPS=true | ||
100 | - fi | ||
101 | - | ||
102 | # A custom hook may have set this already | ||
103 | if test "x$NEEDS_LIB_FREETYPE" = "x"; then | ||
104 | NEEDS_LIB_FREETYPE=true | ||
105 | diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in | ||
106 | index 3a85303e80..b1253daa5d 100644 | ||
107 | --- a/make/autoconf/spec.gmk.in | ||
108 | +++ b/make/autoconf/spec.gmk.in | ||
109 | @@ -370,6 +370,7 @@ FREETYPE_LIBS:=@FREETYPE_LIBS@ | ||
110 | FREETYPE_CFLAGS:=@FREETYPE_CFLAGS@ | ||
111 | FONTCONFIG_CFLAGS:=@FONTCONFIG_CFLAGS@ | ||
112 | CUPS_CFLAGS:=@CUPS_CFLAGS@ | ||
113 | +WITH_CUPS := @WITH_CUPS@ | ||
114 | ALSA_LIBS:=@ALSA_LIBS@ | ||
115 | ALSA_CFLAGS:=@ALSA_CFLAGS@ | ||
116 | LIBFFI_LIBS:=@LIBFFI_LIBS@ | ||
117 | diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk | ||
118 | index a38d416673..d0eeab35c6 100644 | ||
119 | --- a/make/lib/Awt2dLibraries.gmk | ||
120 | +++ b/make/lib/Awt2dLibraries.gmk | ||
121 | @@ -141,7 +141,11 @@ ifeq ($(call isTargetOs, windows), true) | ||
122 | endif | ||
123 | |||
124 | ifeq ($(call isTargetOs, solaris linux macosx aix), true) | ||
125 | - LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c | ||
126 | + LIBAWT_EXFILES += awt_Font.c fontpath.c X11Color.c | ||
127 | +endif | ||
128 | + | ||
129 | +ifeq ($(WITH_CUPS), false) | ||
130 | + LIBAWT_EXFILES += CUPSfuncs.c | ||
131 | endif | ||
132 | |||
133 | ifeq ($(call isTargetOs, macosx), true) | ||
134 | @@ -461,10 +465,17 @@ ifeq ($(call isTargetOs, windows macosx), false) | ||
135 | LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \ | ||
136 | -DHEADLESS=true | ||
137 | |||
138 | + | ||
139 | + LIBAWT_HEADLESS_EXFILES := | ||
140 | + ifeq ($(WITH_CUPS), false) | ||
141 | + LIBAWT_HEADLESS_EXFILES += CUPSfuncs.c | ||
142 | + endif | ||
143 | + | ||
144 | $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \ | ||
145 | NAME := awt_headless, \ | ||
146 | EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \ | ||
147 | EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \ | ||
148 | + EXCLUDE_FILES := $(LIBAWT_HEADLESS_EXFILES), \ | ||
149 | OPTIMIZATION := LOW, \ | ||
150 | CFLAGS := $(CFLAGS_JDKLIB) \ | ||
151 | $(LIBAWT_HEADLESS_CFLAGS), \ | ||
152 | -- | ||
153 | 2.26.2 | ||
154 | |||