diff options
author | Henning Heinold <heinold@inf.fu-berlin.de> | 2013-04-30 17:46:53 +0200 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2013-04-30 23:42:17 +0200 |
commit | 30ff1715cd95f9a0f20d12891f3ea390e0bbe4b1 (patch) | |
tree | 8d0b45f186755d45e396755fb3103a616f2e3810 /recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch | |
parent | e20269243f8725949eb0124d6dded1f4ce78dfa1 (diff) | |
download | meta-java-30ff1715cd95f9a0f20d12891f3ea390e0bbe4b1.tar.gz |
openjdk6: update version 1.12 to 1.12.5
* move some directivies to the included release file
* remove patches which are applied upstream now
Diffstat (limited to 'recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch')
-rw-r--r-- | recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch b/recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch deleted file mode 100644 index 7161b75..0000000 --- a/recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | Index: icedtea6-1.12.4/configure.ac | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.12.4.orig/configure.ac 2013-03-10 14:04:34.072354787 +0100 | ||
4 | +++ icedtea6-1.12.4/configure.ac 2013-03-10 14:07:48.201849004 +0100 | ||
5 | @@ -283,16 +283,6 @@ | ||
6 | AC_SUBST(XT_CFLAGS) | ||
7 | AC_SUBST(XT_LIBS) | ||
8 | |||
9 | -dnl Check for libXp headers and libraries. | ||
10 | -PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) | ||
11 | -if test "x${XP_FOUND}" = xno | ||
12 | -then | ||
13 | - AC_MSG_ERROR([Could not find Xp - \ | ||
14 | - Try installing libXp-devel.]) | ||
15 | -fi | ||
16 | -AC_SUBST(XP_CFLAGS) | ||
17 | -AC_SUBST(XP_LIBS) | ||
18 | - | ||
19 | dnl Check for libX11 headers and libraries. | ||
20 | PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no]) | ||
21 | if test "x${X11_FOUND}" = xno | ||