diff options
author | Henning Heinold <heinold@inf.fu-berlin.de> | 2012-11-22 18:47:13 +0100 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2012-11-22 18:49:40 +0100 |
commit | 7dbdd2420d3888d8b7e4e1418ba1bbfe0b1f687c (patch) | |
tree | ca625d3583eee077c9750bd47a97b83e8ffef540 /recipes-core/icedtea/openjdk-7-03b147/disable-library-checks.patch | |
parent | e6e59540e4540dfca17c5904aad6fdc23cf6934e (diff) | |
download | meta-java-7dbdd2420d3888d8b7e4e1418ba1bbfe0b1f687c.tar.gz |
icedtea7-native: simple copy over from openjdk-7 branch
Diffstat (limited to 'recipes-core/icedtea/openjdk-7-03b147/disable-library-checks.patch')
-rw-r--r-- | recipes-core/icedtea/openjdk-7-03b147/disable-library-checks.patch | 115 |
1 files changed, 115 insertions, 0 deletions
diff --git a/recipes-core/icedtea/openjdk-7-03b147/disable-library-checks.patch b/recipes-core/icedtea/openjdk-7-03b147/disable-library-checks.patch new file mode 100644 index 0000000..cd26990 --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/disable-library-checks.patch | |||
@@ -0,0 +1,115 @@ | |||
1 | Index: icedtea-2.1/configure.ac | ||
2 | =================================================================== | ||
3 | --- icedtea-2.1.orig/configure.ac | ||
4 | +++ icedtea-2.1/configure.ac | ||
5 | @@ -171,71 +171,19 @@ IT_CHECK_FOR_LCMS | ||
6 | IT_CHECK_FOR_GTK | ||
7 | IT_CHECK_FOR_GIO | ||
8 | IT_CHECK_FOR_FONTCONFIG | ||
9 | -IT_CHECK_FOR_CUPS | ||
10 | IT_CHECK_FOR_SYSCALLS | ||
11 | AC_CONFIG_FILES([remove-intree-libraries.sh]) | ||
12 | |||
13 | -dnl Check for Xproto headers and libraries. | ||
14 | -PKG_CHECK_MODULES(XPROTO, xproto,[XPROTO_FOUND=yes],[XPROTO_FOUND=no]) | ||
15 | -if test "x${XPROTO_FOUND}" = xno | ||
16 | -then | ||
17 | - AC_MSG_ERROR([Could not find Xproto headers - \ | ||
18 | - Try installing xorg-x11-proto-devel.]) | ||
19 | -fi | ||
20 | -AC_SUBST(XT_CFLAGS) | ||
21 | -AC_SUBST(XT_LIBS) | ||
22 | - | ||
23 | -dnl Check for libXt headers and libraries. | ||
24 | -PKG_CHECK_MODULES(XT, xt,[XT_FOUND=yes],[XT_FOUND=no]) | ||
25 | -if test "x${XT_FOUND}" = xno | ||
26 | -then | ||
27 | - AC_MSG_ERROR([Could not find Xt - \ | ||
28 | - Try installing libXt-devel.]) | ||
29 | -fi | ||
30 | -AC_SUBST(XT_CFLAGS) | ||
31 | -AC_SUBST(XT_LIBS) | ||
32 | - | ||
33 | -dnl Check for libXp headers and libraries. | ||
34 | -PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) | ||
35 | -if test "x${XP_FOUND}" = xno | ||
36 | -then | ||
37 | - AC_MSG_ERROR([Could not find Xp - \ | ||
38 | - Try installing libXp-devel.]) | ||
39 | -fi | ||
40 | -AC_SUBST(XP_CFLAGS) | ||
41 | -AC_SUBST(XP_LIBS) | ||
42 | - | ||
43 | dnl Check for libX11 headers and libraries. | ||
44 | PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no]) | ||
45 | if test "x${X11_FOUND}" = xno | ||
46 | then | ||
47 | - AC_MSG_ERROR([Could not find x11 - \ | ||
48 | - Try installing libX11-devel.]) | ||
49 | + AC_MSG_ERROR([Could not find x11 - \ | ||
50 | + Try installing libX11-devel.]) | ||
51 | fi | ||
52 | AC_SUBST(X11_CFLAGS) | ||
53 | AC_SUBST(X11_LIBS) | ||
54 | |||
55 | -dnl Check for libXinerama headers and libraries. | ||
56 | -PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes] | ||
57 | - ,[XINERAMA_FOUND=no]) | ||
58 | -if test "x${XINERAMA_FOUND}" = xno | ||
59 | -then | ||
60 | - AC_MSG_ERROR([Could not find Xinerama - \ | ||
61 | - Try installing libXinerama-devel.]) | ||
62 | -fi | ||
63 | -AC_SUBST(XINERAMA_CFLAGS) | ||
64 | -AC_SUBST(XINERAMA_LIBS) | ||
65 | - | ||
66 | -if test "x${ENABLE_XRENDER}" = "xyes" | ||
67 | -then | ||
68 | - PKG_CHECK_MODULES(XRENDER, xrender, [XRENDER_FOUND=yes], [XRENDER_FOUND=no]) | ||
69 | - if test "x${XRENDER_FOUND}" = xno | ||
70 | - then | ||
71 | - AC_MSG_ERROR([Could not find Xrender extension - \ | ||
72 | -Try installing libXrender-devel or configure --disable-xrender.]) | ||
73 | - fi | ||
74 | -fi | ||
75 | - | ||
76 | if test "x${ENABLE_SYSTEMTAP}" = xyes; then | ||
77 | AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], | ||
78 | [SDT_H_FOUND='no'; | ||
79 | @@ -297,16 +245,6 @@ public: | ||
80 | AC_CONFIG_FILES([tapset/jstack.stp]) | ||
81 | fi | ||
82 | |||
83 | -dnl Check for libXtst headers and libraries. | ||
84 | -PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) | ||
85 | -if test "x${XTST_FOUND}" = xno | ||
86 | -then | ||
87 | - AC_MSG_ERROR([Could not find Xtst - \ | ||
88 | - Try installing libXtst-devel.]) | ||
89 | -fi | ||
90 | -AC_SUBST(XTST_CFLAGS) | ||
91 | -AC_SUBST(XTST_LIBS) | ||
92 | - | ||
93 | dnl Check for freetype2 headers and libraries. | ||
94 | PKG_CHECK_MODULES(FREETYPE2, freetype2,[FREETYPE2_FOUND=yes] | ||
95 | ,[FREETYPE2_FOUND=no]) | ||
96 | @@ -318,19 +256,6 @@ fi | ||
97 | AC_SUBST(FREETYPE2_CFLAGS) | ||
98 | AC_SUBST(FREETYPE2_LIBS) | ||
99 | |||
100 | -dnl Check for alsa headers and libraries (only required for Linux). | ||
101 | -if test "x${BUILD_OS_DIR}" = "xlinux" | ||
102 | -then | ||
103 | - PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no]) | ||
104 | - if test "x${ALSA_FOUND}" = xno | ||
105 | - then | ||
106 | - AC_MSG_ERROR([Could not find alsa - \ | ||
107 | - Try installing alsa-lib-devel.]) | ||
108 | - fi | ||
109 | -AC_SUBST(ALSA_CFLAGS) | ||
110 | -AC_SUBST(ALSA_LIBS) | ||
111 | -fi | ||
112 | - | ||
113 | if test "x${enable_pulse_java}" = "xyes" | ||
114 | then | ||
115 | dnl Check for pulseaudio libraries. | ||