From 9ee63edfd9c6e5c22ce707770955a5796cde2cfc Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 5 Aug 2014 12:54:03 +0200 Subject: ltrace: add PV and PACKAGECONFIG for libunwind Signed-off-by: Martin Jansa --- .../ltrace-git/ltrace-0.7.2-unused-typedef.patch | 49 ---------------------- .../ltrace/ltrace-0.7.2-unused-typedef.patch | 49 ++++++++++++++++++++++ meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 4 ++ 3 files changed, 53 insertions(+), 49 deletions(-) delete mode 100644 meta-oe/recipes-devtools/ltrace/ltrace-git/ltrace-0.7.2-unused-typedef.patch create mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/ltrace-0.7.2-unused-typedef.patch diff --git a/meta-oe/recipes-devtools/ltrace/ltrace-git/ltrace-0.7.2-unused-typedef.patch b/meta-oe/recipes-devtools/ltrace/ltrace-git/ltrace-0.7.2-unused-typedef.patch deleted file mode 100644 index 8f3c0ecea1..0000000000 --- a/meta-oe/recipes-devtools/ltrace/ltrace-git/ltrace-0.7.2-unused-typedef.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/value.c b/value.c -index d18db17..b98298e 100644 ---- a/value.c -+++ b/value.c -@@ -1,6 +1,6 @@ - /* - * This file is part of ltrace. -- * Copyright (C) 2011,2012 Petr Machata, Red Hat Inc. -+ * Copyright (C) 2011,2012,2013 Petr Machata, Red Hat Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as -@@ -282,9 +282,9 @@ value_init_deref(struct value *ret_val, struct value *valp) - if (value_extract_word(valp, &l, NULL) < 0) - return -1; - -- /* We need "long" to be long enough to hold platform -+ /* We need "long" to be long enough to hold target - * pointers. */ -- typedef char assert__long_enough_long[-(sizeof(l) < sizeof(void *))]; -+ assert(sizeof(l) >= sizeof(arch_addr_t)); - - value_common_init(ret_val, valp->inferior, valp, - valp->type->u.ptr_info.info, 0); -diff --git a/lens_default.c b/lens_default.c -index ed3d0e1..5d00814 100644 ---- a/lens_default.c -+++ b/lens_default.c -@@ -1,6 +1,6 @@ - /* - * This file is part of ltrace. -- * Copyright (C) 2011,2012 Petr Machata, Red Hat Inc. -+ * Copyright (C) 2011,2012,2013 Petr Machata, Red Hat Inc. - * Copyright (C) 1998,2004,2007,2008,2009 Juan Cespedes - * Copyright (C) 2006 Ian Wienand - * Copyright (C) 2006 Steve Fink -@@ -342,9 +342,9 @@ format_array(FILE *stream, struct value *value, struct value_dict *arguments, - struct expr_node *length, size_t maxlen, int before, - const char *open, const char *close, const char *delim) - { -- /* We need "long" to be long enough to cover the whole address -- * space. */ -- typedef char assert__long_enough_long[-(sizeof(long) < sizeof(void *))]; -+ /* We need "long" to be long enough to cover the whole target -+ * address space. */ -+ assert(sizeof(long) >= sizeof(arch_addr_t)); - long l; - if (expr_eval_word(length, value, arguments, &l) < 0) - return -1; diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/ltrace-0.7.2-unused-typedef.patch b/meta-oe/recipes-devtools/ltrace/ltrace/ltrace-0.7.2-unused-typedef.patch new file mode 100644 index 0000000000..8f3c0ecea1 --- /dev/null +++ b/meta-oe/recipes-devtools/ltrace/ltrace/ltrace-0.7.2-unused-typedef.patch @@ -0,0 +1,49 @@ +diff --git a/value.c b/value.c +index d18db17..b98298e 100644 +--- a/value.c ++++ b/value.c +@@ -1,6 +1,6 @@ + /* + * This file is part of ltrace. +- * Copyright (C) 2011,2012 Petr Machata, Red Hat Inc. ++ * Copyright (C) 2011,2012,2013 Petr Machata, Red Hat Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as +@@ -282,9 +282,9 @@ value_init_deref(struct value *ret_val, struct value *valp) + if (value_extract_word(valp, &l, NULL) < 0) + return -1; + +- /* We need "long" to be long enough to hold platform ++ /* We need "long" to be long enough to hold target + * pointers. */ +- typedef char assert__long_enough_long[-(sizeof(l) < sizeof(void *))]; ++ assert(sizeof(l) >= sizeof(arch_addr_t)); + + value_common_init(ret_val, valp->inferior, valp, + valp->type->u.ptr_info.info, 0); +diff --git a/lens_default.c b/lens_default.c +index ed3d0e1..5d00814 100644 +--- a/lens_default.c ++++ b/lens_default.c +@@ -1,6 +1,6 @@ + /* + * This file is part of ltrace. +- * Copyright (C) 2011,2012 Petr Machata, Red Hat Inc. ++ * Copyright (C) 2011,2012,2013 Petr Machata, Red Hat Inc. + * Copyright (C) 1998,2004,2007,2008,2009 Juan Cespedes + * Copyright (C) 2006 Ian Wienand + * Copyright (C) 2006 Steve Fink +@@ -342,9 +342,9 @@ format_array(FILE *stream, struct value *value, struct value_dict *arguments, + struct expr_node *length, size_t maxlen, int before, + const char *open, const char *close, const char *delim) + { +- /* We need "long" to be long enough to cover the whole address +- * space. */ +- typedef char assert__long_enough_long[-(sizeof(long) < sizeof(void *))]; ++ /* We need "long" to be long enough to cover the whole target ++ * address space. */ ++ assert(sizeof(long) >= sizeof(arch_addr_t)); + long l; + if (expr_eval_word(length, value, arguments, &l) < 0) + return -1; diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 149af52dc0..6476f97072 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -9,6 +9,8 @@ HOMEPAGE = "http://ltrace.org/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" +PE = "1" +PV = "7.2+git${SRCPV}" SRCREV = "f44b28421979cec88d6d6a778fc27a8cd514f508" DEPENDS = "elfutils" @@ -20,6 +22,8 @@ S = "${WORKDIR}/git" inherit autotools +PACKAGECONFIG[unwind] = "--with-libunwind,--without-libunwind,libunwind" + do_configure_prepend () { ./autogen.sh } -- cgit 1.2.3-korg