From 0ae7e9e2cbfbc9e1c59e9fcc39f2f1feafc11bcc Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Sat, 9 Oct 2010 00:35:01 +0800 Subject: 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 Signed-off-by: Saul Wold --- .../dpkg/dpkg/check_snprintf.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch (limited to 'meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch') 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 0000000..7673cf1 --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch @@ -0,0 +1,32 @@ +diff -ruN dpkg-1.15.8.5-orig/m4/dpkg-funcs.m4 dpkg-1.15.8.5/m4/dpkg-funcs.m4 +--- dpkg-1.15.8.5-orig/m4/dpkg-funcs.m4 2010-10-08 12:27:15.082131611 +0800 ++++ dpkg-1.15.8.5/m4/dpkg-funcs.m4 2010-10-08 13:56:50.074284346 +0800 +@@ -27,7 +27,7 @@ + # ----------------------- + # Define HAVE_C99_SNPRINTF if we have C99 snprintf family semantics + AC_DEFUN([DPKG_FUNC_C99_SNPRINTF], +-[AC_CACHE_CHECK([for C99 snprintf functions], [dpkg_cv_c99_snprintf], ++[AC_CACHE_CHECK([for C99 snprintf functions], [ac_cv_func_snprintf_c99], + [AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + #include +@@ -58,14 +58,14 @@ + return 0; + } + ]])], +- [dpkg_cv_c99_snprintf=yes], +- [dpkg_cv_c99_snprintf=no], +- [dpkg_cv_c99_snprintf=no])]) +-AS_IF([test "x$dpkg_cv_c99_snprintf" = "xyes"], ++ [ac_cv_func_snprintf_c99=yes], ++ [ac_cv_func_snprintf_c99=no], ++ [ac_cv_func_snprintf_c99=no])]) ++AS_IF([test "x$ac_cv_func_snprintf_c99" = "xyes"], + [AC_DEFINE([HAVE_C99_SNPRINTF], 1, + [Define to 1 if the 'snprintf' family is C99 conformant])], + ) +-AM_CONDITIONAL(HAVE_C99_SNPRINTF, [test "x$dpkg_cv_c99_snprintf" = "xyes"]) ++AM_CONDITIONAL(HAVE_C99_SNPRINTF, [test "x$ac_cv_func_snprintf_c99" = "xyes"]) + ])# DPKG_FUNC_C99_SNPRINTF + + # DPKG_MMAP -- cgit v1.1