From c94d444c79b5389dc28c6e3f2ef8c2ef2ee6f830 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 15 Apr 2015 19:00:21 -0700 Subject: dosfstools: Fix build with musl We need to pass _GNU_SOURCE and include fcntl.h Change-Id: Ice0597ddac3b275400880d85793ece4b300bec9b (From OE-Core rev: 022a96c7a396bd6bbf499984f4ea8639111fe3b7) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...ude-fcntl.h-for-getting-loff_t-definition.patch | 41 ++++++++++++++++++++++ .../recipes-devtools/dosfstools/dosfstools_2.11.bb | 5 ++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/dosfstools/dosfstools/0001-Include-fcntl.h-for-getting-loff_t-definition.patch (limited to 'meta/recipes-devtools/dosfstools') diff --git a/meta/recipes-devtools/dosfstools/dosfstools/0001-Include-fcntl.h-for-getting-loff_t-definition.patch b/meta/recipes-devtools/dosfstools/dosfstools/0001-Include-fcntl.h-for-getting-loff_t-definition.patch new file mode 100644 index 0000000000..06f5b7a960 --- /dev/null +++ b/meta/recipes-devtools/dosfstools/dosfstools/0001-Include-fcntl.h-for-getting-loff_t-definition.patch @@ -0,0 +1,41 @@ +From b7c42c6a9829bea911b22201edd7df2a9bec1a14 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 13 Apr 2015 17:52:34 -0700 +Subject: [PATCH] Include fcntl.h for getting loff_t definition + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + dosfsck/dosfsck.h | 2 ++ + dosfsck/lfn.c | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/dosfsck/dosfsck.h b/dosfsck/dosfsck.h +index d9314b1..2076d5f 100644 +--- a/dosfsck/dosfsck.h ++++ b/dosfsck/dosfsck.h +@@ -50,6 +50,8 @@ + #define CT_LE_L(v) (v) + #endif /* __BIG_ENDIAN */ + ++#include ++ + #define VFAT_LN_ATTR (ATTR_RO | ATTR_HIDDEN | ATTR_SYS | ATTR_VOLUME) + + /* ++roman: Use own definition of boot sector structure -- the kernel headers' +diff --git a/dosfsck/lfn.c b/dosfsck/lfn.c +index 9b2cfc3..bb04fda 100644 +--- a/dosfsck/lfn.c ++++ b/dosfsck/lfn.c +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + + #include "common.h" + #include "io.h" +-- +2.1.4 + diff --git a/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb b/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb index d1c24b8748..beec488c09 100644 --- a/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb +++ b/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb @@ -17,7 +17,9 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.src.tar.gz/407d4 file://dosfstools-msdos_fs-types.patch \ file://include-linux-types.patch \ file://nofat32_autoselect.patch \ - file://fix_populated_dosfs_creation.patch " + file://fix_populated_dosfs_creation.patch \ + file://0001-Include-fcntl.h-for-getting-loff_t-definition.patch \ + " SRC_URI[md5sum] = "407d405ade410f7597d364ab5dc8c9f6" SRC_URI[sha256sum] = "0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484" @@ -26,6 +28,7 @@ SRC_URI[sha256sum] = "0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c # add this in here to for sure allow for big files. # CFLAGS_append = " -D_FILE_OFFSET_BITS=64" +CFLAGS_append_libc-musl = " -D_GNU_SOURCE" do_install () { oe_runmake "PREFIX=${D}" "SBINDIR=${D}${base_sbindir}" \ -- cgit v1.2.3-54-g00ecf