* Build system update including variables to avoid hardcoding compiler prefix
Signed-off-by: Emily Curry <[email protected]> --- meta-arago-extras/recipes-ti/ocl/ocl.inc | 4 ++-- meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb | 8 -------- meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb | 3 +-- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/meta-arago-extras/recipes-ti/ocl/ocl.inc b/meta-arago-extras/recipes-ti/ocl/ocl.inc index 7b196fff..e211478f 100644 --- a/meta-arago-extras/recipes-ti/ocl/ocl.inc +++ b/meta-arago-extras/recipes-ti/ocl/ocl.inc @@ -1,4 +1,4 @@ -PV = "1.1.14.2" +PV = "1.1.14.4" INC_PR = "r0" LIC_FILES_CHKSUM = "file://../debian/copyright;md5=2e3965a73a8a49c23836467266120dff" @@ -9,7 +9,7 @@ OCL_GIT_URI = "git://git.ti.com/opencl/ti-opencl.git" OCL_GIT_PROTOCOL = "git" OCL_GIT_BRANCH = "master" -OCL_SRCREV = "e1314591c668c32b8d360badfa4d6a3dc1d345f2" +OCL_SRCREV = "733e105ab96d0395cd8ed2f405c5e038543d33ba" BRANCH = "${OCL_GIT_BRANCH}" SRC_URI = "${OCL_GIT_URI};protocol=${OCL_GIT_PROTOCOL};branch=${BRANCH}" diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb index fbecbc1d..0f769f4d 100644 --- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb +++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb @@ -73,18 +73,10 @@ EXTRA_OEMAKE = " TARGET_ROOTDIR=${STAGING_DIR_HOST} \ TI_OCL_CGT_INSTALL=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x \ " -do_configure() { - sed "s|arm-linux-gnueabihf-g++|${CXX}|g" -i make.inc -} - export XDC_DIR = "${XDC_INSTALL_DIR}/packages" export IPC_DIR = "${IPC_INSTALL_DIR}/packages" export BIOS_DIR = "${SYSBIOS_INSTALL_DIR}/packages" -do_compile() { - oe_runmake CC="${CC}" CPP="${CPP}" CXX="${CXX}" -} - do_install() { install -d ${D}${datadir}/ti/examples/opencl diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb index b69aa950..44050f11 100644 --- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb +++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb @@ -61,8 +61,7 @@ EXTRA_OECMAKE += " -DCROSS_COMPILE=TRUE \ " export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" -export AM57_PDK_DIR = "${PDK_INSTALL_DIR}" -export C6636_PDK_DIR = "${PDK_INSTALL_DIR}" +export PDK_DIR = "${PDK_INSTALL_DIR}" export IPC_DIR = "${IPC_INSTALL_DIR}" export XDC_DIR = "${XDC_INSTALL_DIR}" export BIOS_DIR = "${SYSBIOS_INSTALL_DIR}" -- 2.14.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
