diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
| commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
| tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-core/fts/fts/remove_cdefs.patch | |
| parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
| download | blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip | |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-core/fts/fts/remove_cdefs.patch')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-core/fts/fts/remove_cdefs.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-core/fts/fts/remove_cdefs.patch b/import-layers/yocto-poky/meta/recipes-core/fts/fts/remove_cdefs.patch new file mode 100644 index 000000000..c152704d4 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-core/fts/fts/remove_cdefs.patch @@ -0,0 +1,69 @@ +Replace use of macros from sys/cdefs.h since cdefs.h is missing on musl + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Inappropriate + +Index: fts/fts.h +=================================================================== +--- fts.orig/fts.h ++++ fts/fts.h +@@ -126,15 +126,21 @@ typedef struct _ftsent { + char fts_name[1]; /* file name */ + } FTSENT; + +-#include <sys/cdefs.h> ++#ifdef __cplusplus ++extern "C" { ++#endif + +-__BEGIN_DECLS +-FTSENT *fts_children __P((FTS *, int)); +-int fts_close __P((FTS *)); +-FTS *fts_open __P((char * const *, int, +- int (*)(const FTSENT **, const FTSENT **))); +-FTSENT *fts_read __P((FTS *)); +-int fts_set __P((FTS *, FTSENT *, int)); +-__END_DECLS ++#ifndef __P ++#define __P ++#endif ++FTSENT *fts_children (FTS *p, int opts); ++int fts_close (FTS *p); ++FTS *fts_open (char * const * path, int opts, ++ int (*compfn)(const FTSENT **, const FTSENT **)); ++FTSENT *fts_read (FTS *p); ++int fts_set (FTS *p, FTSENT *f, int opts); + ++#ifdef __cplusplus ++} ++#endif + #endif /* !_FTS_H_ */ +Index: fts/fts.c +=================================================================== +--- fts.orig/fts.c ++++ fts/fts.c +@@ -50,15 +50,15 @@ static char sccsid[] = "@(#)fts.c 8.6 (B + #include <string.h> + #include <unistd.h> + +-static FTSENT *fts_alloc __P((FTS *, char *, int)); +-static FTSENT *fts_build __P((FTS *, int)); +-static void fts_lfree __P((FTSENT *)); +-static void fts_load __P((FTS *, FTSENT *)); +-static size_t fts_maxarglen __P((char * const *)); +-static void fts_padjust __P((FTS *, void *)); +-static int fts_palloc __P((FTS *, size_t)); +-static FTSENT *fts_sort __P((FTS *, FTSENT *, int)); +-static u_short fts_stat __P((FTS *, struct dirent *, FTSENT *, int)); ++static FTSENT *fts_alloc __P(FTS *, char *, int); ++static FTSENT *fts_build __P(FTS *, int); ++static void fts_lfree __P(FTSENT *); ++static void fts_load __P(FTS *, FTSENT *); ++static size_t fts_maxarglen __P(char * const *); ++static void fts_padjust __P(FTS *, void *); ++static int fts_palloc __P(FTS *, size_t); ++static FTSENT *fts_sort __P(FTS *, FTSENT *, int); ++static u_short fts_stat __P(FTS *, struct dirent *, FTSENT *, int); + + #define ISDOT(a) (a[0] == '.' && (!a[1] || a[1] == '.' && !a[2])) + |
