diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2010-10-09 00:35:01 +0800 |
---|---|---|
committer | Saul Wold <Saul.Wold@intel.com> | 2010-10-08 13:51:29 -0700 |
commit | 0ae7e9e2cbfbc9e1c59e9fcc39f2f1feafc11bcc (patch) | |
tree | 61b040ad38a35fd930ee18329d67350507c4bf93 /meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch | |
parent | c449c78c25eacb17797097377802af291247b8c0 (diff) | |
download | poky-0ae7e9e2cbfbc9e1c59e9fcc39f2f1feafc11bcc.tar.gz |
dpkg: upgrade to version 1.15.8.5
Rebase several patches to fit the latest version
Fix a compile issue related with snprintf.
Reset PR in dpkg.inc
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch')
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch b/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch new file mode 100644 index 0000000000..7673cf1bd7 --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | diff -ruN dpkg-1.15.8.5-orig/m4/dpkg-funcs.m4 dpkg-1.15.8.5/m4/dpkg-funcs.m4 | ||
2 | --- dpkg-1.15.8.5-orig/m4/dpkg-funcs.m4 2010-10-08 12:27:15.082131611 +0800 | ||
3 | +++ dpkg-1.15.8.5/m4/dpkg-funcs.m4 2010-10-08 13:56:50.074284346 +0800 | ||
4 | @@ -27,7 +27,7 @@ | ||
5 | # ----------------------- | ||
6 | # Define HAVE_C99_SNPRINTF if we have C99 snprintf family semantics | ||
7 | AC_DEFUN([DPKG_FUNC_C99_SNPRINTF], | ||
8 | -[AC_CACHE_CHECK([for C99 snprintf functions], [dpkg_cv_c99_snprintf], | ||
9 | +[AC_CACHE_CHECK([for C99 snprintf functions], [ac_cv_func_snprintf_c99], | ||
10 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[ | ||
11 | #include <stdarg.h> | ||
12 | #include <stdio.h> | ||
13 | @@ -58,14 +58,14 @@ | ||
14 | return 0; | ||
15 | } | ||
16 | ]])], | ||
17 | - [dpkg_cv_c99_snprintf=yes], | ||
18 | - [dpkg_cv_c99_snprintf=no], | ||
19 | - [dpkg_cv_c99_snprintf=no])]) | ||
20 | -AS_IF([test "x$dpkg_cv_c99_snprintf" = "xyes"], | ||
21 | + [ac_cv_func_snprintf_c99=yes], | ||
22 | + [ac_cv_func_snprintf_c99=no], | ||
23 | + [ac_cv_func_snprintf_c99=no])]) | ||
24 | +AS_IF([test "x$ac_cv_func_snprintf_c99" = "xyes"], | ||
25 | [AC_DEFINE([HAVE_C99_SNPRINTF], 1, | ||
26 | [Define to 1 if the 'snprintf' family is C99 conformant])], | ||
27 | ) | ||
28 | -AM_CONDITIONAL(HAVE_C99_SNPRINTF, [test "x$dpkg_cv_c99_snprintf" = "xyes"]) | ||
29 | +AM_CONDITIONAL(HAVE_C99_SNPRINTF, [test "x$ac_cv_func_snprintf_c99" = "xyes"]) | ||
30 | ])# DPKG_FUNC_C99_SNPRINTF | ||
31 | |||
32 | # DPKG_MMAP | ||