summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorAndrei Dinu <andrei.adrianx.dinu@intel.com>2012-09-13 11:26:45 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-14 09:50:28 +0100
commit87ec7526ce661f97afa0e39654741b602a809c29 (patch)
treeabd9386641c603374143124b18902ccf52b0f3ba /meta/recipes-gnome
parent447b53b8ca40c4acdef27ead35a305a539bd495e (diff)
downloadpoky-87ec7526ce661f97afa0e39654741b602a809c29.tar.gz
libffi upgrade to 3.0.11
Changes : - Added ax_append_flags.m4 and ax_check_compile_flag.m4 to the m4 directory. The files were missing and aclocal.m4 was generated without those two macros. - Added a new license md5 checksum to the recipe because the old LICENSE file differs from the new one here : OLD : libffi - Copyright (c) 1996-2011 NEW : libffi - Copyright (c) 1996-2012 (From OE-Core rev: 3e40136e8bd13b17b6d88b6acfb5ed162bb8d96a) Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/libffi/0001-libffi-update-for-3.0.11.patch171
-rw-r--r--meta/recipes-gnome/libffi/libffi_3.0.11.bb (renamed from meta/recipes-gnome/libffi/libffi_3.0.10.bb)9
2 files changed, 176 insertions, 4 deletions
diff --git a/meta/recipes-gnome/libffi/0001-libffi-update-for-3.0.11.patch b/meta/recipes-gnome/libffi/0001-libffi-update-for-3.0.11.patch
new file mode 100644
index 0000000000..95920485be
--- /dev/null
+++ b/meta/recipes-gnome/libffi/0001-libffi-update-for-3.0.11.patch
@@ -0,0 +1,171 @@
1From 936ab07cec90243a6a336c5aa6205f4edbeb00d5 Mon Sep 17 00:00:00 2001
2From: Andrei Dinu <andrei.adrianx.dinu@intel.com>
3Date: Wed, 12 Sep 2012 17:42:29 +0300
4Subject: [PATCH] libffi update for 3.0.11
5
6Upstream status : Pending
7
8Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
9---
10 m4/ax_append_flag.m4 | 69 +++++++++++++++++++++++++++++++++++++++++
11 m4/ax_check_compile_flag.m4 | 72 +++++++++++++++++++++++++++++++++++++++++++
12 2 files changed, 141 insertions(+)
13 create mode 100644 m4/ax_append_flag.m4
14 create mode 100644 m4/ax_check_compile_flag.m4
15
16diff --git a/m4/ax_append_flag.m4 b/m4/ax_append_flag.m4
17new file mode 100644
18index 0000000..1d38b76
19--- /dev/null
20+++ b/m4/ax_append_flag.m4
21@@ -0,0 +1,69 @@
22+# ===========================================================================
23+# http://www.gnu.org/software/autoconf-archive/ax_append_flag.html
24+# ===========================================================================
25+#
26+# SYNOPSIS
27+#
28+# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE])
29+#
30+# DESCRIPTION
31+#
32+# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space
33+# added in between.
34+#
35+# If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
36+# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains
37+# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly
38+# FLAG.
39+#
40+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION.
41+#
42+# LICENSE
43+#
44+# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
45+# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
46+#
47+# This program is free software: you can redistribute it and/or modify it
48+# under the terms of the GNU General Public License as published by the
49+# Free Software Foundation, either version 3 of the License, or (at your
50+# option) any later version.
51+#
52+# This program is distributed in the hope that it will be useful, but
53+# WITHOUT ANY WARRANTY; without even the implied warranty of
54+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
55+# Public License for more details.
56+#
57+# You should have received a copy of the GNU General Public License along
58+# with this program. If not, see <http://www.gnu.org/licenses/>.
59+#
60+# As a special exception, the respective Autoconf Macro's copyright owner
61+# gives unlimited permission to copy, distribute and modify the configure
62+# scripts that are the output of Autoconf when processing the Macro. You
63+# need not follow the terms of the GNU General Public License when using
64+# or distributing such scripts, even though portions of the text of the
65+# Macro appear in them. The GNU General Public License (GPL) does govern
66+# all other use of the material that constitutes the Autoconf Macro.
67+#
68+# This special exception to the GPL applies to versions of the Autoconf
69+# Macro released by the Autoconf Archive. When you make and distribute a
70+# modified version of the Autoconf Macro, you may extend this special
71+# exception to the GPL to apply to your modified version as well.
72+
73+#serial 2
74+
75+AC_DEFUN([AX_APPEND_FLAG],
76+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
77+AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl
78+AS_VAR_SET_IF(FLAGS,
79+ [case " AS_VAR_GET(FLAGS) " in
80+ *" $1 "*)
81+ AC_RUN_LOG([: FLAGS already contains $1])
82+ ;;
83+ *)
84+ AC_RUN_LOG([: FLAGS="$FLAGS $1"])
85+ AS_VAR_SET(FLAGS, ["AS_VAR_GET(FLAGS) $1"])
86+ ;;
87+ esac],
88+ [AS_VAR_SET(FLAGS,["$1"])])
89+AS_VAR_POPDEF([FLAGS])dnl
90+])dnl AX_APPEND_FLAG
91diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
92new file mode 100644
93index 0000000..c3a8d69
94--- /dev/null
95+++ b/m4/ax_check_compile_flag.m4
96@@ -0,0 +1,72 @@
97+# ===========================================================================
98+# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
99+# ===========================================================================
100+#
101+# SYNOPSIS
102+#
103+# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
104+#
105+# DESCRIPTION
106+#
107+# Check whether the given FLAG works with the current language's compiler
108+# or gives an error. (Warnings, however, are ignored)
109+#
110+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
111+# success/failure.
112+#
113+# If EXTRA-FLAGS is defined, it is added to the current language's default
114+# flags (e.g. CFLAGS) when the check is done. The check is thus made with
115+# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
116+# force the compiler to issue an error when a bad flag is given.
117+#
118+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
119+# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
120+#
121+# LICENSE
122+#
123+# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
124+# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
125+#
126+# This program is free software: you can redistribute it and/or modify it
127+# under the terms of the GNU General Public License as published by the
128+# Free Software Foundation, either version 3 of the License, or (at your
129+# option) any later version.
130+#
131+# This program is distributed in the hope that it will be useful, but
132+# WITHOUT ANY WARRANTY; without even the implied warranty of
133+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
134+# Public License for more details.
135+#
136+# You should have received a copy of the GNU General Public License along
137+# with this program. If not, see <http://www.gnu.org/licenses/>.
138+#
139+# As a special exception, the respective Autoconf Macro's copyright owner
140+# gives unlimited permission to copy, distribute and modify the configure
141+# scripts that are the output of Autoconf when processing the Macro. You
142+# need not follow the terms of the GNU General Public License when using
143+# or distributing such scripts, even though portions of the text of the
144+# Macro appear in them. The GNU General Public License (GPL) does govern
145+# all other use of the material that constitutes the Autoconf Macro.
146+#
147+# This special exception to the GPL applies to versions of the Autoconf
148+# Macro released by the Autoconf Archive. When you make and distribute a
149+# modified version of the Autoconf Macro, you may extend this special
150+# exception to the GPL to apply to your modified version as well.
151+
152+#serial 2
153+
154+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
155+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
156+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
157+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
158+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
159+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
160+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
161+ [AS_VAR_SET(CACHEVAR,[yes])],
162+ [AS_VAR_SET(CACHEVAR,[no])])
163+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
164+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
165+ [m4_default([$2], :)],
166+ [m4_default([$3], :)])
167+AS_VAR_POPDEF([CACHEVAR])dnl
168+])dnl AX_CHECK_COMPILE_FLAGS
169--
1701.7.9.5
171
diff --git a/meta/recipes-gnome/libffi/libffi_3.0.10.bb b/meta/recipes-gnome/libffi/libffi_3.0.11.bb
index c06b80cee6..e674fd3c25 100644
--- a/meta/recipes-gnome/libffi/libffi_3.0.10.bb
+++ b/meta/recipes-gnome/libffi/libffi_3.0.11.bb
@@ -7,14 +7,15 @@ library really only provides the lowest, machine dependent layer of a fully feat
7A layer must exist above `libffi' that handles type conversions for values passed between the two languages." 7A layer must exist above `libffi' that handles type conversions for values passed between the two languages."
8 8
9LICENSE = "MIT" 9LICENSE = "MIT"
10LIC_FILES_CHKSUM = "file://LICENSE;md5=0caa055e49a3fb6c57780595e995e2ab" 10LIC_FILES_CHKSUM = "file://LICENSE;md5=e54c573c49435ccbbd3f6dc9e49a065e"
11 11
12PR = "r0" 12PR = "r0"
13 13
14SRC_URI = "ftp://sourceware.org/pub/libffi/${BPN}-${PV}.tar.gz" 14SRC_URI = "ftp://sourceware.org/pub/libffi/${BPN}-${PV}.tar.gz \
15 file://0001-libffi-update-for-3.0.11.patch"
15 16
16SRC_URI[md5sum] = "79390673f5d07a8fb342bc09b5055b6f" 17SRC_URI[md5sum] = "f69b9693227d976835b4857b1ba7d0e3"
17SRC_URI[sha256sum] = "f01eb9027e9eb56aeaeef636649877756d475d714ef8b47f627f65bc5f3b492f" 18SRC_URI[sha256sum] = "70bfb01356360089aa97d3e71e3edf05d195599fd822e922e50d46a0055a6283"
18 19
19EXTRA_OECONF += "--disable-builddir" 20EXTRA_OECONF += "--disable-builddir"
20 21