Merge "[Bugfix][T106]fix for esdk compile error"
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/liblynq-qser-sim/liblynq-qser-sim.bb b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/liblynq-qser-sim/liblynq-qser-sim.bb
index 9bc8573..f4c89f4 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/liblynq-qser-sim/liblynq-qser-sim.bb
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/liblynq-qser-sim/liblynq-qser-sim.bb
@@ -1,11 +1,17 @@
-inherit externalsrc package
+#inherit externalsrc package
DESCRIPTION = "liblynq-qser-sms"
LICENSE = "CLOSED"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e1696b147d49d491bcb4da1a57173fff"
DEPENDS += "liblynq-log liblynq-sim"
-inherit workonsrc
+#inherit workonsrc
WORKONSRC = "${TOPDIR}/../src/lynq/lib/liblynq-qser-sim/"
+FILESEXTRAPATHS_prepend :="${TOPDIR}/../src/lynq/lib/:"
+SRC_URI = " \
+ file://liblynq-qser-sim \
+ "
+
+SRC-DIR = "${S}/../liblynq-qser-sim"
TARGET_CC_ARCH += "${LDFLAGS}"
BB_INCLUDE_ADD = "--sysroot=${STAGING_DIR_HOST}"
@@ -29,19 +35,19 @@
#INHIBIT_PACKAGE_STRIP = "1"
do_compile () {
- oe_runmake all ROOT=${STAGING_DIR_HOST} OFLAGS="--sysroot=${STAGING_DIR_HOST} -Os -Wl,--hash-style=gnu -DTELEPHONYWARE"
+ oe_runmake all -C ${SRC-DIR} ROOT=${STAGING_DIR_HOST} OFLAGS="--sysroot=${STAGING_DIR_HOST} -Os -Wl,--hash-style=gnu -DTELEPHONYWARE"
}
do_install () {
- oe_runmake install ROOT=${D}
+ oe_runmake install -C ${SRC-DIR} ROOT=${D}
if [ -d "${WORKONSRC}" ] ; then
install -d ${D}${includedir}/
- cp -af ${S}include/ ${D}${includedir}/
+ cp -af ${SRC-DIR}/include/ ${D}${includedir}/
fi
}
addtask bachclean
do_bachclean () {
oe_runmake clean
-}
\ No newline at end of file
+}
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/liblynq-qser-sms/liblynq-qser-sms.bb b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/liblynq-qser-sms/liblynq-qser-sms.bb
index 1e81eca..525d68c 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/liblynq-qser-sms/liblynq-qser-sms.bb
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/liblynq-qser-sms/liblynq-qser-sms.bb
@@ -1,11 +1,17 @@
-inherit externalsrc package
+#inherit externalsrc package
DESCRIPTION = "liblynq-qser-sms"
LICENSE = "CLOSED"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e1696b147d49d491bcb4da1a57173fff"
DEPENDS += "liblynq-log liblynq-sms"
-inherit workonsrc
+#inherit workonsrc
WORKONSRC = "${TOPDIR}/../src/lynq/lib/liblynq-qser-sms/"
+FILESEXTRAPATHS_prepend :="${TOPDIR}/../src/lynq/lib/:"
+SRC_URI = " \
+ file://liblynq-qser-sms\
+ "
+
+SRC-DIR = "${S}/../liblynq-qser-sms"
TARGET_CC_ARCH += "${LDFLAGS}"
BB_INCLUDE_ADD = "--sysroot=${STAGING_DIR_HOST}"
@@ -29,19 +35,19 @@
#INHIBIT_PACKAGE_STRIP = "1"
do_compile () {
- oe_runmake all ROOT=${STAGING_DIR_HOST} OFLAGS="--sysroot=${STAGING_DIR_HOST} -Os -Wl,--hash-style=gnu -DTELEPHONYWARE"
+ oe_runmake all -C ${SRC-DIR} ROOT=${STAGING_DIR_HOST} OFLAGS="--sysroot=${STAGING_DIR_HOST} -Os -Wl,--hash-style=gnu -DTELEPHONYWARE"
}
do_install () {
- oe_runmake install ROOT=${D}
+ oe_runmake install -C ${SRC-DIR} ROOT=${D}
if [ -d "${WORKONSRC}" ] ; then
install -d ${D}${includedir}/
- cp -af ${S}include/ ${D}${includedir}/
+ cp -af ${SRC-DIR}/include/ ${D}${includedir}/
fi
}
addtask bachclean
do_bachclean () {
oe_runmake clean
-}
\ No newline at end of file
+}