Use latest musl version. Remove default toolchain flags. Refactor the install location.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../recipes-core/musl/musl-morello-common.inc | 13 +++++++--- .../recipes-core/musl/musl-morello-target.inc | 25 ++++++++++--------- ...usl_morello-1.5.bb => musl_morello-1.6.bb} | 0 3 files changed, 22 insertions(+), 16 deletions(-) rename meta-morello-toolchain/recipes-core/musl/{musl_morello-1.5.bb => musl_morello-1.6.bb} (100%)
diff --git a/meta-morello-toolchain/recipes-core/musl/musl-morello-common.inc b/meta-morello-toolchain/recipes-core/musl/musl-morello-common.inc index cd2190a..eb6a0a8 100644 --- a/meta-morello-toolchain/recipes-core/musl/musl-morello-common.inc +++ b/meta-morello-toolchain/recipes-core/musl/musl-morello-common.inc @@ -4,7 +4,8 @@ LICENSE = "MIT"
FILESEXTRAPATHS:prepend := "${THISDIR}:"
-DEPENDS:remove:toolchain-llvm-morello = "virtual/musl-morello" +DEPENDS:remove:toolchain-llvm-morello = "virtual/musl-morello" +RDEPENDS:${PN}:remove:toolchain-llvm-morello = "musl"
SUMMARY = "CHERI enabled musl libc" SRC_URI = " \ @@ -12,8 +13,8 @@ SRC_URI = " \ file://files/compiler_rt.cmake \ "
-# morello-release-1.5.0 -SRCREV = "df8f6409fb58efe35a3300b91a1f1941e2f89022" +# morello-release-1.6.0 +SRCREV = "3216cb79d3b198e30a13f4b5778a4e235ad58d31" SRCBRANCH = "morello/master"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b03f1cc25363d094011f8f4fd8bcfb68" @@ -21,12 +22,16 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b03f1cc25363d094011f8f4fd8bcfb68" S = "${WORKDIR}/git" B = "${WORKDIR}/build"
-TARGET_INSTALL_DIR = "${D}${MUSL_INSTALL_DIR}" +TARGET_INSTALL_DIR = "${D}${PURECAP_SYSROOT_DIR}"
INHIBIT_SYSROOT_STRIP = "1" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+CC:remove = "${CC_PURECAP_FLAGS}" +CXX:remove = "${CC_PURECAP_FLAGS}" +LDFLAGS:remove = "${LD_PURECAP_FLAGS}" + CONFIGUREOPTS = " \ --prefix=${prefix} \ --exec-prefix=${exec_prefix} \ diff --git a/meta-morello-toolchain/recipes-core/musl/musl-morello-target.inc b/meta-morello-toolchain/recipes-core/musl/musl-morello-target.inc index 9f34ee9..4ce69d8 100644 --- a/meta-morello-toolchain/recipes-core/musl/musl-morello-target.inc +++ b/meta-morello-toolchain/recipes-core/musl/musl-morello-target.inc @@ -6,23 +6,24 @@ TOOLCHAIN = "${MORELLO_TOOLCHAIN}"
MUSL_LDSO_ARCH = "aarch64_purecap"
-FILES:${PN} = "${MUSL_INSTALL_DIR}" -FILES:${PN} += "${MUSL_INSTALL_DIR}${datadir} ${MUSL_INSTALL_DIR}${bindir} ${MUSL_INSTALL_DIR}${libdir}" -FILES:${PN} += "${MUSL_INSTALL_DIR}${includedir} ${MUSL_INSTALL_DIR}${includedir}/sys \ - ${MUSL_INSTALL_DIR}${includedir}/arpa ${MUSL_INSTALL_DIR}${includedir}/bits \ - ${MUSL_INSTALL_DIR}${includedir}/net ${MUSL_INSTALL_DIR}${includedir}/netinet \ - ${MUSL_INSTALL_DIR}${includedir}/netpacket ${MUSL_INSTALL_DIR}${includedir}/arpa \ - ${MUSL_INSTALL_DIR}${includedir}/scsi ${MUSL_INSTALL_DIR}${includedir}/sys" +FILES:${PN} = "${PURECAP_SYSROOT_DIR}" + +FILES:${PN} += "${PURECAP_SYSROOT_DIR}${datadir} ${PURECAP_SYSROOT_DIR}${bindir} ${PURECAP_SYSROOT_DIR}${libdir}" +FILES:${PN} += "${PURECAP_SYSROOT_DIR}${includedir} ${PURECAP_SYSROOT_DIR}${includedir}/sys \ + ${PURECAP_SYSROOT_DIR}${includedir}/arpa ${PURECAP_SYSROOT_DIR}${includedir}/bits \ + ${PURECAP_SYSROOT_DIR}${includedir}/net ${PURECAP_SYSROOT_DIR}${includedir}/netinet \ + ${PURECAP_SYSROOT_DIR}${includedir}/netpacket ${PURECAP_SYSROOT_DIR}${includedir}/arpa \ + ${PURECAP_SYSROOT_DIR}${includedir}/scsi ${PURECAP_SYSROOT_DIR}${includedir}/sys"
FILES:${PN} += "${nonarch_base_libdir}/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path"
-FILES:${PN}-staticdev = "${MUSL_INSTALL_DIR}${libdir}/libc.a" -FILES:${PN}-dev =+ "${MUSL_INSTALL_DIR}${libdir}/libcrypt.a ${MUSL_INSTALL_DIR}${libdir}/libdl.a ${MUSL_INSTALL_DIR}${libdir}/libm.a \ - ${MUSL_INSTALL_DIR}${libdir}/libpthread.a ${MUSL_INSTALL_DIR}${libdir}/libresolv.a \ - ${MUSL_INSTALL_DIR}${libdir}/librt.a ${MUSL_INSTALL_DIR}${libdir}/libutil.a ${MUSL_INSTALL_DIR}${libdir}/libxnet.a \ +FILES:${PN}-staticdev = "${PURECAP_SYSROOT_DIR}${libdir}/libc.a" +FILES:${PN}-dev =+ "${PURECAP_SYSROOT_DIR}${libdir}/libcrypt.a ${PURECAP_SYSROOT_DIR}${libdir}/libdl.a ${PURECAP_SYSROOT_DIR}${libdir}/libm.a \ + ${PURECAP_SYSROOT_DIR}${libdir}/libpthread.a ${PURECAP_SYSROOT_DIR}${libdir}/libresolv.a \ + ${PURECAP_SYSROOT_DIR}${libdir}/librt.a ${PURECAP_SYSROOT_DIR}${libdir}/libutil.a ${PURECAP_SYSROOT_DIR}${libdir}/libxnet.a \ "
-SYSROOT_DIRS += "${sysconfdir} ${MUSL_INSTALL_DIR}${includedir}" +SYSROOT_DIRS += "${sysconfdir} ${PURECAP_SYSROOT_DIR}${includedir}"
do_install() {
diff --git a/meta-morello-toolchain/recipes-core/musl/musl_morello-1.5.bb b/meta-morello-toolchain/recipes-core/musl/musl_morello-1.6.bb similarity index 100% rename from meta-morello-toolchain/recipes-core/musl/musl_morello-1.5.bb rename to meta-morello-toolchain/recipes-core/musl/musl_morello-1.6.bb