xfsprogs: Remove .la files in ${libdir}

Delete .la files and remove ${libdir} if empty
Fix build with musl

Use --ignore-fail-on-non-empty with rmdir

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2017-06-19 23:47:00 -07:00
committed by Martin Jansa
parent 67a13d6e92
commit 11d98126c9
2 changed files with 62 additions and 1 deletions
@@ -0,0 +1,58 @@
From 2b4714123cdecb558babb76074d0ab945bf5b177 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 16 Jun 2017 18:59:10 -0700
Subject: [PATCH] define __ prefixed version of intXY_t types
This is required since musl does not define them
unlike glibc
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
include/linux.h | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/include/linux.h b/include/linux.h
index 6a676ca..6976d83 100644
--- a/include/linux.h
+++ b/include/linux.h
@@ -40,6 +40,35 @@
# undef fsxattr
#endif
+#ifndef loff_t
+#define loff_t off_t
+#endif
+#ifndef __uint8_t
+#define __uint8_t uint8_t
+#endif
+#ifndef __uint16_t
+#define __uint16_t uint16_t
+#endif
+#ifndef __uint32_t
+#define __uint32_t uint32_t
+#endif
+#ifndef __uint64_t
+#define __uint64_t uint64_t
+#endif
+
+#ifndef __int8_t
+#define __int8_t int8_t
+#endif
+#ifndef __int16_t
+#define __int16_t int16_t
+#endif
+#ifndef __int32_t
+#define __int32_t int32_t
+#endif
+#ifndef __int64_t
+#define __int64_t int64_t
+#endif
+
static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
{
return ioctl(fd, cmd, p);
--
2.13.1
@@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=102f7fec3d53c7c8f0b7baf9bf9d76a8"
DEPENDS = "util-linux util-linux-native"
SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \
file://link_needed_libs.patch \
"
file://0001-define-__-prefixed-version-of-intXY_t-types.patch \
"
SRC_URI[md5sum] = "ddbb04493addf014db07a7e2b96b2804"
SRC_URI[sha256sum] = "d8cb9ab2c686699d37914354ce3992b4aff3677093cbce06ad18bf798da8a8a7"
@@ -54,4 +55,6 @@ do_configure_prepend () {
do_install_append() {
oe_runmake 'DESTDIR=${D}' install install-dev
rm ${D}${libdir}/*.la
rmdir --ignore-fail-on-non-empty ${D}${libdir}
}