diff --git a/srcpkgs/elfutils/patches/musl-canonicalize_file_name.patch b/srcpkgs/elfutils/patches/musl-canonicalize_file_name.patch deleted file mode 100644 index ccceb12b1aa..00000000000 --- a/srcpkgs/elfutils/patches/musl-canonicalize_file_name.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- libdwfl/dwfl_build_id_find_elf.c 2015-10-12 12:22:58.000000000 +0200 -+++ libdwfl/dwfl_build_id_find_elf.c 2015-11-20 05:13:10.972994172 +0100 -@@ -94,7 +94,7 @@ - { - if (*file_name != NULL) - free (*file_name); -- *file_name = canonicalize_file_name (name); -+ *file_name = realpath (name, NULL); - if (*file_name == NULL) - { - *file_name = name; ---- libdwfl/find-debuginfo.c 2015-10-12 12:22:58.000000000 +0200 -+++ libdwfl/find-debuginfo.c 2015-11-20 05:18:56.990967176 +0100 -@@ -372,7 +372,7 @@ - /* If FILE_NAME is a symlink, the debug file might be associated - with the symlink target name instead. */ - -- char *canon = canonicalize_file_name (file_name); -+ char *canon = realpath (file_name, NULL); - if (canon != NULL && strcmp (file_name, canon)) - fd = find_debuginfo_in_path (mod, canon, - debuglink_file, debuglink_crc, diff --git a/srcpkgs/elfutils/patches/musl-qsort_r.patch b/srcpkgs/elfutils/patches/musl-qsort_r.patch index 0f3102dd905..10697d6023a 100644 --- a/srcpkgs/elfutils/patches/musl-qsort_r.patch +++ b/srcpkgs/elfutils/patches/musl-qsort_r.patch @@ -1,7 +1,7 @@ ---- src/readelf.c 2015-10-12 12:22:58.000000000 +0200 -+++ src/readelf.c 2015-11-20 08:11:32.945159213 +0100 -@@ -4366,10 +4366,11 @@ - return base; +--- src/readelf.c ++++ src/readelf.c +@@ -4773,10 +4773,11 @@ listptr_base (struct listptr *p) + return cudie_base (&cu); } +static const char *listptr_name; @@ -14,7 +14,7 @@ struct listptr *p1 = (void *) a; struct listptr *p2 = (void *) b; -@@ -4385,21 +4386,21 @@ +@@ -4792,21 +4793,21 @@ compare_listptr (const void *a, const void *b, void *arg) p1->warned = p2->warned = true; error (0, 0, gettext ("%s %#" PRIx64 " used with different address sizes"), @@ -37,9 +37,18 @@ - name, (uint64_t) p1->offset); + listptr_name, (uint64_t) p1->offset); } + if (p1->attr != p2 ->attr) + { +@@ -4814,7 +4815,7 @@ compare_listptr (const void *a, const void *b, void *arg) + error (0, 0, + gettext ("%s %#" PRIx64 + " used with different attribute %s and %s"), +- name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr), ++ listptr_name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr), + dwarf_attr_name (p2->attr)); + } } - -@@ -4464,9 +4465,11 @@ +@@ -4885,9 +4886,11 @@ notice_listptr (enum section_e section, struct listptr_table *table, static void sort_listptr (struct listptr_table *table, const char *name) { diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template index e48c0950b92..3f4c6e84ebb 100644 --- a/srcpkgs/elfutils/template +++ b/srcpkgs/elfutils/template @@ -1,7 +1,7 @@ # Template file for 'elfutils' pkgname=elfutils -version=0.170 -revision=2 +version=0.172 +revision=1 build_style=gnu-configure configure_args="--program-prefix=eu-" hostmakedepends="automake libtool" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-3.0-or-later" homepage="https://sourceware.org/elfutils/" distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2" -checksum=1f844775576b79bdc9f9c717a50058d08620323c1e935458223a12f249c9e066 +checksum=779c99e6344c4982bbab60b8d276cec3d468151c758905f9a44ba6b6edaa0e24 CFLAGS="-Wno-error"