From ecfe97741fc93dd856e424492d5ade4902671c7f Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 13 Aug 2013 17:57:49 +0800 Subject: dpkg: fix include header caused compile error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Build dpkg-native on Fedora 19, it fails with: /usr/include/c++/4.8.1/cstdlib: In function ‘long long int std::abs(long long int)’: /usr/include/c++/4.8.1/cstdlib:174:20: error: declaration of C function ‘long long int std::abs(long long int)’ conflicts with abs(long long __x) { return __builtin_llabs (__x); } ^ /usr/include/c++/4.8.1/cstdlib:166:3: error: previous declaration ‘long int std::abs(long int)’ here abs(long __i) { return __builtin_labs(__i); } ^ That because header cstdlib is included in a 'extern "C"' block that gcc 4.8 doesn't support. Fix it by move the header file out of the 'extern "C"' block. (From OE-Core master rev: 7de61ecc3efc43c625dde9a66f5c05e980a82e34) (From OE-Core rev: 0e60a468c1a81642d4319c0831dafd2f6fa43d86) Signed-off-by: Kai Kang Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../dpkg/dpkg/fix-abs-redefine.patch | 40 ++++++++++++++++++++++ meta/recipes-devtools/dpkg/dpkg_1.16.9.bb | 4 ++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/dpkg/dpkg/fix-abs-redefine.patch diff --git a/meta/recipes-devtools/dpkg/dpkg/fix-abs-redefine.patch b/meta/recipes-devtools/dpkg/dpkg/fix-abs-redefine.patch new file mode 100644 index 0000000000..e73311c294 --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg/fix-abs-redefine.patch @@ -0,0 +1,40 @@ +Upstream-Status: Pending + +dpkg defines: +#define DPKG_BEGIN_DECLS extern "C" { + +That makes header cstdlib included in a extern "C" block which is not supported +by gcc 4.8. It fails on Fedora 19: + +/usr/include/c++/4.8.1/cstdlib: In function ‘long long int std::abs(long long int)’: +/usr/include/c++/4.8.1/cstdlib:174:20: error: declaration of C function ‘long long int std::abs(long long int)’ conflicts with + abs(long long __x) { return __builtin_llabs (__x); } + ^ +/usr/include/c++/4.8.1/cstdlib:166:3: error: previous declaration ‘long int std::abs(long int)’ here + abs(long __i) { return __builtin_labs(__i); } + ^ + +Move include gettext.h out of the extern "C" block to fix this issue. + +Signed-off-by: Kai Kang + +--- dpkg-1.17.1/lib/dpkg/i18n.h.orig 2013-08-13 17:31:28.870935573 +0800 ++++ dpkg-1.17.1/lib/dpkg/i18n.h 2013-08-13 17:31:37.893065249 +0800 +@@ -23,8 +23,6 @@ + + #include + +-DPKG_BEGIN_DECLS +- + /** + * @defgroup i18n Internationalization support + * @ingroup dpkg-internal +@@ -33,6 +31,8 @@ + + #include + ++DPKG_BEGIN_DECLS ++ + /* We need to include this because pgettext() uses LC_MESSAGES, but libintl.h + * which gets pulled by gettext.h only includes it if building optimized. */ + #include diff --git a/meta/recipes-devtools/dpkg/dpkg_1.16.9.bb b/meta/recipes-devtools/dpkg/dpkg_1.16.9.bb index 9ae4042dae..151fb69497 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.16.9.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.16.9.bb @@ -6,7 +6,9 @@ SRC_URI += "file://noman.patch \ file://check_version.patch \ file://preinst.patch \ file://fix-timestamps.patch \ - file://remove-tar-no-timestamp.patch" + file://remove-tar-no-timestamp.patch \ + file://fix-abs-redefine.patch \ + " SRC_URI[md5sum] = "4df9319b2d17e19cdb6fe94dacee44da" SRC_URI[sha256sum] = "73cd7fba4e54acddd645346b4bc517030b9c35938e82215d3eeb8b4e7af26b7a" -- cgit v1.2.3-54-g00ecf