From fd490689fa383f2cb29bcc084e19dc88b6848246 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Mar 2017 23:13:47 -0800 Subject: ltrace: Fix build with aarch64 and bump to latest Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- .../ltrace/ltrace/0001-Use-correct-enum-type.patch | 28 ++++++++ .../ltrace/0002-Fix-const-qualifier-error.patch | 76 ++++++++++++++++++++++ meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 6 +- 3 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch create mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch (limited to 'meta-oe/recipes-devtools/ltrace') diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch new file mode 100644 index 0000000000..01a35842c8 --- /dev/null +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch @@ -0,0 +1,28 @@ +From df490528d1e81a98ba2991c700c92a8e6c969083 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 6 Mar 2017 21:32:22 -0800 +Subject: [PATCH 1/2] Use correct enum type + +Clang warns about wrong enum initializtion + +Signed-off-by: Khem Raj +--- + sysdeps/linux-gnu/aarch64/fetch.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysdeps/linux-gnu/aarch64/fetch.c b/sysdeps/linux-gnu/aarch64/fetch.c +index 2744df0..1dcf7cc 100644 +--- a/sysdeps/linux-gnu/aarch64/fetch.c ++++ b/sysdeps/linux-gnu/aarch64/fetch.c +@@ -173,7 +173,7 @@ static struct fetch_script + pass_arg(struct fetch_context const *context, + struct process *proc, struct arg_type_info *info) + { +- enum fetch_method cvt = CVT_NOP; ++ enum convert_method cvt = CVT_NOP; + + size_t sz = type_sizeof(proc, info); + if (sz == (size_t) -1) +-- +2.12.0 + diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch new file mode 100644 index 0000000000..c152771923 --- /dev/null +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch @@ -0,0 +1,76 @@ +From 4d3ec1a514f9b1df8ce3a1b04c8a2823d977377f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 6 Mar 2017 21:34:01 -0800 +Subject: [PATCH 2/2] Fix const qualifier error + +Fixes clang warning +error: duplicate 'const' declaration specifier [-Werror,-Wduplicate-decl-specifier] + +Signed-off-by: Khem Raj +--- + dict.h | 2 +- + library.c | 2 +- + vect.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +Index: git/dict.h +=================================================================== +--- git.orig/dict.h ++++ git/dict.h +@@ -90,7 +90,7 @@ int dict_clone(struct dict *target, cons + assert(_source_d->values.elt_size == sizeof(VALUE_TYPE)); \ + /* Check that callbacks are typed properly. */ \ + void (*_key_dtor_cb)(KEY_TYPE *, void *) = DTOR_KEY; \ +- int (*_key_clone_cb)(KEY_TYPE *, const KEY_TYPE *, \ ++ int (*_key_clone_cb)(KEY_TYPE *, KEY_TYPE *, \ + void *) = CLONE_KEY; \ + void (*_value_dtor_cb)(VALUE_TYPE *, void *) = DTOR_VALUE; \ + int (*_value_clone_cb)(VALUE_TYPE *, const VALUE_TYPE *, \ +Index: git/library.c +=================================================================== +--- git.orig/library.c ++++ git/library.c +@@ -353,7 +353,7 @@ static void + library_exported_names_init(struct library_exported_names *names) + { + DICT_INIT(&names->names, +- const char*, uint64_t, ++ char*, uint64_t, + dict_hash_string, dict_eq_string, NULL); + DICT_INIT(&names->addrs, + uint64_t, struct vect*, +Index: git/vect.h +=================================================================== +--- git.orig/vect.h ++++ git/vect.h +@@ -66,7 +66,7 @@ int vect_clone(struct vect *target, cons + assert(_source_vec->elt_size == sizeof(ELT_TYPE)); \ + /* Check that callbacks are typed properly. */ \ + void (*_dtor_callback)(ELT_TYPE *, void *) = DTOR; \ +- int (*_clone_callback)(ELT_TYPE *, const ELT_TYPE *, \ ++ int (*_clone_callback)(ELT_TYPE *, ELT_TYPE *, \ + void *) = CLONE; \ + vect_clone((TGT_VEC), _source_vec, \ + (int (*)(void *, const void *, \ +Index: git/value_dict.c +=================================================================== +--- git.orig/value_dict.c ++++ git/value_dict.c +@@ -40,7 +40,7 @@ val_dict_init(struct value_dict *dict) + } + + static int +-value_clone_cb(struct value *tgt, const struct value *src, void *data) ++value_clone_cb(struct value *tgt, struct value *src, void *data) + { + return value_clone(tgt, src); + } +@@ -53,7 +53,7 @@ value_dtor(struct value *val, void *data + + static int + named_value_clone(struct named_value *tgt, +- const struct named_value *src, void *data) ++ struct named_value *src, void *data) + { + tgt->name = strdup(src->name); + if (tgt->name == NULL) diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 8f4e5b1e6e..a5960f5b0c 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -10,14 +10,16 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" PE = "1" -PV = "7.3+git${SRCPV}" -SRCREV = "01b10e191e99d8cb147e5a2b7da8196e0ec6fb94" +PV = "7.91+git${SRCPV}" +SRCREV = "c22d359433b333937ee3d803450dc41998115685" DEPENDS = "elfutils" RDEPENDS_${PN} = "elfutils" SRC_URI = "git://anonscm.debian.org/collab-maint/ltrace.git;branch=master \ file://configure-allow-to-disable-selinux-support.patch \ file://0001-replace-readdir_r-with-readdir.patch \ + file://0001-Use-correct-enum-type.patch \ + file://0002-Fix-const-qualifier-error.patch \ " S = "${WORKDIR}/git" -- cgit 1.2.3-korg