diff options
Diffstat (limited to 'meta/recipes-core/musl/musl_git.bb')
-rw-r--r-- | meta/recipes-core/musl/musl_git.bb | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index e6f9e2441e..324269a968 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb | |||
@@ -4,17 +4,16 @@ | |||
4 | require musl.inc | 4 | require musl.inc |
5 | inherit linuxloader | 5 | inherit linuxloader |
6 | 6 | ||
7 | SRCREV = "e5d2823631bbfebacf48e1a34ed28f28d7cb2570" | 7 | SRCREV = "79bdacff83a6bd5b70ff5ae5eb8b6de82c2f7c30" |
8 | 8 | ||
9 | BASEVER = "1.2.2" | 9 | BASEVER = "1.2.4" |
10 | 10 | ||
11 | PV = "${BASEVER}+git${SRCPV}" | 11 | PV = "${BASEVER}+git" |
12 | 12 | ||
13 | # mirror is at git://github.com/kraj/musl.git | 13 | SRC_URI = "git://git.etalabs.net/git/musl;branch=master;protocol=https \ |
14 | |||
15 | SRC_URI = "git://git.musl-libc.org/musl \ | ||
16 | file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ | 14 | file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ |
17 | file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ | 15 | file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ |
16 | file://0003-elf.h-add-typedefs-for-Elf64_Relr-and-Elf32_Relr.patch \ | ||
18 | " | 17 | " |
19 | 18 | ||
20 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
@@ -41,7 +40,7 @@ LDFLAGS += "-Wl,-soname,libc.so" | |||
41 | # disabled automatically due to the optimisation level, but append an explicit | 40 | # disabled automatically due to the optimisation level, but append an explicit |
42 | # -fomit-frame-pointer to handle cases where optimisation is set to -O0 or frame | 41 | # -fomit-frame-pointer to handle cases where optimisation is set to -O0 or frame |
43 | # pointers have been enabled by -fno-omit-frame-pointer earlier in CFLAGS, etc. | 42 | # pointers have been enabled by -fno-omit-frame-pointer earlier in CFLAGS, etc. |
44 | CFLAGS_append_arm = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" | 43 | CFLAGS:append:arm = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" |
45 | 44 | ||
46 | CONFIGUREOPTS = " \ | 45 | CONFIGUREOPTS = " \ |
47 | --prefix=${prefix} \ | 46 | --prefix=${prefix} \ |
@@ -49,7 +48,7 @@ CONFIGUREOPTS = " \ | |||
49 | --bindir=${bindir} \ | 48 | --bindir=${bindir} \ |
50 | --libdir=${libdir} \ | 49 | --libdir=${libdir} \ |
51 | --includedir=${includedir} \ | 50 | --includedir=${includedir} \ |
52 | --syslibdir=/lib \ | 51 | --syslibdir=${nonarch_base_libdir} \ |
53 | " | 52 | " |
54 | 53 | ||
55 | do_configure() { | 54 | do_configure() { |
@@ -62,28 +61,26 @@ do_compile() { | |||
62 | 61 | ||
63 | do_install() { | 62 | do_install() { |
64 | oe_runmake install DESTDIR='${D}' | 63 | oe_runmake install DESTDIR='${D}' |
65 | install -d ${D}${bindir} ${D}/lib ${D}${sysconfdir} | 64 | install -d ${D}${bindir} ${D}${sysconfdir} |
66 | echo "${base_libdir}" > ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path | 65 | echo "${base_libdir}" > ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path |
67 | echo "${libdir}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path | 66 | echo "${libdir}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path |
68 | rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO} | 67 | rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO} |
69 | lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd | 68 | ln -rs ${D}${libdir}/libc.so ${D}${bindir}/ldd |
70 | lnr ${D}${libdir}/libc.so ${D}${GLIBC_LDSO} | ||
71 | } | 69 | } |
72 | 70 | ||
73 | PACKAGES =+ "${PN}-glibc-compat" | 71 | FILES:${PN} += "${nonarch_base_libdir}/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path" |
74 | 72 | FILES:${PN}-staticdev = "${libdir}/libc.a" | |
75 | FILES_${PN} += "/lib/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path" | 73 | FILES:${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \ |
76 | FILES_${PN}-glibc-compat += "${GLIBC_LDSO}" | ||
77 | FILES_${PN}-staticdev = "${libdir}/libc.a" | ||
78 | FILES_${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \ | ||
79 | ${libdir}/libpthread.a ${libdir}/libresolv.a \ | 74 | ${libdir}/libpthread.a ${libdir}/libresolv.a \ |
80 | ${libdir}/librt.a ${libdir}/libutil.a ${libdir}/libxnet.a \ | 75 | ${libdir}/librt.a ${libdir}/libutil.a ${libdir}/libxnet.a \ |
81 | " | 76 | " |
82 | 77 | ||
83 | RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" | 78 | RDEPENDS:${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" |
84 | RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" | 79 | RPROVIDES:${PN}-dev += "libc-dev virtual-libc-dev" |
85 | RPROVIDES_${PN} += "ldd libsegfault rtld(GNU_HASH)" | 80 | RPROVIDES:${PN} += "ldd rtld(GNU_HASH)" |
86 | 81 | ||
87 | LEAD_SONAME = "libc.so" | 82 | LEAD_SONAME = "libc.so" |
88 | INSANE_SKIP_${PN}-dev = "staticdev" | 83 | INSANE_SKIP:${PN}-dev = "staticdev" |
89 | INSANE_SKIP_${PN} = "libdir" | 84 | INSANE_SKIP:${PN} = "libdir" |
85 | |||
86 | UPSTREAM_CHECK_COMMITS = "1" | ||