mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-11 04:49:58 +00:00
sharutils: Upgrade to 4.15.2
Fix format error warnings with clang Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -1,29 +0,0 @@
|
|||||||
From 990234af84a5399017d1c4fe03c5c756a8e51e23 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hongjun Yang <Hongjun.Yang@windriver.com>
|
|
||||||
Date: Tue, 20 Aug 2013 09:41:43 +0800
|
|
||||||
Subject: [PATCH] fix cross compiling issue
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Hongjun.Yang <hongjun.yang@windriver.com>
|
|
||||||
|
|
||||||
---
|
|
||||||
configure | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/configure b/configure
|
|
||||||
index 6ee98e0..8067f54 100755
|
|
||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -26965,7 +26965,7 @@ fi
|
|
||||||
if test "$cross_compiling" = yes; then :
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
||||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
||||||
-as_fn_error $? "cannot run test program while cross compiling
|
|
||||||
+$as_echo "cannot run test program while cross compiling
|
|
||||||
See \`config.log' for more details" "$LINENO" 5; }
|
|
||||||
else
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
--
|
|
||||||
1.8.1.4
|
|
||||||
|
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
From fa8371d348f6a8b0799b2e6c38247dd1399d85e3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Sat, 8 Apr 2017 08:49:48 -0700
|
||||||
|
Subject: [PATCH] Fix build with clang
|
||||||
|
|
||||||
|
ATTRIBUTE_FORMAT_ARG macro gets computed to be empty with clang
|
||||||
|
whereas it does support format attribute, we hard code it
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
src/shar-opts.h | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/shar-opts.h b/src/shar-opts.h
|
||||||
|
index a287046..172676f 100644
|
||||||
|
--- a/src/shar-opts.h
|
||||||
|
+++ b/src/shar-opts.h
|
||||||
|
@@ -377,7 +377,7 @@ extern tOptions sharOptions;
|
||||||
|
# define ATTRIBUTE_FORMAT_ARG(_a)
|
||||||
|
# endif
|
||||||
|
|
||||||
|
-static inline char* aoGetsText(char const* pz) ATTRIBUTE_FORMAT_ARG(1);
|
||||||
|
+static inline char* aoGetsText(char const* pz) __attribute__ ((format_arg(1)));
|
||||||
|
static inline char* aoGetsText(char const* pz) {
|
||||||
|
if (pz == NULL) return NULL;
|
||||||
|
return (char*)gettext(pz);
|
||||||
|
--
|
||||||
|
2.12.2
|
||||||
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
SUMMARY = "This is the set of GNU shar utilities."
|
|
||||||
HOMEPAGE = "http://www.gnu.org/software/sharutils/"
|
|
||||||
SECTION = "console/utils"
|
|
||||||
LICENSE="GPLv3+"
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
|
||||||
|
|
||||||
inherit gettext autotools-brokensep
|
|
||||||
|
|
||||||
SRC_URI = "ftp://ftp.gnu.org/gnu/sharutils/sharutils-4.14.tar.gz \
|
|
||||||
file://fix-for-cross-compiling.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
SRC_URI[md5sum] = "5686c11131b4c4c0841f8f3ef34d136a"
|
|
||||||
SRC_URI[sha256sum] = "90f5107c167cfd1b299bb211828d2586471087863dbed698f53109cd5f717208"
|
|
||||||
|
|
||||||
do_configure () {
|
|
||||||
oe_runconf
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
SUMMARY = "This is the set of GNU shar utilities."
|
||||||
|
HOMEPAGE = "http://www.gnu.org/software/sharutils/"
|
||||||
|
SECTION = "console/utils"
|
||||||
|
LICENSE="GPLv3+"
|
||||||
|
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||||
|
|
||||||
|
inherit gettext autotools
|
||||||
|
|
||||||
|
SRC_URI = "ftp://ftp.gnu.org/gnu/${BPN}/${BP}.tar.gz \
|
||||||
|
file://0001-Fix-build-with-clang.patch \
|
||||||
|
"
|
||||||
|
SRC_URI[md5sum] = "32a51b23e25ad5e6af4b89f228be1800"
|
||||||
|
SRC_URI[sha256sum] = "ee336e68549664e7a19b117adf02edfdeac6307f22e5ba78baca457116914637"
|
||||||
|
|
||||||
|
do_install_append() {
|
||||||
|
if [ -e ${D}${libdir}/charset.alias ]
|
||||||
|
then
|
||||||
|
rm -rf ${D}${libdir}/charset.alias
|
||||||
|
rmdir --ignore-fail-on-non-empty ${D}${libdir}
|
||||||
|
fi
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user