From 7a6f1008255e81fda6292f050409c68edb6c75f8 Mon Sep 17 00:00:00 2001 From: Jacob Stiffler Date: Fri, 7 Sep 2018 19:37:11 +0000 Subject: sa-lld: utilize oe_runmake * This fixes a configure issue when the sources may get cleaned. Signed-off-by: Jacob Stiffler Signed-off-by: Denys Dmytriyenko --- recipes-bsp/sa-lld/sa-lld-test_git.bb | 9 ++++++--- recipes-bsp/sa-lld/sa-lld_git.bb | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/recipes-bsp/sa-lld/sa-lld-test_git.bb b/recipes-bsp/sa-lld/sa-lld-test_git.bb index 07d64676..f3fa4f3d 100644 --- a/recipes-bsp/sa-lld/sa-lld-test_git.bb +++ b/recipes-bsp/sa-lld/sa-lld-test_git.bb @@ -14,14 +14,17 @@ DEVICELIST_k2e = "k2e" CHOICELIST = "no yes" +PARALLEL_MAKE = "" +EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} SA_SRC_DIR=${S}" + do_compile () { # Now build the lld in the updated directory for device in ${DEVICELIST} do - make -f makefile_armv7 clean PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device" SA_SRC_DIR=${S} + oe_runmake clean DEVICE="$device" for choice in ${CHOICELIST} do - make -f makefile_armv7 examples utils PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device" SA_SRC_DIR=${S} USEDYNAMIC_LIB="$choice" + oe_runmake examples utils DEVICE="$device" USEDYNAMIC_LIB="$choice" done done } @@ -34,7 +37,7 @@ do_install () { for device in ${DEVICELIST} do - make -f makefile_armv7 installbin PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device" SA_SRC_DIR=${S} INSTALL_BIN_BASE_DIR=${D}${bindir} + oe_runmake installbin DEVICE="$device" INSTALL_BIN_BASE_DIR=${D}${bindir} done } diff --git a/recipes-bsp/sa-lld/sa-lld_git.bb b/recipes-bsp/sa-lld/sa-lld_git.bb index d92ad1cf..df41c653 100644 --- a/recipes-bsp/sa-lld/sa-lld_git.bb +++ b/recipes-bsp/sa-lld/sa-lld_git.bb @@ -4,15 +4,18 @@ DEPENDS = "common-csl-ip" include sa-lld.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" + +PARALLEL_MAKE = "" +EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}" do_compile () { # Now build the lld in the updated directory - make -f makefile_armv7 clean lib PDK_INSTALL_PATH=${STAGING_INCDIR} + oe_runmake clean lib } do_install () { - make -f makefile_armv7 install PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir} + oe_runmake install INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir} chown -R root:root ${D} # Set the generic device library symbolic link -- cgit v1.2.3-54-g00ecf