diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-core/musl')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-core/musl/musl.inc | 7 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-core/musl/musl_git.bb | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-core/musl/musl.inc b/import-layers/yocto-poky/meta/recipes-core/musl/musl.inc index d27867f75..7ed931c6d 100644 --- a/import-layers/yocto-poky/meta/recipes-core/musl/musl.inc +++ b/import-layers/yocto-poky/meta/recipes-core/musl/musl.inc @@ -9,7 +9,7 @@ standards-conformance and safety." HOMEPAGE = "http://www.musl-libc.org/" LICENSE = "MIT" SECTION = "libs" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=082411391b4d1ace0d30f4c84317cc05" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=7928b7ad32ceda04932478e330e52f7f" PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" @@ -17,10 +17,13 @@ TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" INHIBIT_DEFAULT_DEPS = "1" STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" -STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" +STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}" FILES_SOLIBSDEV = "" FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}" INSANE_SKIP_${PN} = "dev-so" +# Doesn't compile in MIPS16e mode due to use of hand-written +# assembly +MIPS_INSTRUCTION_SET = "mips" diff --git a/import-layers/yocto-poky/meta/recipes-core/musl/musl_git.bb b/import-layers/yocto-poky/meta/recipes-core/musl/musl_git.bb index d4f98191f..c07101b74 100644 --- a/import-layers/yocto-poky/meta/recipes-core/musl/musl_git.bb +++ b/import-layers/yocto-poky/meta/recipes-core/musl/musl_git.bb @@ -3,9 +3,9 @@ require musl.inc -SRCREV = "5978eb703ce0e64dd778a88c1ffffb76fe5e2202" +SRCREV = "39494a273eaa6b714e0fa0c59ce7a1f5fbc80a1e" -PV = "1.1.14+git${SRCPV}" +PV = "1.1.15+git${SRCPV}" # mirror is at git://github.com/kraj/musl.git @@ -26,8 +26,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils \ export CROSS_COMPILE="${TARGET_PREFIX}" -EXTRA_OEMAKE = "" - LDFLAGS += "-Wl,-soname,libc.so" CONFIGUREOPTS = " \ @@ -52,6 +50,10 @@ do_install() { install -d ${D}${bindir} ln -s ../../${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 } RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev" |