From 7cdfcc4bc9d872f72021f4eec174577b0fa8f7ad Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 18 Aug 2018 17:50:11 +0200 Subject: [PATCH] - strace: bump version to 4.21 --- ...-potential-program_invocation_name-t.patch | 44 ------------------- make/archives.mk | 2 +- make/devel-tools.mk | 1 - 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 archive-patches/strace-error_prints-fix-potential-program_invocation_name-t.patch diff --git a/archive-patches/strace-error_prints-fix-potential-program_invocation_name-t.patch b/archive-patches/strace-error_prints-fix-potential-program_invocation_name-t.patch deleted file mode 100644 index d03fb61e..00000000 --- a/archive-patches/strace-error_prints-fix-potential-program_invocation_name-t.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d45f27147f7d95eb209463dc03dc039ea3f15b59 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Baruch Siach -Date: Fri, 8 Sep 2017 12:12:57 +0300 -Subject: [PATCH] error_prints: fix potential program_invocation_name type - conflict -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -uClibc-ng declares program_invocation_name as const. -This causes the build failure below: - -error_prints.c:40:14: error: conflicting types for ‘program_invocation_name’ - extern char *program_invocation_name; - ^~~~~~~~~~~~~~~~~~~~~~~ -In file included from error_prints.c:32:0: -.../output/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/errno.h:54:20: note: previous declaration of ‘program_invocation_name’ was here - extern const char *program_invocation_name, *program_invocation_short_name; - ^~~~~~~~~~~~~~~~~~~~~~~ - -* error_prints.c (program_invocation_name): Declare only in case -of [!HAVE_PROGRAM_INVOCATION_NAME]. ---- - error_prints.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/error_prints.c b/error_prints.c -index 8519b924..710e99b0 100644 ---- a/error_prints.c -+++ b/error_prints.c -@@ -37,7 +37,9 @@ - - #include "error_prints.h" - -+#ifndef HAVE_PROGRAM_INVOCATION_NAME - extern char *program_invocation_name; -+#endif - - static void - verror_msg(int err_no, const char *fmt, va_list p) --- -2.15.0.rc2 - diff --git a/make/archives.mk b/make/archives.mk index 6c65f960..2c78f21e 100644 --- a/make/archives.mk +++ b/make/archives.mk @@ -36,7 +36,7 @@ LIBTIRPC_VER=1.0.2 $(ARCHIVE)/libtirpc-$(LIBTIRPC_VER).tar.bz2: $(WGET) http://sourceforge.net/projects/libtirpc/files/libtirpc/$(LIBTIRPC_VER)/libtirpc-$(LIBTIRPC_VER).tar.bz2 -STRACE_VER=4.19 +STRACE_VER=4.21 $(ARCHIVE)/strace-$(STRACE_VER).tar.xz: $(WGET) http://sourceforge.net/projects/strace/files/strace/$(STRACE_VER)/strace-$(STRACE_VER).tar.xz diff --git a/make/devel-tools.mk b/make/devel-tools.mk index dfbb6b57..b0812da9 100644 --- a/make/devel-tools.mk +++ b/make/devel-tools.mk @@ -46,7 +46,6 @@ $(D)/valgrind-hd1: $(D)/strace: $(ARCHIVE)/strace-$(STRACE_VER).tar.xz | $(TARGET_DIR) $(UNTAR)/strace-$(STRACE_VER).tar.xz cd $(BUILD_TMP)/strace-$(STRACE_VER) && \ - $(PATCH)/strace-error_prints-fix-potential-program_invocation_name-t.patch && \ $(CONFIGURE) \ --prefix= \ --mandir=$(BUILD_TMP)/.remove \