diff options
| author | Khem Raj <raj.khem@gmail.com> | 2014-05-29 00:01:01 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-01 14:29:29 +0100 |
| commit | 56d4f91fe24a3dfa791b5c62a4103a182f500495 (patch) | |
| tree | 5c8f1f00837d775cfdb28d96778e5259cf9bb76f | |
| parent | 5d14f3c03a628f72fca05bb8e0434a91cdf50e94 (diff) | |
| download | poky-56d4f91fe24a3dfa791b5c62a4103a182f500495.tar.gz | |
siteinfo, insane: Recognize musl specific triplets
We will use '-musl' to identify musl based systems
this patch lays the foundation for recognising those
and map them to internal variable representations
(From OE-Core rev: 9cd77aed67373e33dc69158ab02b94d7045c1119)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/insane.bbclass | 21 | ||||
| -rw-r--r-- | meta/classes/siteinfo.bbclass | 13 | ||||
| -rw-r--r-- | meta/site/common-musl | 52 |
3 files changed, 86 insertions, 0 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 9ce336415a..c8fa7116b3 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass | |||
| @@ -98,6 +98,20 @@ def package_qa_get_machine_dict(): | |||
| 98 | "sh4": (42, 0, 0, True, 32), | 98 | "sh4": (42, 0, 0, True, 32), |
| 99 | 99 | ||
| 100 | }, | 100 | }, |
| 101 | "linux-musl" : { | ||
| 102 | "arm" : ( 40, 97, 0, True, 32), | ||
| 103 | "armeb": ( 40, 97, 0, False, 32), | ||
| 104 | "powerpc": ( 20, 0, 0, False, 32), | ||
| 105 | "i386": ( 3, 0, 0, True, 32), | ||
| 106 | "i486": ( 3, 0, 0, True, 32), | ||
| 107 | "i586": ( 3, 0, 0, True, 32), | ||
| 108 | "i686": ( 3, 0, 0, True, 32), | ||
| 109 | "x86_64": ( 62, 0, 0, True, 64), | ||
| 110 | "mips": ( 8, 0, 0, False, 32), | ||
| 111 | "mipsel": ( 8, 0, 0, True, 32), | ||
| 112 | "mips64": ( 8, 0, 0, False, 64), | ||
| 113 | "mips64el": ( 8, 0, 0, True, 64), | ||
| 114 | }, | ||
| 101 | "uclinux-uclibc" : { | 115 | "uclinux-uclibc" : { |
| 102 | "bfin": ( 106, 0, 0, True, 32), | 116 | "bfin": ( 106, 0, 0, True, 32), |
| 103 | }, | 117 | }, |
| @@ -105,6 +119,10 @@ def package_qa_get_machine_dict(): | |||
| 105 | "arm" : (40, 0, 0, True, 32), | 119 | "arm" : (40, 0, 0, True, 32), |
| 106 | "armeb" : (40, 0, 0, False, 32), | 120 | "armeb" : (40, 0, 0, False, 32), |
| 107 | }, | 121 | }, |
| 122 | "linux-musleabi" : { | ||
| 123 | "arm" : (40, 0, 0, True, 32), | ||
| 124 | "armeb" : (40, 0, 0, False, 32), | ||
| 125 | }, | ||
| 108 | "linux-uclibceabi" : { | 126 | "linux-uclibceabi" : { |
| 109 | "arm" : (40, 0, 0, True, 32), | 127 | "arm" : (40, 0, 0, True, 32), |
| 110 | "armeb" : (40, 0, 0, False, 32), | 128 | "armeb" : (40, 0, 0, False, 32), |
| @@ -112,6 +130,9 @@ def package_qa_get_machine_dict(): | |||
| 112 | "linux-gnuspe" : { | 130 | "linux-gnuspe" : { |
| 113 | "powerpc": (20, 0, 0, False, 32), | 131 | "powerpc": (20, 0, 0, False, 32), |
| 114 | }, | 132 | }, |
| 133 | "linux-muslspe" : { | ||
| 134 | "powerpc": (20, 0, 0, False, 32), | ||
| 135 | }, | ||
| 115 | "linux-uclibcspe" : { | 136 | "linux-uclibcspe" : { |
| 116 | "powerpc": (20, 0, 0, False, 32), | 137 | "powerpc": (20, 0, 0, False, 32), |
| 117 | }, | 138 | }, |
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index 9ae2561c88..e90632aeef 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass | |||
| @@ -58,6 +58,9 @@ def siteinfo_data(d): | |||
| 58 | "linux-uclibc": "common-linux common-uclibc", | 58 | "linux-uclibc": "common-linux common-uclibc", |
| 59 | "linux-uclibceabi": "common-linux common-uclibc", | 59 | "linux-uclibceabi": "common-linux common-uclibc", |
| 60 | "linux-uclibcspe": "common-linux common-uclibc", | 60 | "linux-uclibcspe": "common-linux common-uclibc", |
| 61 | "linux-musl": "common-linux common-musl", | ||
| 62 | "linux-musleabi": "common-linux common-musl", | ||
| 63 | "linux-muslspe": "common-linux common-musl", | ||
| 61 | "uclinux-uclibc": "common-uclibc", | 64 | "uclinux-uclibc": "common-uclibc", |
| 62 | "cygwin": "common-cygwin", | 65 | "cygwin": "common-cygwin", |
| 63 | "mingw32": "common-mingw", | 66 | "mingw32": "common-mingw", |
| @@ -66,21 +69,31 @@ def siteinfo_data(d): | |||
| 66 | "aarch64-linux-gnu": "aarch64-linux", | 69 | "aarch64-linux-gnu": "aarch64-linux", |
| 67 | "aarch64_be-linux-gnu": "aarch64_be-linux", | 70 | "aarch64_be-linux-gnu": "aarch64_be-linux", |
| 68 | "arm-linux-gnueabi": "arm-linux", | 71 | "arm-linux-gnueabi": "arm-linux", |
| 72 | "arm-linux-musleabi": "arm-linux", | ||
| 69 | "arm-linux-uclibceabi": "arm-linux-uclibc", | 73 | "arm-linux-uclibceabi": "arm-linux-uclibc", |
| 70 | "armeb-linux-gnueabi": "armeb-linux", | 74 | "armeb-linux-gnueabi": "armeb-linux", |
| 71 | "armeb-linux-uclibceabi": "armeb-linux-uclibc", | 75 | "armeb-linux-uclibceabi": "armeb-linux-uclibc", |
| 76 | "armeb-linux-musleabi": "armeb-linux", | ||
| 77 | "mips-linux-musl": "mips-linux", | ||
| 78 | "mipsel-linux-musl": "mipsel-linux", | ||
| 79 | "mips64-linux-musl": "mips-linux", | ||
| 80 | "mips64el-linux-musl": "mipsel-linux", | ||
| 72 | "mips64-linux-gnun32": "mips-linux bit-32", | 81 | "mips64-linux-gnun32": "mips-linux bit-32", |
| 73 | "mips64el-linux-gnun32": "mipsel-linux bit-32", | 82 | "mips64el-linux-gnun32": "mipsel-linux bit-32", |
| 74 | "powerpc-linux": "powerpc32-linux", | 83 | "powerpc-linux": "powerpc32-linux", |
| 84 | "powerpc-linux-musl": "powerpc-linux powerpc32-linux", | ||
| 75 | "powerpc-linux-uclibc": "powerpc-linux powerpc32-linux", | 85 | "powerpc-linux-uclibc": "powerpc-linux powerpc32-linux", |
| 76 | "powerpc-linux-gnuspe": "powerpc-linux powerpc32-linux", | 86 | "powerpc-linux-gnuspe": "powerpc-linux powerpc32-linux", |
| 87 | "powerpc-linux-muslspe": "powerpc-linux powerpc32-linux", | ||
| 77 | "powerpc-linux-uclibcspe": "powerpc-linux powerpc32-linux powerpc-linux-uclibc", | 88 | "powerpc-linux-uclibcspe": "powerpc-linux powerpc32-linux powerpc-linux-uclibc", |
| 78 | "powerpc64-linux-gnuspe": "powerpc-linux powerpc64-linux", | 89 | "powerpc64-linux-gnuspe": "powerpc-linux powerpc64-linux", |
| 90 | "powerpc64-linux-muslspe": "powerpc-linux powerpc64-linux", | ||
| 79 | "powerpc64-linux": "powerpc-linux", | 91 | "powerpc64-linux": "powerpc-linux", |
| 80 | "x86_64-cygwin": "bit-64", | 92 | "x86_64-cygwin": "bit-64", |
| 81 | "x86_64-darwin": "bit-64", | 93 | "x86_64-darwin": "bit-64", |
| 82 | "x86_64-darwin9": "bit-64", | 94 | "x86_64-darwin9": "bit-64", |
| 83 | "x86_64-linux": "bit-64", | 95 | "x86_64-linux": "bit-64", |
| 96 | "x86_64-linux-musl": "x86_64-linux bit-64", | ||
| 84 | "x86_64-linux-uclibc": "bit-64", | 97 | "x86_64-linux-uclibc": "bit-64", |
| 85 | "x86_64-linux-gnu": "bit-64 x86_64-linux", | 98 | "x86_64-linux-gnu": "bit-64 x86_64-linux", |
| 86 | "x86_64-linux-gnux32": "bit-32 ix86-common x32-linux", | 99 | "x86_64-linux-gnux32": "bit-32 ix86-common x32-linux", |
diff --git a/meta/site/common-musl b/meta/site/common-musl new file mode 100644 index 0000000000..26fc103319 --- /dev/null +++ b/meta/site/common-musl | |||
| @@ -0,0 +1,52 @@ | |||
| 1 | # general | ||
| 2 | ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=no} | ||
| 3 | ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes} | ||
| 4 | ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes} | ||
| 5 | ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes} | ||
| 6 | ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes} | ||
| 7 | ac_cv_func_getpgrp_void=yes | ||
| 8 | ac_cv_func_setpgrp_void=yes | ||
| 9 | ac_cv_func_setgrent_void=yes | ||
| 10 | ac_cv_func_getgrgid_r=${ac_cv_func_getgrgid_r=yes} | ||
| 11 | ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes} | ||
| 12 | ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} | ||
| 13 | ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} | ||
| 14 | ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes} | ||
| 15 | |||
| 16 | # glib | ||
| 17 | glib_cv_strlcpy=${glib_cv_strlcpy=no} | ||
| 18 | ac_cv_func_printf_unix98=${ac_cv_func_printf_unix98=yes} | ||
| 19 | ac_cv_func_snprintf_c99=${ac_cv_func_snprintf_c99=yes} | ||
| 20 | ac_cv_func_vsnprintf_c99=${ac_cv_func_vsnprintf_c99=yes} | ||
| 21 | glib_cv_compliant_posix_memalign=${glib_cv_compliant_posix_memalign=1} | ||
| 22 | glib_cv_long_long_format=${glib_cv_long_long_format=ll} | ||
| 23 | glib_cv_have_qsort_r=${glib_cv_have_qsort_r=no} | ||
| 24 | |||
| 25 | #dbus-glib | ||
| 26 | ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes} | ||
| 27 | |||
| 28 | # bash | ||
| 29 | bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=no} | ||
| 30 | bash_cv_sys_siglist=${bash_cv_sys_siglist=no} | ||
| 31 | |||
| 32 | # coreutils | ||
| 33 | fu_cv_sys_stat_statfs2_bsize=${fu_cv_sys_stat_statfs2_bsize=yes} | ||
| 34 | gl_cv_func_gettimeofday_clobber=${gl_cv_func_gettimeofday_clobber=no} | ||
| 35 | gl_cv_func_tzset_clobber=${gl_cv_func_tzset_clobber=no} | ||
| 36 | gl_cv_func_gettimeofday_posix_signature=${gl_cv_func_gettimeofday_posix_signature=yes} | ||
| 37 | ac_cv_func_posix_spawn=${ac_cv_func_posix_spawn=yes} | ||
| 38 | ac_cv_func_posix_spawn_works=${ac_cv_func_posix_spawn_works=yes} | ||
| 39 | |||
| 40 | # va_copy and _va_copy | ||
| 41 | ac_cv_va_copy=${ac_cv_va_copy=yes} | ||
| 42 | ac_cv___va_copy=${ac_cv___va_copy=yes} | ||
| 43 | ac_cv_func_va_copy=${ac_cv_func_va_copy=yes} | ||
| 44 | ac_cv_func___va_copy=${ac_cv_func___va_copy=yes} | ||
| 45 | |||
| 46 | # posix_getpwuid_r posix_getgrgid_r posix_getpwnam_r | ||
| 47 | ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} | ||
| 48 | ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} | ||
| 49 | ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} | ||
| 50 | |||
| 51 | # Xorg | ||
| 52 | xorg_cv_malloc0_returns_null=${xorg_cv_malloc0_returns_null=yes} | ||
