summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-04-15 19:00:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-21 07:20:25 +0100
commita4111d30e2f46f78ebe6c0ad452a712fc8b080d4 (patch)
treed211b282629e51f21020313202c6149838332929
parent114dd78af941118c98ef2dfc4f4840ca93e8df01 (diff)
downloadpoky-a4111d30e2f46f78ebe6c0ad452a712fc8b080d4.tar.gz
parted: Add patches to fix build on musl
Theese patches are actually generic but expose issues when compiling on musl Change-Id: Ib5312af280d2c399334c5645fbea215737933ae5 (From OE-Core rev: b468afdf13954976a637322cf21d95a0362c32b0) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch29
-rw-r--r--meta/recipes-extended/parted/files/0001-Unset-need_charset_alias-when-building-for-musl.patch33
-rw-r--r--meta/recipes-extended/parted/parted_3.2.bb2
3 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch b/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch
new file mode 100644
index 0000000000..b0376cefcf
--- /dev/null
+++ b/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch
@@ -0,0 +1,29 @@
1From d78dd087c4ec4715aab5fe115668e726046ecd76 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 13 Apr 2015 18:16:05 -0700
4Subject: [PATCH] Include fcntl.h in /platform_defs.h
5
6exposed when compiling using musl
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 libparted/fs/xfs/platform_defs.h | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/libparted/fs/xfs/platform_defs.h b/libparted/fs/xfs/platform_defs.h
16index 2b55752..32bd3d3 100644
17--- a/libparted/fs/xfs/platform_defs.h
18+++ b/libparted/fs/xfs/platform_defs.h
19@@ -42,6 +42,7 @@
20 #include <stdlib.h>
21 #include <string.h>
22 #include <unistd.h>
23+#include <fcntl.h>
24 #include <sys/param.h>
25 #include <sys/types.h>
26
27--
282.1.4
29
diff --git a/meta/recipes-extended/parted/files/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/parted/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
new file mode 100644
index 0000000000..abdfa2a50b
--- /dev/null
+++ b/meta/recipes-extended/parted/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
@@ -0,0 +1,33 @@
1From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 13 Apr 2015 17:02:13 -0700
4Subject: [PATCH] Unset need_charset_alias when building for musl
5
6localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
7which actually shoudl be fixed in gnulib and then all downstream
8projects will get it eventually. For now we apply the fix to
9coreutils
10
11Upstream-Status: Not Required
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 lib/gnulib.mk | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/lib/gnulib.mk b/lib/gnulib.mk
19index e1d74db..c0e92dd 100644
20--- a/lib/gnulib.mk
21+++ b/lib/gnulib.mk
22@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local
23 case '$(host_os)' in \
24 darwin[56]*) \
25 need_charset_alias=true ;; \
26- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
27+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
28 need_charset_alias=false ;; \
29 *) \
30 need_charset_alias=true ;; \
31--
322.1.4
33
diff --git a/meta/recipes-extended/parted/parted_3.2.bb b/meta/recipes-extended/parted/parted_3.2.bb
index e2257696d7..5d34749b01 100644
--- a/meta/recipes-extended/parted/parted_3.2.bb
+++ b/meta/recipes-extended/parted/parted_3.2.bb
@@ -11,6 +11,8 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
11 file://syscalls.patch \ 11 file://syscalls.patch \
12 file://fix-doc-mandir.patch \ 12 file://fix-doc-mandir.patch \
13 file://fix-compile-failure-while-dis.patch \ 13 file://fix-compile-failure-while-dis.patch \
14 file://0001-Include-fcntl.h-in-platform_defs.h.patch \
15 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
14 file://run-ptest \ 16 file://run-ptest \
15 file://Makefile \ 17 file://Makefile \
16" 18"