EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elfutils: Fix compile with uClibc-ng

Browse Source 
Probably glibc too. argp_help takes a char *. not const char *.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
[updated with upstream version of the patch]
This commit is contained in:
Rosen Penev 2019-05-01 10:05:20 -07:00 committed by Petr Štetiar
parent b18d1d5d3f
commit 4760541027
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/libs/elfutils/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=elfutils
PKG_VERSION:=0.176
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://sourceware.org/$(PKG_NAME)/ftp/$(PKG_VERSION)

38
package/libs/elfutils/patches/200-uclibc-ng-compat.patch Normal file
View File

@ -0,0 +1,38 @@
From: Rosen Penev <rosenp@gmail.com>
Date: Fri, 3 May 2019 17:59:55 +0000 (-0700)
Subject: lib/color: Fix compilation with uClibc
X-Git-Url: https://sourceware.org/git/?p=elfutils.git;a=commitdiff_plain;h=b5e8a481d4c9f9cdb26513784c09c57797fa2f46;hp=4628b0ea03a0d029cccbcda1cbfc450b4c5ad1bf
lib/color: Fix compilation with uClibc
elfutils passed -Werror and this call errors on uClibc with a mismatching
pointer type. Cast to char * to fix.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 0914b2c..7381860 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-03 Rosen Penev <rosenp@gmail.com>
+
+ * color.c (parse_opt): Cast program_invocation_short_name to char *.
+
2018-11-04 Mark Wielaard <mark@klomp.org>
* bpf.h: Add BPF_JLT, BPF_JLE, BPF_JSLT and BPF_JSLE.
diff --git a/lib/color.c b/lib/color.c
index 9ffbf55..20b9698 100644
--- a/lib/color.c
+++ b/lib/color.c
@@ -132,7 +132,7 @@ valid arguments are:\n\
- 'auto', 'tty', 'if-tty'\n"),
program_invocation_short_name, arg);
argp_help (&color_argp, stderr, ARGP_HELP_SEE,
- program_invocation_short_name);
+ (char *) program_invocation_short_name);
exit (EXIT_FAILURE);
}
}