diff options
Diffstat (limited to 'meta/recipes-core/musl/musl_git.bb')
| -rw-r--r-- | meta/recipes-core/musl/musl_git.bb | 51 |
1 files changed, 33 insertions, 18 deletions
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 932c9a27a0..324269a968 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -2,27 +2,33 @@ # Released under the MIT license (see COPYING.MIT for the terms) require musl.inc +inherit linuxloader -SRCREV = "eb03bde2f24582874cb72b56c7811bf51da0c817" +SRCREV = "79bdacff83a6bd5b70ff5ae5eb8b6de82c2f7c30" -PV = "1.1.18+git${SRCPV}" +BASEVER = "1.2.4" -# mirror is at git://github.com/kraj/musl.git +PV = "${BASEVER}+git" -SRC_URI = "git://git.musl-libc.org/musl \ +SRC_URI = "git://git.etalabs.net/git/musl;branch=master;protocol=https \ file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ + file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ + file://0003-elf.h-add-typedefs-for-Elf64_Relr-and-Elf32_Relr.patch \ " S = "${WORKDIR}/git" -PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc virtual/libiconv virtual/libintl" +PROVIDES += "virtual/libc virtual/libiconv virtual/libintl virtual/crypt" DEPENDS = "virtual/${TARGET_PREFIX}binutils \ - virtual/${TARGET_PREFIX}gcc-initial \ + virtual/${TARGET_PREFIX}gcc \ libgcc-initial \ linux-libc-headers \ bsd-headers \ + libssp-nonshared \ " +GLIBC_LDSO = "${@get_glibc_loader(d)}" +MUSL_LDSO_ARCH = "${@get_musl_loader_arch(d)}" export CROSS_COMPILE="${TARGET_PREFIX}" @@ -34,7 +40,7 @@ LDFLAGS += "-Wl,-soname,libc.so" # disabled automatically due to the optimisation level, but append an explicit # -fomit-frame-pointer to handle cases where optimisation is set to -O0 or frame # pointers have been enabled by -fno-omit-frame-pointer earlier in CFLAGS, etc. -CFLAGS_append_arm = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" +CFLAGS:append:arm = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" CONFIGUREOPTS = " \ --prefix=${prefix} \ @@ -42,7 +48,7 @@ CONFIGUREOPTS = " \ --bindir=${bindir} \ --libdir=${libdir} \ --includedir=${includedir} \ - --syslibdir=${base_libdir} \ + --syslibdir=${nonarch_base_libdir} \ " do_configure() { @@ -55,17 +61,26 @@ do_compile() { do_install() { oe_runmake install DESTDIR='${D}' - - install -d ${D}${bindir} - lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd - for l in crypt dl m pthread resolv rt util xnet - do - ln -s libc.so ${D}${libdir}/lib$l.so - done + install -d ${D}${bindir} ${D}${sysconfdir} + echo "${base_libdir}" > ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path + echo "${libdir}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path + rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO} + ln -rs ${D}${libdir}/libc.so ${D}${bindir}/ldd } -RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev" -RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" -RPROVIDES_${PN} += "ldd libsegfault rtld(GNU_HASH)" +FILES:${PN} += "${nonarch_base_libdir}/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path" +FILES:${PN}-staticdev = "${libdir}/libc.a" +FILES:${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \ + ${libdir}/libpthread.a ${libdir}/libresolv.a \ + ${libdir}/librt.a ${libdir}/libutil.a ${libdir}/libxnet.a \ + " + +RDEPENDS:${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" +RPROVIDES:${PN}-dev += "libc-dev virtual-libc-dev" +RPROVIDES:${PN} += "ldd rtld(GNU_HASH)" LEAD_SONAME = "libc.so" +INSANE_SKIP:${PN}-dev = "staticdev" +INSANE_SKIP:${PN} = "libdir" + +UPSTREAM_CHECK_COMMITS = "1" |