From 1c0dc51920d5b5bb5a0f2496bc9a0b6679d89181 Mon Sep 17 00:00:00 2001 From: Jacob Stiffler Date: Wed, 21 Dec 2016 02:39:14 +0000 Subject: [PATCH] pruss-lld: utilize oe_runmake * Use the oe_runmake wrapper to invoke make * Supply common make arguments to EXTRA_OEMAKE such as which makefile to invoke. * This resolves build issues when pruss-lld needs to be reconfigured as do_configure would make the clean target of the incorrect makefile. Signed-off-by: Jacob Stiffler Signed-off-by: Denys Dmytriyenko --- recipes-bsp/pruss-lld/pruss-lld-test_git.bb | 8 +++++--- recipes-bsp/pruss-lld/pruss-lld_git.bb | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/recipes-bsp/pruss-lld/pruss-lld-test_git.bb b/recipes-bsp/pruss-lld/pruss-lld-test_git.bb index d994ec8f..7fdbfb6f 100644 --- a/recipes-bsp/pruss-lld/pruss-lld-test_git.bb +++ b/recipes-bsp/pruss-lld/pruss-lld-test_git.bb @@ -4,16 +4,18 @@ DEPENDS="common-csl-ip pruss-lld osal" include pruss-lld.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" S = "${WORKDIR}/${PRUSS_LLD_GIT_DESTSUFFIX}" +EXTRA_OEMAKE += "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} PRUSS_SRC_DIR=${S}" + do_compile () { # Build the tests - make -f makefile_armv7 tests PDK_INSTALL_PATH=${STAGING_INCDIR} PRUSS_SRC_DIR=${S} + oe_runmake tests } do_install () { # Install the binary - make -f makefile_armv7 installbin PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_BIN_BASE_DIR=${D}${bindir} PRUSS_SRC_DIR=${S} + oe_runmake installbin INSTALL_BIN_BASE_DIR=${D}${bindir} } diff --git a/recipes-bsp/pruss-lld/pruss-lld_git.bb b/recipes-bsp/pruss-lld/pruss-lld_git.bb index 72670f44..2eca4ffa 100644 --- a/recipes-bsp/pruss-lld/pruss-lld_git.bb +++ b/recipes-bsp/pruss-lld/pruss-lld_git.bb @@ -4,17 +4,19 @@ DEPENDS="common-csl-ip osal" include pruss-lld.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" S = "${WORKDIR}/${PRUSS_LLD_GIT_DESTSUFFIX}" +EXTRA_OEMAKE += "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}" + do_compile () { # Build the lib - make -f makefile_armv7 clean PDK_INSTALL_PATH=${STAGING_INCDIR} - make -f makefile_armv7 lib PDK_INSTALL_PATH=${STAGING_INCDIR} + oe_runmake clean + oe_runmake lib } do_install () { # Install the lib - 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} }