diff options
| author | Ronan Le Martret <ronan@fridu.net> | 2014-09-25 17:25:19 +0200 |
|---|---|---|
| committer | Ronan Le Martret <ronan@fridu.net> | 2014-09-25 17:25:19 +0200 |
| commit | 0777be7ca21ab1896497077b0587a297aa24a755 (patch) | |
| tree | f4441c1ee0b15bc5c26d2600a2f81f08cc8efc50 | |
| parent | 537b49d0e04354fdfbec3ba973ff17fce749d163 (diff) | |
| download | meta-tizen-0777be7ca21ab1896497077b0587a297aa24a755.tar.gz meta-tizen-0777be7ca21ab1896497077b0587a297aa24a755.tar.bz2 meta-tizen-0777be7ca21ab1896497077b0587a297aa24a755.zip | |
update recipes cmake change
Change-Id: I1bed2a9966d93bc87475c92ef464337ff7c00c1c
Signed-off-by: Ronan Le Martret <ronan@fridu.net>
101 files changed, 178 insertions, 387 deletions
diff --git a/recipes-tizen/ail/ail-extraconf.inc b/recipes-tizen/ail/ail-extraconf.inc index 5f02057b..cdbcc746 100644 --- a/recipes-tizen/ail/ail-extraconf.inc +++ b/recipes-tizen/ail/ail-extraconf.inc @@ -1,4 +1,3 @@ -inherit pkgconfig cmake SRC_URI_append_class-native = " file://remove-dlog-for-native-build.patch" @@ -10,31 +9,6 @@ DEPENDS_class-target += "libslp-db-util" DEPENDS_class-target += "xdgmime" DEPENDS_class-target += "vconf" -EXTRA_OECMAKE += " \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ - -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \ - -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \ - -DLIB_INSTALL_DIR:PATH=${prefix}/lib \ - -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ - -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DTZ_SYS_RW_DESKTOP_APP=${prefix}/share/applications \ - -DBUILD_PKGTYPE=rpm \ - -DSMACK=Off \ - " - -cmake_do_install_append() { - - rm -f ${D}${infodir}/dir - - find ${D} -regex ".*\.la$" | xargs rm -f -- - find ${D} -regex ".*\.a$" | xargs rm -f -- - - mkdir -p ${D}${prefix}/dbspace/ - mkdir -p ${D}${prefix}/share/applications/ -} FILES_${PN} += "/usr/dbspace" FILES_${PN} += "/usr/share/applications"
\ No newline at end of file diff --git a/recipes-tizen/ail/ail.inc b/recipes-tizen/ail/ail.inc index fe510eeb..1e113ab4 100644 --- a/recipes-tizen/ail/ail.inc +++ b/recipes-tizen/ail/ail.inc @@ -34,8 +34,7 @@ RDEPENDS_${PN}-dev += "smack" DEPENDS = "" #DEPENDS of ail -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "tizen-platform-config" DEPENDS += "dlog" DEPENDS += "smack" @@ -80,6 +79,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DTZ_SYS_RW_DESKTOP_APP=${prefix}/share/applications \ -DBUILD_PKGTYPE=rpm \ -DSMACK=Off diff --git a/recipes-tizen/app-checker/app-checker.inc b/recipes-tizen/app-checker/app-checker.inc index e5e22db8..b98defa6 100644 --- a/recipes-tizen/app-checker/app-checker.inc +++ b/recipes-tizen/app-checker/app-checker.inc @@ -40,8 +40,7 @@ RDEPENDS_${PN}-server += "app-checker" DEPENDS = "" #DEPENDS of app-checker -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "dlog" DEPENDS += "glib-2.0" @@ -80,6 +79,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/app-core/app-core.inc b/recipes-tizen/app-core/app-core.inc index c5fcd32a..3bd46891 100644 --- a/recipes-tizen/app-core/app-core.inc +++ b/recipes-tizen/app-core/app-core.inc @@ -57,8 +57,7 @@ RDEPENDS_${PN}-efl-dev += "app-core-common-dev" DEPENDS = "" #DEPENDS of app-core DEPENDS += "librua" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "tizen-platform-config" DEPENDS += "aul" DEPENDS += "dlog" @@ -103,6 +102,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . \ -Dwith_wayland=TRUE\ -DENABLE_GTK=OFF diff --git a/recipes-tizen/app-manager/app-manager.inc b/recipes-tizen/app-manager/app-manager.inc index 03b0bce2..ce0181e4 100644 --- a/recipes-tizen/app-manager/app-manager.inc +++ b/recipes-tizen/app-manager/app-manager.inc @@ -27,8 +27,7 @@ RDEPENDS_capi-appfw-${PN}-dev += "capi-appfw-app-manager" DEPENDS = "" #DEPENDS of capi-appfw-app-manager -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "slp-pkgmgr" DEPENDS += "aul" DEPENDS += "dlog" @@ -72,6 +71,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.1.0 -DMAJORVER=${MAJORVER} oe_runmake -j16 diff --git a/recipes-tizen/app-svc/app-svc.inc b/recipes-tizen/app-svc/app-svc.inc index d27fb395..95933648 100644 --- a/recipes-tizen/app-svc/app-svc.inc +++ b/recipes-tizen/app-svc/app-svc.inc @@ -31,8 +31,7 @@ DEPENDS = "" #DEPENDS of app-svc DEPENDS += "pkgmgr-info" DEPENDS += "libsoup-2.4" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "iniparser" DEPENDS += "tizen-platform-config" DEPENDS += "aul" @@ -79,6 +78,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . \ -Dwith_wayland=TRUE diff --git a/recipes-tizen/appcore-agent/appcore-agent.inc b/recipes-tizen/appcore-agent/appcore-agent.inc index 5cc4c9d8..03735494 100644 --- a/recipes-tizen/appcore-agent/appcore-agent.inc +++ b/recipes-tizen/appcore-agent/appcore-agent.inc @@ -26,8 +26,7 @@ RDEPENDS_${PN}-dev += "appcore-agent" DEPENDS = "" #DEPENDS of appcore-agent -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "aul" DEPENDS += "dlog" DEPENDS += "glib-2.0" @@ -68,6 +67,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . oe_runmake -j16 diff --git a/recipes-tizen/application/application.inc b/recipes-tizen/application/application.inc index ec9a871d..00c63578 100644 --- a/recipes-tizen/application/application.inc +++ b/recipes-tizen/application/application.inc @@ -28,8 +28,7 @@ RDEPENDS_capi-appfw-${PN}-dev += "capi-appfw-application" DEPENDS = "" #DEPENDS of capi-appfw-application DEPENDS += "sqlite3" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "notification" DEPENDS += "tizen-platform-config" DEPENDS += "app-svc" @@ -76,6 +75,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.1.0 -DMAJORVER=${MAJORVER} oe_runmake -j16 diff --git a/recipes-tizen/aul-1/aul-1-extraconf.inc b/recipes-tizen/aul-1/aul-1-extraconf.inc index 7f2f493e..63c680c2 100644 --- a/recipes-tizen/aul-1/aul-1-extraconf.inc +++ b/recipes-tizen/aul-1/aul-1-extraconf.inc @@ -1,48 +1,6 @@ -inherit pkgconfig cmake - - #PROVIDES by aul PROVIDES += "aul" -RDEPENDS = "" -#RDEPENDS of aul (aul) -RDEPENDS_aul += "eglibc" -RDEPENDS_aul += "systemd" - -#RDEPENDS of aul-dev (aul-dev) -RDEPENDS_aul-dev += "aul" - -DEPENDS = "" -#DEPENDS of aul -DEPENDS += "pkgmgr-info" -DEPENDS += "librua" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" -DEPENDS += "attr" -DEPENDS += "dbus" -DEPENDS += "tizen-platform-config" -DEPENDS += "dlog" -DEPENDS += "xdgmime" -DEPENDS += "ail" -DEPENDS += "bundle" -DEPENDS += "sqlite3" -DEPENDS += "libprivilege-control" -DEPENDS += "app-checker" -DEPENDS += "vconf" -DEPENDS += "privacy-manager" - -EXTRA_OECMAKE += " \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \ - -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \ - -DLIB_INSTALL_DIR:PATH=${prefix}/lib \ - -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ - -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DWITH_WAYLAND=On \ - " - do_prep_append() { sed -i 's!/usr/bin/mkdir -p!/bin/mkdir -p!g' ${S}/packaging/ac.service # preload_list.txt and preexec_list.txt are generated from .in files so they are located in the build directory instead of the source one @@ -50,33 +8,5 @@ do_prep_append() { sed -i 's@INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/feature/preexec_list.txt DESTINATION /usr/share/aul )@INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/feature/preexec_list.txt DESTINATION /usr/share/aul )@' ${S}/CMakeLists.txt } -do_cmake_install_append() { - - rm -f ${D}${infodir}/dir - find ${D} -regex ".*\.la$" | xargs rm -f -- - find ${D} -regex ".*\.a$" | xargs rm -f -- - - mkdir -p ${D}/etc/init.d - install -m 755 launchpad_run ${D}/etc/init.d - - mkdir -p ${D}/etc/rc.d/rc3.d - mkdir -p ${D}/etc/rc.d/rc4.d - ln -sf ../../init.d/launchpad_run ${D}/${sysconfdir}/rc.d/rc3.d/S34launchpad_run - ln -sf ../../init.d/launchpad_run ${D}/${sysconfdir}/rc.d/rc4.d/S80launchpad_run - - mkdir -p ${D}${prefix}/dbspace - sqlite3 ${D}${prefix}/dbspace/.mida.db < ${D}/usr/share/aul/mida_db.sql - rm -rf ${D}/usr/share/aul/mida_db.sql - - mkdir -p ${D}/usr/lib/systemd/system/graphical.target.wants - mkdir -p ${D}/usr/lib/systemd/user/default.target.wants - install -m 0644 ${S}/packaging/launchpad-preload@.service ${D}/usr/lib/systemd/system/launchpad-preload@.service - install -m 0644 ${S}/packaging/ac.service ${D}/usr/lib/systemd/system/ac.service - ln -s ../launchpad-preload@.service ${D}/usr/lib/systemd/system/graphical.target.wants/launchpad-preload@5000.service - ln -s ../ac.service ${D}/usr/lib/systemd/system/graphical.target.wants/ac.service - - install -m 0644 ${S}/packaging/amd_session_agent.service ${D}/usr/lib/systemd/user/amd_session_agent.service - ln -s ../amd_session_agent.service ${D}/usr/lib/systemd/user/default.target.wants/amd_session_agent.service -} aul_files += "${prefix}/share/aul/mida_db.sql" diff --git a/recipes-tizen/aul-1/aul-1.inc b/recipes-tizen/aul-1/aul-1.inc index 4407e8eb..b1bf12c8 100644 --- a/recipes-tizen/aul-1/aul-1.inc +++ b/recipes-tizen/aul-1/aul-1.inc @@ -33,8 +33,7 @@ DEPENDS = "" #DEPENDS of aul DEPENDS += "pkgmgr-info" DEPENDS += "librua" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "attr" DEPENDS += "tizen-platform-config" DEPENDS += "bundle" @@ -84,6 +83,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . oe_runmake -j16 diff --git a/recipes-tizen/automotive-message-broker/automotive-message-broker-extraconf.inc b/recipes-tizen/automotive-message-broker/automotive-message-broker-extraconf.inc index af6b7648..6fb81b4f 100644 --- a/recipes-tizen/automotive-message-broker/automotive-message-broker-extraconf.inc +++ b/recipes-tizen/automotive-message-broker/automotive-message-broker-extraconf.inc @@ -1,46 +1,8 @@ -inherit pkgconfig cmake - B="${S}" INSANE_SKIP_${PN} = "dev-so" -EXTRA_OECMAKE = " \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ - -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \ - -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \ - -DLIB_INSTALL_DIR:PATH=${prefix}/lib \ - -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ - -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -Ddatabase_plugin=ON \ - -Dmurphy_plugin=ON \ - -Dobd2_plugin=ON \ - -Dtest_plugin=ON \ - -Dgpsnmea_plugin=ON \ - -Dcangen_plugin=ON \ - -Dcansim_plugin=ON \ - -Denable_icecc=OFF \ - " - cmake_do_configure_prepend() { # Add pthread library to target_link_libraries sed -i 's@set(link_libraries -lamb ${libtool_LIBRARY} ${glib_LIBRARIES} ${json_LIBRARIES} -L${CMAKE_CURRENT_BINARY_DIR}/lib)@set(link_libraries -lamb ${libtool_LIBRARY} ${glib_LIBRARIES} ${json_LIBRARIES} -lpthread -L${CMAKE_CURRENT_BINARY_DIR}/lib)@' ${S}/CMakeLists.txt -} - -cmake_do_install_append() { - - rm -f ${D}${infodir}/dir - find ${D} -regex ".*\.la$" | xargs rm -f -- - find ${D} -regex ".*\.a$" | xargs rm -f -- - - mkdir -p ${D}${systemd_unitdir}/system/network.target.wants - cp packaging.in/ambd.service.systemd.tizen ${D}${systemd_unitdir}/system/ambd.service - ln -sf ../ambd.service ${D}${systemd_unitdir}/system/network.target.wants/ambd.service - - mkdir -p ${D}${systemd_unitdir}/system/multi-user.target.wants - ln -sf ../ambd.service ${D}${systemd_unitdir}/system/multi-user.target.wants/ambd.service - - cp packaging.in/config.tizen ${D}${sysconfdir}/ambd/ -} +}
\ No newline at end of file diff --git a/recipes-tizen/automotive-message-broker/automotive-message-broker.inc b/recipes-tizen/automotive-message-broker/automotive-message-broker.inc index a80ad75e..bf039f62 100644 --- a/recipes-tizen/automotive-message-broker/automotive-message-broker.inc +++ b/recipes-tizen/automotive-message-broker/automotive-message-broker.inc @@ -114,8 +114,7 @@ RDEPENDS_${PN}-plugins-gpsnmea += "automotive-message-broker" DEPENDS = "" #DEPENDS of automotive-message-broker -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "opencv" DEPENDS += "json-c" DEPENDS += "dbus" @@ -160,6 +159,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} \ -Ddatabase_plugin=ON \ -Dmurphy_plugin=ON \ diff --git a/recipes-tizen/badge/badge.inc b/recipes-tizen/badge/badge.inc index f3af20fd..6fdd5b82 100644 --- a/recipes-tizen/badge/badge.inc +++ b/recipes-tizen/badge/badge.inc @@ -33,8 +33,7 @@ RDEPENDS_${PN}-service-dev += "badge" DEPENDS = "" #DEPENDS of badge -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "dbus" DEPENDS += "tizen-platform-config" DEPENDS += "aul" @@ -77,6 +76,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/bluetooth-frwk/bluetooth-frwk.inc b/recipes-tizen/bluetooth-frwk/bluetooth-frwk.inc index 309fd3f2..6a641df7 100644 --- a/recipes-tizen/bluetooth-frwk/bluetooth-frwk.inc +++ b/recipes-tizen/bluetooth-frwk/bluetooth-frwk.inc @@ -48,8 +48,7 @@ RDEPENDS_${PN} += "eglibc" DEPENDS = "" #DEPENDS of bluetooth-frwk DEPENDS += "status" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "tethering" DEPENDS += "libxml2" DEPENDS += "dbus" @@ -102,6 +101,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . \ -DTZ_SYS_USER_GROUP=users \ -DLIBNOTIFY_SUPPORT=Off \ diff --git a/recipes-tizen/bluetooth-tools/bluetooth-tools.inc b/recipes-tizen/bluetooth-tools/bluetooth-tools.inc index 0a10dcb3..995ea0c5 100644 --- a/recipes-tizen/bluetooth-tools/bluetooth-tools.inc +++ b/recipes-tizen/bluetooth-tools/bluetooth-tools.inc @@ -30,8 +30,7 @@ RDEPENDS_${PN} += "tizen-platform-config-tools" DEPENDS = "" #DEPENDS of bluetooth-tools -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake do_prep() { cd ${S} @@ -68,6 +67,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DCMAKE_INSTALL_PREFIX=${prefix} make -j16 diff --git a/recipes-tizen/bluetooth/bluetooth.inc b/recipes-tizen/bluetooth/bluetooth.inc index 2c3529f9..eb23bfc1 100644 --- a/recipes-tizen/bluetooth/bluetooth.inc +++ b/recipes-tizen/bluetooth/bluetooth.inc @@ -27,8 +27,7 @@ RDEPENDS_capi-network-${PN}-dev += "capi-network-bluetooth" DEPENDS = "" #DEPENDS of capi-network-bluetooth -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "common" @@ -70,6 +69,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.1.39 -DMAJORVER=${MAJORVER} make -j16 diff --git a/recipes-tizen/bundle/bundle.inc b/recipes-tizen/bundle/bundle.inc index 2d428d80..facba95b 100644 --- a/recipes-tizen/bundle/bundle.inc +++ b/recipes-tizen/bundle/bundle.inc @@ -26,8 +26,7 @@ RDEPENDS_${PN}-dev += "bundle" DEPENDS = "" #DEPENDS of bundle -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "dlog" DEPENDS += "glib-2.0" @@ -65,6 +64,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/calendar-service/calendar-service.inc b/recipes-tizen/calendar-service/calendar-service.inc index 1fd26bda..ee8326ff 100644 --- a/recipes-tizen/calendar-service/calendar-service.inc +++ b/recipes-tizen/calendar-service/calendar-service.inc @@ -33,8 +33,7 @@ RDEPENDS_${PN}-dev += "alarm-manager" DEPENDS = "" #DEPENDS of calendar-service DEPENDS += "pims-ipc" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "contacts-service" DEPENDS += "bundle" DEPENDS += "tizen-platform-config" @@ -82,6 +81,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . diff --git a/recipes-tizen/com-core/com-core.inc b/recipes-tizen/com-core/com-core.inc index 6f92d8ef..503933a4 100644 --- a/recipes-tizen/com-core/com-core.inc +++ b/recipes-tizen/com-core/com-core.inc @@ -29,8 +29,7 @@ DEPENDS = "" #DEPENDS of libcom-core #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "systemd" DEPENDS += "dlog" DEPENDS += "glib-2.0" @@ -69,6 +68,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} make -j16 diff --git a/recipes-tizen/common/common.inc b/recipes-tizen/common/common.inc index b7b87574..b1f865ff 100644 --- a/recipes-tizen/common/common.inc +++ b/recipes-tizen/common/common.inc @@ -27,8 +27,7 @@ RDEPENDS_capi-base-${PN}-dev += "capi-base-common" DEPENDS = "" #DEPENDS of capi-base-common -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake do_prep() { cd ${S} @@ -63,6 +62,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/connection/connection.inc b/recipes-tizen/connection/connection.inc index 5ffa5981..a4a8c2b3 100644 --- a/recipes-tizen/connection/connection.inc +++ b/recipes-tizen/connection/connection.inc @@ -27,8 +27,7 @@ RDEPENDS_capi-network-${PN}-dev += "capi-network-connection" DEPENDS = "" #DEPENDS of capi-network-connection -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "common" @@ -71,6 +70,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.1.3_13 -DMAJORVER=${MAJORVER} make -j16 diff --git a/recipes-tizen/contacts-service/contacts-service.inc b/recipes-tizen/contacts-service/contacts-service.inc index 75f4c8b5..62b3d245 100644 --- a/recipes-tizen/contacts-service/contacts-service.inc +++ b/recipes-tizen/contacts-service/contacts-service.inc @@ -42,8 +42,7 @@ DEPENDS = "" DEPENDS += "pims-ipc" DEPENDS += "libexif" DEPENDS += "libaccounts-svc" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "tizen-platform-config" DEPENDS += "libtapi-legacy" DEPENDS += "dlog" @@ -92,6 +91,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DTZ_SYS_ETC=${sysconfdir} oe_runmake -j16 diff --git a/recipes-tizen/desktop-file-utils/desktop-file-utils.inc b/recipes-tizen/desktop-file-utils/desktop-file-utils.inc index 2ca38a6d..2ca8ef89 100644 --- a/recipes-tizen/desktop-file-utils/desktop-file-utils.inc +++ b/recipes-tizen/desktop-file-utils/desktop-file-utils.inc @@ -20,8 +20,7 @@ RDEPENDS = "" DEPENDS = "" #DEPENDS of desktop-file-utils DEPENDS += "xz" -DEPENDS_append_class-native = " pkgconfig-native" -DEPENDS_append_class-target = " pkgconfig-native" +inherit pkgconfig DEPENDS += "glib-2.0" do_prep() { diff --git a/recipes-tizen/device/device.inc b/recipes-tizen/device/device.inc index ce623c86..55a04b2a 100644 --- a/recipes-tizen/device/device.inc +++ b/recipes-tizen/device/device.inc @@ -28,8 +28,7 @@ RDEPENDS_capi-system-${PN}-dev += "capi-system-device" DEPENDS = "" #DEPENDS of capi-system-device DEPENDS += "system-server" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "common" DEPENDS += "dlog" DEPENDS += "vconf" @@ -68,6 +67,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.1.0 -DMAJORVER=${MAJORVER} oe_runmake -j16 diff --git a/recipes-tizen/dlt-daemon/dlt-daemon-extraconf.inc b/recipes-tizen/dlt-daemon/dlt-daemon-extraconf.inc index 451a4d2a..e69de29b 100644 --- a/recipes-tizen/dlt-daemon/dlt-daemon-extraconf.inc +++ b/recipes-tizen/dlt-daemon/dlt-daemon-extraconf.inc @@ -1,6 +0,0 @@ -inherit pkgconfig cmake - -EXTRA_OECMAKE += " -DWITH_SYSTEMD=ON \ - -DWITH_SYSTEMD_JOURNAL=ON \ - -DWITH_MAN=OFF \ - -DWITH_DLT_EXAMPLES=OFF " diff --git a/recipes-tizen/dlt-daemon/dlt-daemon.inc b/recipes-tizen/dlt-daemon/dlt-daemon.inc index d28da784..22a994c7 100644 --- a/recipes-tizen/dlt-daemon/dlt-daemon.inc +++ b/recipes-tizen/dlt-daemon/dlt-daemon.inc @@ -48,10 +48,8 @@ DEPENDS = "" DEPENDS += "systemd" DEPENDS += "dbus" DEPENDS += "zlib" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" -DEPENDS_append_class-native = " pkgconfig-native" -DEPENDS_append_class-target = " pkgconfig-native" +inherit tizen_cmake +inherit pkgconfig do_prep() { cd ${S} @@ -88,6 +86,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} -DWITH_SYSTEMD=ON -DWITH_SYSTEMD_JOURNAL=ON \ -DWITH_MAN=OFF -DWITH_DLT_EXAMPLES=OFF .. make -j16 diff --git a/recipes-tizen/download-provider/download-provider.inc b/recipes-tizen/download-provider/download-provider.inc index 77856523..b5193e43 100644 --- a/recipes-tizen/download-provider/download-provider.inc +++ b/recipes-tizen/download-provider/download-provider.inc @@ -34,8 +34,7 @@ RDEPENDS_${PN}-dev += "download-provider" DEPENDS = "" #DEPENDS of download-provider DEPENDS += "libwifi-direct" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "smack" #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext @@ -94,6 +93,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . \ -DBIN_INSTALL_DIR:PATH=${prefix}/bin \ -DPKG_NAME=download-provider \ diff --git a/recipes-tizen/drm-client/drm-client.inc b/recipes-tizen/drm-client/drm-client.inc index 084f2ff3..62be2fb2 100644 --- a/recipes-tizen/drm-client/drm-client.inc +++ b/recipes-tizen/drm-client/drm-client.inc @@ -26,8 +26,7 @@ RDEPENDS_${PN}-dev += "drm-client" DEPENDS = "" #DEPENDS of drm-client -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "common" DEPENDS += "dlog" DEPENDS += "glib-2.0" @@ -65,6 +64,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/favorites/favorites.inc b/recipes-tizen/favorites/favorites.inc index 8bbe469a..371f85c7 100644 --- a/recipes-tizen/favorites/favorites.inc +++ b/recipes-tizen/favorites/favorites.inc @@ -30,8 +30,7 @@ RDEPENDS_capi-web-${PN}-dev += "capi-web-favorites" DEPENDS = "" #DEPENDS of capi-web-favorites -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "evas" DEPENDS += "tizen-platform-config" DEPENDS += "dlog" @@ -72,6 +71,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DTZ_SYS_SHARE=${prefix}/share make -j16 diff --git a/recipes-tizen/genivi-audio-manager/genivi-audio-manager-extraconf.inc b/recipes-tizen/genivi-audio-manager/genivi-audio-manager-extraconf.inc index 458d20dd..88b50389 100644 --- a/recipes-tizen/genivi-audio-manager/genivi-audio-manager-extraconf.inc +++ b/recipes-tizen/genivi-audio-manager/genivi-audio-manager-extraconf.inc @@ -1,7 +1,3 @@ -inherit pkgconfig -inherit tizen_cmake - - LDFLAGS += "-lpthread" do_configure_prepend() { diff --git a/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc b/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc index dba7a465..75128f6e 100644 --- a/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc +++ b/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc @@ -32,8 +32,7 @@ DEPENDS = "" DEPENDS += "flex" DEPENDS += "systemd" DEPENDS += "dlt-daemon" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake inherit pythonnative DEPENDS += "dbus" DEPENDS += "zlib" @@ -80,6 +79,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} -DUSE_BUILD_LIBS=OFF \ -DWITH_TESTS=OFF \ -DWITH_ENABLED_IPC=DBUS \ diff --git a/recipes-tizen/heynoti/heynoti.inc b/recipes-tizen/heynoti/heynoti.inc index 81b82bcc..c2994a3e 100644 --- a/recipes-tizen/heynoti/heynoti.inc +++ b/recipes-tizen/heynoti/heynoti.inc @@ -28,8 +28,7 @@ DEPENDS = "" #DEPENDS of heynoti DEPENDS += "ecore" DEPENDS += "tizen-platform-config" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "dlog" DEPENDS += "glib-2.0" @@ -67,6 +66,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DCMAKE_BUILD_TYPE="Debug" diff --git a/recipes-tizen/ibus-hangul/ibus-hangul.inc b/recipes-tizen/ibus-hangul/ibus-hangul.inc index c4fde624..a14444eb 100644 --- a/recipes-tizen/ibus-hangul/ibus-hangul.inc +++ b/recipes-tizen/ibus-hangul/ibus-hangul.inc @@ -24,8 +24,7 @@ DEPENDS = "" #DEPENDS of ibus-hangul DEPENDS_append_class-native = " intltool-native" DEPENDS_append_class-target = " intltool-native" -DEPENDS_append_class-native = " pkgconfig-native" -DEPENDS_append_class-target = " pkgconfig-native" +inherit pkgconfig #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext DEPENDS += "ibus" diff --git a/recipes-tizen/ibus-libpinyin/ibus-libpinyin.inc b/recipes-tizen/ibus-libpinyin/ibus-libpinyin.inc index c7843dc4..4a90a76a 100644 --- a/recipes-tizen/ibus-libpinyin/ibus-libpinyin.inc +++ b/recipes-tizen/ibus-libpinyin/ibus-libpinyin.inc @@ -26,8 +26,7 @@ DEPENDS = "" DEPENDS_append_class-native = " intltool-native" DEPENDS_append_class-target = " intltool-native" DEPENDS += "libpinyin" -DEPENDS_append_class-native = " pkgconfig-native" -DEPENDS_append_class-target = " pkgconfig-native" +inherit pkgconfig #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext DEPENDS += "ibus" diff --git a/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin-extraconf.inc b/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin-extraconf.inc index e7224467..24f80f7d 100644 --- a/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin-extraconf.inc +++ b/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin-extraconf.inc @@ -1,3 +1 @@ -inherit pkgconfig cmake - B="${S}" diff --git a/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin.inc b/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin.inc index 8e1f6bb7..81d6f489 100644 --- a/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin.inc +++ b/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin.inc @@ -25,8 +25,7 @@ RDEPENDS_${PN} += "eglibc" DEPENDS = "" #DEPENDS of ico-vic-amb-plugin DEPENDS += "ico-uxf-utilities" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "json-c" DEPENDS += "app-core" DEPENDS += "automotive-message-broker" @@ -65,6 +64,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} make -j16 diff --git a/recipes-tizen/image-util/image-util.inc b/recipes-tizen/image-util/image-util.inc index 2286c270..40b8d4c6 100644 --- a/recipes-tizen/image-util/image-util.inc +++ b/recipes-tizen/image-util/image-util.inc @@ -31,8 +31,7 @@ RDEPENDS_capi-media-${PN}-dev += "common" DEPENDS = "" #DEPENDS of capi-media-image-util -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext DEPENDS += "libmm-common" @@ -74,6 +73,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.1.0 -DMAJORVER=${MAJORVER} oe_runmake -j16 diff --git a/recipes-tizen/libaccounts-svc/libaccounts-svc.inc b/recipes-tizen/libaccounts-svc/libaccounts-svc.inc index c0f1a4f3..81a496e5 100644 --- a/recipes-tizen/libaccounts-svc/libaccounts-svc.inc +++ b/recipes-tizen/libaccounts-svc/libaccounts-svc.inc @@ -32,8 +32,7 @@ RDEPENDS_${PN}-dev += "libaccounts-svc" DEPENDS = "" #DEPENDS of libaccounts-svc DEPENDS += "pkgmgr-info" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "libxml2" DEPENDS += "tizen-platform-config" DEPENDS += "aul" @@ -78,6 +77,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/libbullet/libbullet.inc b/recipes-tizen/libbullet/libbullet.inc index 554766aa..21a59f61 100644 --- a/recipes-tizen/libbullet/libbullet.inc +++ b/recipes-tizen/libbullet/libbullet.inc @@ -30,8 +30,7 @@ RDEPENDS_bullet-dev += "libbullet" DEPENDS = "" #DEPENDS of bullet -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake do_prep() { cd ${S} @@ -67,6 +66,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -G "Unix Makefiles" -DBUILD_SHARED_LIBS=ON -DBUILD_EXTRAS=OFF -DBUILD_DEMOS=OFF -DBUILD_CPU_DEMOS=OFF -DUSE_GRAPHICAL_BENCHMARK=OFF -DCMAKE_INSTALL_PREFIX=/usr -DUSE_GLUT=OFF make -j16 diff --git a/recipes-tizen/libdevice-node/libdevice-node.inc b/recipes-tizen/libdevice-node/libdevice-node.inc index d122c49f..0c1b1b65 100644 --- a/recipes-tizen/libdevice-node/libdevice-node.inc +++ b/recipes-tizen/libdevice-node/libdevice-node.inc @@ -26,8 +26,7 @@ RDEPENDS_${PN}-dev += "libdevice-node" DEPENDS = "" #DEPENDS of libdevice-node -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "vconf" DEPENDS += "dlog" @@ -63,6 +62,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/libmedia-service/libmedia-service.inc b/recipes-tizen/libmedia-service/libmedia-service.inc index 87fd5439..34e3a316 100644 --- a/recipes-tizen/libmedia-service/libmedia-service.inc +++ b/recipes-tizen/libmedia-service/libmedia-service.inc @@ -31,8 +31,7 @@ DEPENDS = "" #DEPENDS of libmedia-service DEPENDS += "libmm-fileinfo" DEPENDS += "libmedia-thumbnail" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "drm-client" DEPENDS += "tizen-platform-config" DEPENDS += "libmm-common" @@ -78,6 +77,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/libmedia-thumbnail/libmedia-thumbnail.inc b/recipes-tizen/libmedia-thumbnail/libmedia-thumbnail.inc index 6466cd0d..2560fc93 100644 --- a/recipes-tizen/libmedia-thumbnail/libmedia-thumbnail.inc +++ b/recipes-tizen/libmedia-thumbnail/libmedia-thumbnail.inc @@ -44,8 +44,7 @@ RDEPENDS_${PN}-test += "libmedia-thumbnail" DEPENDS = "" #DEPENDS of libmedia-thumbnail DEPENDS += "libmm-fileinfo" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "drm-client" DEPENDS += "evas" DEPENDS += "tizen-platform-config" @@ -92,6 +91,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/libnet-client/libnet-client.inc b/recipes-tizen/libnet-client/libnet-client.inc index 77009882..b29855bc 100644 --- a/recipes-tizen/libnet-client/libnet-client.inc +++ b/recipes-tizen/libnet-client/libnet-client.inc @@ -29,8 +29,7 @@ RDEPENDS_${PN} += "eglibc" DEPENDS = "" #DEPENDS of libnet-client -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "vconf" diff --git a/recipes-tizen/libprivilege-control/libprivilege-control.inc b/recipes-tizen/libprivilege-control/libprivilege-control.inc index ba6da7ec..fe740bc1 100644 --- a/recipes-tizen/libprivilege-control/libprivilege-control.inc +++ b/recipes-tizen/libprivilege-control/libprivilege-control.inc @@ -33,8 +33,7 @@ RDEPENDS_${PN}-dev += "libprivilege-control" DEPENDS = "" #DEPENDS of libprivilege-control -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "tizen-platform-config" DEPENDS += "dlog" DEPENDS += "libiri" @@ -77,6 +76,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DTZ_SYS_DB=${prefix}/dbspace \ diff --git a/recipes-tizen/librua/librua.inc b/recipes-tizen/librua/librua.inc index a1a2123b..4f7f350d 100644 --- a/recipes-tizen/librua/librua.inc +++ b/recipes-tizen/librua/librua.inc @@ -35,8 +35,7 @@ DEPENDS = "" #DEPENDS of librua DEPENDS += "sqlite3" DEPENDS += "tizen-platform-config" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "libslp-db-util" do_prep() { @@ -72,6 +71,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/libsf-common/libsf-common.inc b/recipes-tizen/libsf-common/libsf-common.inc index 48095928..8fb5e8c2 100644 --- a/recipes-tizen/libsf-common/libsf-common.inc +++ b/recipes-tizen/libsf-common/libsf-common.inc @@ -26,8 +26,7 @@ RDEPENDS_${PN}-dev += "libsf-common" DEPENDS = "" #DEPENDS of libsf-common -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "attr" DEPENDS += "dlog" @@ -64,6 +63,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/libslp-db-util/libslp-db-util.inc b/recipes-tizen/libslp-db-util/libslp-db-util.inc index 567e1647..817b5f48 100644 --- a/recipes-tizen/libslp-db-util/libslp-db-util.inc +++ b/recipes-tizen/libslp-db-util/libslp-db-util.inc @@ -27,8 +27,7 @@ RDEPENDS_${PN}-dev += "libslp-db-util" DEPENDS = "" #DEPENDS of libslp-db-util DEPENDS += "sqlite3" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "icu" DEPENDS += "dlog" DEPENDS += "glib-2.0" @@ -66,6 +65,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/libslp-memo/libslp-memo.inc b/recipes-tizen/libslp-memo/libslp-memo.inc index d0c84cde..6d78b822 100644 --- a/recipes-tizen/libslp-memo/libslp-memo.inc +++ b/recipes-tizen/libslp-memo/libslp-memo.inc @@ -26,8 +26,7 @@ RDEPENDS_${PN}-dev += "libslp-memo" DEPENDS = "" #DEPENDS of libslp-memo -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "tizen-platform-config" DEPENDS += "dlog" DEPENDS += "sqlite3" @@ -69,9 +68,9 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . - - make -j16 + oe_runmake -j16 @@ -129,6 +128,7 @@ PACKAGES += " libslp-memo-dev " libslp-memo_files = "" libslp-memo_files += "${prefix}/lib/*.so.*" +MANIFESTFILES_${PN} = "libslp-memo.manifest" libslp-memo-dev_files = "" libslp-memo-dev_files += "${prefix}/lib/*.so" diff --git a/recipes-tizen/libslp-memo/libslp-memo_git.bb b/recipes-tizen/libslp-memo/libslp-memo_git.bb index 15a59e65..075a6492 100644 --- a/recipes-tizen/libslp-memo/libslp-memo_git.bb +++ b/recipes-tizen/libslp-memo/libslp-memo_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/apps/core/preloaded/libslp-memo;tag=442e794292a7868f493f20d80438f13ff0e1db26;nobranch=1" +SRC_URI += "git://review.tizen.org/apps/core/preloaded/libslp-memo;tag=5b9cfdc3280cb1aeb694a0fcfadd0c8512492187;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/libslp-sensor/libslp-sensor.inc b/recipes-tizen/libslp-sensor/libslp-sensor.inc index 5eeacf8d..f3fd713d 100644 --- a/recipes-tizen/libslp-sensor/libslp-sensor.inc +++ b/recipes-tizen/libslp-sensor/libslp-sensor.inc @@ -28,8 +28,7 @@ RDEPENDS_sensor-dev += "sensor" DEPENDS = "" #DEPENDS of sensor DEPENDS += "libsf-common" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "vconf" DEPENDS += "glib-2.0" @@ -66,6 +65,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . diff --git a/recipes-tizen/libsvi/libsvi.inc b/recipes-tizen/libsvi/libsvi.inc index 89a8c418..bc084ef0 100644 --- a/recipes-tizen/libsvi/libsvi.inc +++ b/recipes-tizen/libsvi/libsvi.inc @@ -48,8 +48,7 @@ RDEPENDS_${PN}-dev += "libsvi" DEPENDS = "" #DEPENDS of libfeedback DEPENDS += "libmm-sound" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "libxml2" DEPENDS += "tizen-platform-config" DEPENDS += "dlog" @@ -93,6 +92,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . oe_runmake diff --git a/recipes-tizen/libtapi-legacy/libtapi-legacy.inc b/recipes-tizen/libtapi-legacy/libtapi-legacy.inc index fb1fb1db..9dd8d7ea 100644 --- a/recipes-tizen/libtapi-legacy/libtapi-legacy.inc +++ b/recipes-tizen/libtapi-legacy/libtapi-legacy.inc @@ -30,8 +30,7 @@ RDEPENDS_libtapi-dev += "libtapi" DEPENDS = "" #DEPENDS of libtapi -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "security-server" DEPENDS += "libtapi" DEPENDS += "glib-2.0" @@ -71,6 +70,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/libtapi/libtapi.inc b/recipes-tizen/libtapi/libtapi.inc index 5ae0b961..5e190ea9 100644 --- a/recipes-tizen/libtapi/libtapi.inc +++ b/recipes-tizen/libtapi/libtapi.inc @@ -27,8 +27,7 @@ RDEPENDS_${PN}3-dev += "libtapi3" DEPENDS = "" #DEPENDS of libtapi3 -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake inherit pythonnative DEPENDS += "security-server" DEPENDS += "dlog" @@ -68,6 +67,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DTAPI_VERSION=3.0.1 make -j16 diff --git a/recipes-tizen/libtbm/libtbm.inc b/recipes-tizen/libtbm/libtbm.inc index 722126ad..febe2bf0 100644 --- a/recipes-tizen/libtbm/libtbm.inc +++ b/recipes-tizen/libtbm/libtbm.inc @@ -30,8 +30,7 @@ DEPENDS = "" DEPENDS += "wayland" DEPENDS += "libdrm" DEPENDS += "libpthread-stubs" -DEPENDS_append_class-native = " pkgconfig-native" -DEPENDS_append_class-target = " pkgconfig-native" +inherit pkgconfig DEPENDS += "common" do_prep() { diff --git a/recipes-tizen/libwbxml2/libwbxml2.inc b/recipes-tizen/libwbxml2/libwbxml2.inc index a96f19f0..6f1f3043 100644 --- a/recipes-tizen/libwbxml2/libwbxml2.inc +++ b/recipes-tizen/libwbxml2/libwbxml2.inc @@ -38,12 +38,10 @@ RDEPENDS_${PN}-dev += "expat" DEPENDS = "" #DEPENDS of libwbxml2 DEPENDS += "expat" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "libxml2" DEPENDS += "zlib" -DEPENDS_append_class-native = " pkgconfig-native" -DEPENDS_append_class-target = " pkgconfig-native" +inherit pkgconfig DEPENDS += "popt" do_prep() { @@ -68,7 +66,9 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - mkdir build + BUILD_SRC=$(pwd) + + mkdir -p build pushd build CFLAGS="$CFLAGS" \ CXXFLAGS="$CFLAGS" \ @@ -83,11 +83,12 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} \ -DCMAKE_BUILD_TYPE=None \ -DENABLE_INSTALL_DOC:BOOL=OFF \ - ${WORKDIR}/libwbxml-0.11.2 - make -j16 VERBOSE=1 + ${BUILD_SRC} + oe_runmake -j16 VERBOSE=1 popd diff --git a/recipes-tizen/libwbxml2/libwbxml2_git.bb b/recipes-tizen/libwbxml2/libwbxml2_git.bb index 86329ba7..d9ea953b 100644 --- a/recipes-tizen/libwbxml2/libwbxml2_git.bb +++ b/recipes-tizen/libwbxml2/libwbxml2_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/upstream/libwbxml2;tag=549574b031e0796f9708a91239b06297f1c88653;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/libwbxml2;tag=717cf1e3430cacd4c0ba04394b8f60f1e4ad4900;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/libwebsockets/libwebsockets-extraconf.inc b/recipes-tizen/libwebsockets/libwebsockets-extraconf.inc index dc1eef68..e69de29b 100644 --- a/recipes-tizen/libwebsockets/libwebsockets-extraconf.inc +++ b/recipes-tizen/libwebsockets/libwebsockets-extraconf.inc @@ -1,19 +0,0 @@ -inherit pkgconfig cmake - -EXTRA_OECMAKE += " -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ - -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \ - -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \ - -DLIB_INSTALL_DIR:PATH=${prefix}/lib \ - -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ - -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DWITH_SSL=On \ - -DWITH_SD_DAEMON=ON " - -cmake_do_install_append() { - rm -f ${D}${infodir}/dir - find ${D} -regex ".*\.la$" | xargs rm -f -- - find ${D} -regex ".*\.a$" | xargs rm -f -- -} diff --git a/recipes-tizen/libwebsockets/libwebsockets.inc b/recipes-tizen/libwebsockets/libwebsockets.inc index 682e105b..d8d4375b 100644 --- a/recipes-tizen/libwebsockets/libwebsockets.inc +++ b/recipes-tizen/libwebsockets/libwebsockets.inc @@ -31,8 +31,7 @@ DEPENDS = "" #DEPENDS of libwebsockets DEPENDS += "systemd" DEPENDS += "zlib" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "openssl" do_prep() { @@ -68,6 +67,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} -DWITH_SSL=On -DWITH_SD_DAEMON=ON oe_runmake -j16 diff --git a/recipes-tizen/libwifi-direct/libwifi-direct.inc b/recipes-tizen/libwifi-direct/libwifi-direct.inc index 625bcbb1..1f6fb07c 100644 --- a/recipes-tizen/libwifi-direct/libwifi-direct.inc +++ b/recipes-tizen/libwifi-direct/libwifi-direct.inc @@ -28,8 +28,7 @@ DEPENDS = "" #DEPENDS of libwifi-direct #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "dlog" DEPENDS += "dbus-glib" DEPENDS += "vconf" @@ -69,6 +68,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . diff --git a/recipes-tizen/location-manager/location-manager.inc b/recipes-tizen/location-manager/location-manager.inc index 37815de5..549a3762 100644 --- a/recipes-tizen/location-manager/location-manager.inc +++ b/recipes-tizen/location-manager/location-manager.inc @@ -27,8 +27,7 @@ RDEPENDS_capi-${PN}-dev += "capi-location-manager" DEPENDS = "" #DEPENDS of capi-location-manager -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "common" DEPENDS += "dlog" DEPENDS += "libslp-location" @@ -67,6 +66,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.1.11 -DMAJORVER=${MAJORVER} oe_runmake -j16 diff --git a/recipes-tizen/lua/lua.inc b/recipes-tizen/lua/lua.inc index 9b2fe63f..f4915e21 100644 --- a/recipes-tizen/lua/lua.inc +++ b/recipes-tizen/lua/lua.inc @@ -36,8 +36,7 @@ DEPENDS = "" #DEPENDS of lua DEPENDS_append_class-native = " readline-native" DEPENDS_append_class-target = " readline-native" -DEPENDS_append_class-native = " pkgconfig-native" -DEPENDS_append_class-target = " pkgconfig-native" +inherit pkgconfig do_prep() { cd ${S} diff --git a/recipes-tizen/media-content/media-content.inc b/recipes-tizen/media-content/media-content.inc index 93b73aa1..79096b08 100644 --- a/recipes-tizen/media-content/media-content.inc +++ b/recipes-tizen/media-content/media-content.inc @@ -28,8 +28,7 @@ RDEPENDS_capi-content-${PN}-dev += "capi-content-media-content" DEPENDS = "" #DEPENDS of capi-content-media-content DEPENDS += "libmedia-thumbnail" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "tizen-platform-config" DEPENDS += "dlog" DEPENDS += "media-server" @@ -70,6 +69,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.2.58 -DMAJORVER=${MAJORVER} oe_runmake -j16 diff --git a/recipes-tizen/msg-service/msg-service.inc b/recipes-tizen/msg-service/msg-service.inc index 6ac031e2..061246b2 100644 --- a/recipes-tizen/msg-service/msg-service.inc +++ b/recipes-tizen/msg-service/msg-service.inc @@ -66,8 +66,7 @@ DEPENDS += "curl" DEPENDS += "libmm-session" DEPENDS += "libmm-fileinfo" DEPENDS += "systemd" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "drm-client" DEPENDS += "notification" DEPENDS += "app-svc" @@ -124,6 +123,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . \ -DTZ_SYS_SHARE=${prefix}/share \ -DUNITDIR_USER=${systemd_unitdir}/user \ diff --git a/recipes-tizen/net-config/net-config.inc b/recipes-tizen/net-config/net-config.inc index 16f1498b..56a2e93d 100644 --- a/recipes-tizen/net-config/net-config.inc +++ b/recipes-tizen/net-config/net-config.inc @@ -24,8 +24,7 @@ RDEPENDS_${PN} += "vconf" DEPENDS = "" #DEPENDS of net-config DEPENDS += "libwifi-direct" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "syspopup" DEPENDS += "libtapi-legacy" DEPENDS += "dlog" @@ -68,6 +67,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DCMAKE_INSTALL_PREFIX=${prefix} make -j16 diff --git a/recipes-tizen/nfc-manager-neard/nfc-manager-neard.inc b/recipes-tizen/nfc-manager-neard/nfc-manager-neard.inc index 4594cab0..42870782 100644 --- a/recipes-tizen/nfc-manager-neard/nfc-manager-neard.inc +++ b/recipes-tizen/nfc-manager-neard/nfc-manager-neard.inc @@ -44,8 +44,7 @@ DEPENDS = "" DEPENDS += "security-server" DEPENDS += "libtapi-legacy" DEPENDS += "curl" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "slp-pkgmgr" DEPENDS += "app-svc" DEPENDS += "aul" @@ -103,6 +102,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DMAJORVER=${MAJORVER} -DFULLVER=0.1.6 \ -DWAYLAND_SUPPORT=On \ -DX11_SUPPORT=Off diff --git a/recipes-tizen/nfc/nfc.inc b/recipes-tizen/nfc/nfc.inc index dfae8e54..ce397cfa 100644 --- a/recipes-tizen/nfc/nfc.inc +++ b/recipes-tizen/nfc/nfc.inc @@ -30,8 +30,7 @@ RDEPENDS_capi-network-${PN}-dev += "capi-network-nfc" DEPENDS = "" #DEPENDS of capi-network-nfc -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "vconf" DEPENDS += "dlog" DEPENDS += "glib-2.0" @@ -73,6 +72,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.1.5 -DMAJORVER=${MAJORVER} \ -DX11_SUPPORT=Off diff --git a/recipes-tizen/notification/notification.inc b/recipes-tizen/notification/notification.inc index 608746c2..6b7cc85d 100644 --- a/recipes-tizen/notification/notification.inc +++ b/recipes-tizen/notification/notification.inc @@ -38,8 +38,7 @@ RDEPENDS_${PN}-dev += "notification" DEPENDS = "" #DEPENDS of notification -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "dbus-glib" DEPENDS += "eina" DEPENDS += "dbus" @@ -89,6 +88,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/package-manager/package-manager.inc b/recipes-tizen/package-manager/package-manager.inc index b6a61723..04e09d4b 100644 --- a/recipes-tizen/package-manager/package-manager.inc +++ b/recipes-tizen/package-manager/package-manager.inc @@ -27,8 +27,7 @@ RDEPENDS_capi-appfw-${PN}-dev += "capi-appfw-package-manager" DEPENDS = "" #DEPENDS of capi-appfw-package-manager -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "slp-pkgmgr" DEPENDS += "tizen-platform-config" DEPENDS += "aul" @@ -73,6 +72,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.0.30 -DMAJORVER=${MAJORVER} make -j16 diff --git a/recipes-tizen/phoned/phoned.inc b/recipes-tizen/phoned/phoned.inc index a660332a..ab37fdf6 100644 --- a/recipes-tizen/phoned/phoned.inc +++ b/recipes-tizen/phoned/phoned.inc @@ -19,8 +19,7 @@ RDEPENDS = "" DEPENDS = "" #DEPENDS of phoned -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "evolution-data-server" DEPENDS += "dbus" DEPENDS += "expat" @@ -64,6 +63,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DCMAKE_INSTALL_PREFIX=${prefix} -DENABLE_TIME_TRACER="OFF" make -j16 VERBOSE=1 diff --git a/recipes-tizen/pims-ipc/pims-ipc.inc b/recipes-tizen/pims-ipc/pims-ipc.inc index 096d3542..c1cb32ce 100644 --- a/recipes-tizen/pims-ipc/pims-ipc.inc +++ b/recipes-tizen/pims-ipc/pims-ipc.inc @@ -27,8 +27,7 @@ RDEPENDS_${PN}-dev += "pims-ipc" DEPENDS = "" #DEPENDS of pims-ipc DEPENDS += "systemd" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "zeromq" DEPENDS += "dlog" DEPENDS += "glib-2.0" @@ -67,6 +66,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/pkgmgr-info/pkgmgr-info.inc b/recipes-tizen/pkgmgr-info/pkgmgr-info.inc index 5fb99b2b..c1489b6d 100644 --- a/recipes-tizen/pkgmgr-info/pkgmgr-info.inc +++ b/recipes-tizen/pkgmgr-info/pkgmgr-info.inc @@ -41,8 +41,7 @@ RDEPENDS_${PN}-parser-dev += "pkgmgr-info" DEPENDS = "" #DEPENDS of pkgmgr-info -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "libxml2" DEPENDS += "dbus" DEPENDS += "tizen-platform-config" @@ -86,6 +85,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/power/power.inc b/recipes-tizen/power/power.inc index de26b9e5..bc184bfd 100644 --- a/recipes-tizen/power/power.inc +++ b/recipes-tizen/power/power.inc @@ -27,8 +27,7 @@ RDEPENDS_capi-system-${PN}-dev += "capi-system-power" DEPENDS = "" #DEPENDS of capi-system-power -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "system-server" @@ -69,6 +68,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.1.1 -DMAJORVER=${MAJORVER} oe_runmake -j16 diff --git a/recipes-tizen/privacy-manager/privacy-manager.inc b/recipes-tizen/privacy-manager/privacy-manager.inc index 1c945bc1..88b496e7 100644 --- a/recipes-tizen/privacy-manager/privacy-manager.inc +++ b/recipes-tizen/privacy-manager/privacy-manager.inc @@ -61,8 +61,7 @@ DEPENDS = "" DEPENDS += "pkgmgr-info" #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "libxml2" DEPENDS += "dbus" DEPENDS += "dlog" @@ -113,6 +112,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DPREFIX=${prefix} \ -DEXEC_PREFIX=${prefix} \ -DLIBDIR=${prefix}/lib \ diff --git a/recipes-tizen/runtime-info/runtime-info.inc b/recipes-tizen/runtime-info/runtime-info.inc index 2fbbd535..a0648c3d 100644 --- a/recipes-tizen/runtime-info/runtime-info.inc +++ b/recipes-tizen/runtime-info/runtime-info.inc @@ -28,8 +28,7 @@ RDEPENDS_capi-system-${PN}-dev += "capi-system-runtime-info" DEPENDS = "" #DEPENDS of capi-system-runtime-info -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "vconf" DEPENDS += "dlog" DEPENDS += "common" @@ -69,6 +68,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.0.3 -DMAJORVER=${MAJORVER} diff --git a/recipes-tizen/security-server/security-server-extraconf.inc b/recipes-tizen/security-server/security-server-extraconf.inc index da66f809..116cbb26 100644 --- a/recipes-tizen/security-server/security-server-extraconf.inc +++ b/recipes-tizen/security-server/security-server-extraconf.inc @@ -1,5 +1,3 @@ -#inherit cmake - B = "${S}" SRC_URI += "file://0001-PATCH-link-to-the-pthread-library.patch" diff --git a/recipes-tizen/security-server/security-server.inc b/recipes-tizen/security-server/security-server.inc index d256cf69..964343de 100644 --- a/recipes-tizen/security-server/security-server.inc +++ b/recipes-tizen/security-server/security-server.inc @@ -53,8 +53,7 @@ RDEPENDS_${PN} += "systemd" DEPENDS = "" #DEPENDS of security-server DEPENDS += "systemd" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "attr" DEPENDS += "zip" DEPENDS += "openssl" @@ -100,6 +99,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DVERSION=0.1.1 \ -DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_VERBOSE_MAKEFILE=ON \ diff --git a/recipes-tizen/sensor/sensor.inc b/recipes-tizen/sensor/sensor.inc index 940de96a..8d9667d9 100644 --- a/recipes-tizen/sensor/sensor.inc +++ b/recipes-tizen/sensor/sensor.inc @@ -27,8 +27,7 @@ RDEPENDS_capi-system-${PN}-dev += "capi-system-sensor" DEPENDS = "" #DEPENDS of capi-system-sensor -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "libslp-sensor" DEPENDS += "dlog" DEPENDS += "common" @@ -68,6 +67,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.1.17 -DMAJORVER=${MAJORVER} diff --git a/recipes-tizen/slp-pkgmgr/slp-pkgmgr.inc b/recipes-tizen/slp-pkgmgr/slp-pkgmgr.inc index 47305111..4862a203 100644 --- a/recipes-tizen/slp-pkgmgr/slp-pkgmgr.inc +++ b/recipes-tizen/slp-pkgmgr/slp-pkgmgr.inc @@ -71,8 +71,7 @@ DEPENDS += "pkgmgr-info" #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext DEPENDS += "unzip" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "iniparser" DEPENDS += "dbus" DEPENDS += "security-server" @@ -118,6 +117,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . \ -DX11_SUPPORT=Off diff --git a/recipes-tizen/smack/smack.inc b/recipes-tizen/smack/smack.inc index 819b3ce1..2a75f311 100644 --- a/recipes-tizen/smack/smack.inc +++ b/recipes-tizen/smack/smack.inc @@ -38,8 +38,7 @@ DEPENDS_append_class-native = " autoconf-native" DEPENDS_append_class-target = " autoconf-native" DEPENDS_append_class-native = " libtool" DEPENDS_append_class-target = " libtool-cross" -DEPENDS_append_class-native = " pkgconfig-native" -DEPENDS_append_class-target = " pkgconfig-native" +inherit pkgconfig DEPENDS_append_class-native = " automake-native" DEPENDS_append_class-target = " automake-native" diff --git a/recipes-tizen/sound-manager/sound-manager.inc b/recipes-tizen/sound-manager/sound-manager.inc index 66474b1d..aa379f83 100644 --- a/recipes-tizen/sound-manager/sound-manager.inc +++ b/recipes-tizen/sound-manager/sound-manager.inc @@ -28,8 +28,7 @@ RDEPENDS_capi-media-${PN}-dev += "capi-media-sound-manager" DEPENDS = "" #DEPENDS of capi-media-sound-manager DEPENDS += "libmm-sound" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "libmm-session" DEPENDS += "dlog" DEPENDS += "common" @@ -68,6 +67,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.1.1 -DMAJORVER=${MAJORVER} oe_runmake -j16 diff --git a/recipes-tizen/status/status.inc b/recipes-tizen/status/status.inc index 8a476c14..08f6a7b5 100644 --- a/recipes-tizen/status/status.inc +++ b/recipes-tizen/status/status.inc @@ -30,8 +30,7 @@ RDEPENDS_${PN}-dev += "status" DEPENDS = "" #DEPENDS of status DEPENDS += "dbus" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "vconf" DEPENDS += "dlog" DEPENDS += "aul" @@ -70,6 +69,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/sync-agent/sync-agent.inc b/recipes-tizen/sync-agent/sync-agent.inc index 997c6dd1..7f88f4b4 100644 --- a/recipes-tizen/sync-agent/sync-agent.inc +++ b/recipes-tizen/sync-agent/sync-agent.inc @@ -40,8 +40,7 @@ DEPENDS += "libgcrypt" DEPENDS += "curl" DEPENDS += "dbus-glib" DEPENDS += "libsoup-2.4" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "app-svc" DEPENDS += "aul" DEPENDS += "dlog" @@ -99,6 +98,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . diff --git a/recipes-tizen/syspopup/syspopup.inc b/recipes-tizen/syspopup/syspopup.inc index 13dc9d4f..ad96a49c 100644 --- a/recipes-tizen/syspopup/syspopup.inc +++ b/recipes-tizen/syspopup/syspopup.inc @@ -41,8 +41,7 @@ RDEPENDS_${PN}-caller += "syspopup" DEPENDS = "" #DEPENDS of syspopup -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "evas" DEPENDS += "tizen-platform-config" DEPENDS += "aul" @@ -85,6 +84,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . \ -Dwith_wayland=TRUE \ -DEXTRA_CFLAGS=-fPIC diff --git a/recipes-tizen/system-info/system-info.inc b/recipes-tizen/system-info/system-info.inc index 5836423f..e501665e 100644 --- a/recipes-tizen/system-info/system-info.inc +++ b/recipes-tizen/system-info/system-info.inc @@ -27,8 +27,7 @@ RDEPENDS_capi-${PN}-dev += "capi-system-info" DEPENDS = "" #DEPENDS of capi-system-info -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "dlog" DEPENDS += "libxml2" DEPENDS += "iniparser" @@ -70,6 +69,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.2.0 -DMAJORVER=${MAJORVER} -DENABLE_WAYLAND=TRUE oe_runmake -j16 diff --git a/recipes-tizen/system-server/system-server-extraconf.inc b/recipes-tizen/system-server/system-server-extraconf.inc index 7c6ccac8..e69de29b 100644 --- a/recipes-tizen/system-server/system-server-extraconf.inc +++ b/recipes-tizen/system-server/system-server-extraconf.inc @@ -1,2 +0,0 @@ - -inherit tizen_cmake diff --git a/recipes-tizen/system-server/system-server.inc b/recipes-tizen/system-server/system-server.inc index 2e576881..a586db3b 100644 --- a/recipes-tizen/system-server/system-server.inc +++ b/recipes-tizen/system-server/system-server.inc @@ -116,8 +116,7 @@ DEPENDS = "" #DEPENDS of system-server DEPENDS += "smack" DEPENDS += "edbus" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "attr" DEPENDS += "notification" DEPENDS += "tizen-platform-config" @@ -175,6 +174,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . \ -DTZ_SYS_ETC=${sysconfdir} \ -DSYSTEMD_DIR=${systemd_unitdir}/system diff --git a/recipes-tizen/system-settings/system-settings.inc b/recipes-tizen/system-settings/system-settings.inc index ae7c3f2f..c14cb0d1 100644 --- a/recipes-tizen/system-settings/system-settings.inc +++ b/recipes-tizen/system-settings/system-settings.inc @@ -28,8 +28,7 @@ RDEPENDS_capi-system-${PN}-dev += "capi-system-system-settings" DEPENDS = "" #DEPENDS of capi-system-system-settings -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "fontconfig" DEPENDS += "tizen-platform-config" DEPENDS += "dlog" @@ -76,6 +75,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.0.2 -DMAJORVER=${MAJORVER} \ -DX11_SUPPORT=Off \ -DWAYLAND_SUPPORT=On diff --git a/recipes-tizen/systemd/systemd.inc b/recipes-tizen/systemd/systemd.inc index 93f462e8..e5046ab9 100644 --- a/recipes-tizen/systemd/systemd.inc +++ b/recipes-tizen/systemd/systemd.inc @@ -85,8 +85,7 @@ DEPENDS += "gperf" DEPENDS += "hwdata" DEPENDS += "dbus" DEPENDS += "usbutils" -DEPENDS_append_class-native = " pkgconfig-native" -DEPENDS_append_class-target = " pkgconfig-native" +inherit pkgconfig DEPENDS += "acl" DEPENDS += "xz" DEPENDS += "glib-2.0" diff --git a/recipes-tizen/tethering/tethering.inc b/recipes-tizen/tethering/tethering.inc index 1448c32d..a89b65c3 100644 --- a/recipes-tizen/tethering/tethering.inc +++ b/recipes-tizen/tethering/tethering.inc @@ -27,8 +27,7 @@ RDEPENDS_capi-network-${PN}-dev += "capi-network-tethering" DEPENDS = "" #DEPENDS of capi-network-tethering -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "common" @@ -68,6 +67,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DARCH=i586 make -j16 diff --git a/recipes-tizen/url-download/url-download.inc b/recipes-tizen/url-download/url-download.inc index 29f1fe7c..2b38ce0e 100644 --- a/recipes-tizen/url-download/url-download.inc +++ b/recipes-tizen/url-download/url-download.inc @@ -29,8 +29,7 @@ DEPENDS = "" #DEPENDS of capi-web-url-download DEPENDS += "bundle" DEPENDS += "download-provider" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "common" DEPENDS += "dlog" @@ -66,6 +65,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/vconf-internal-keys/vconf-internal-keys.inc b/recipes-tizen/vconf-internal-keys/vconf-internal-keys.inc index a0199c73..b32fea1b 100644 --- a/recipes-tizen/vconf-internal-keys/vconf-internal-keys.inc +++ b/recipes-tizen/vconf-internal-keys/vconf-internal-keys.inc @@ -23,8 +23,7 @@ RDEPENDS = "" DEPENDS = "" #DEPENDS of vconf-internal-keys -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake do_prep() { cd ${S} @@ -59,6 +58,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . make -j16 diff --git a/recipes-tizen/vconf/vconf.inc b/recipes-tizen/vconf/vconf.inc index eba2291f..5111d7a5 100644 --- a/recipes-tizen/vconf/vconf.inc +++ b/recipes-tizen/vconf/vconf.inc @@ -41,8 +41,7 @@ DEPENDS = "" #DEPENDS of vconf DEPENDS += "vconf-internal-keys" DEPENDS += "tizen-platform-config" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "dlog" DEPENDS += "glib-2.0" @@ -79,6 +78,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . \ -DTZ_SYS_CONFIG=${prefix}/kdb diff --git a/recipes-tizen/wav-player/wav-player.inc b/recipes-tizen/wav-player/wav-player.inc index 9cc56404..19602a64 100644 --- a/recipes-tizen/wav-player/wav-player.inc +++ b/recipes-tizen/wav-player/wav-player.inc @@ -28,8 +28,7 @@ RDEPENDS_capi-media-${PN}-dev += "capi-media-wav-player" DEPENDS = "" #DEPENDS of capi-media-wav-player DEPENDS += "libmm-sound" -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "common" DEPENDS += "dlog" DEPENDS += "sound-manager" @@ -68,6 +67,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.1.0 -DMAJORVER=${MAJORVER} oe_runmake -j16 diff --git a/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension-extraconf.inc b/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension-extraconf.inc index f53125f3..98d150f0 100644 --- a/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension-extraconf.inc +++ b/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension-extraconf.inc @@ -1,21 +1,8 @@ -inherit pkgconfig cmake - DEPENDS += "wayland-native" DEPENDS += "weston-ivi-shell" RPROVIDES_genivi-shell += "wayland-ivi-extension" -EXTRA_OECMAKE += " \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ - -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \ - -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \ - -DLIB_INSTALL_DIR:PATH=${prefix}/lib \ - -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ - -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - " do_prep() { @@ -30,23 +17,6 @@ cmake_do_configure_prepend() { ${STAGING_BINDIR_NATIVE}/wayland-scanner code < protocol/ivi-controller.xml > protocol/ivi-controller-protocol.c } -cmake_do_install_append() { - - rm -f ${D}${infodir}/dir - - find ${D} -regex ".*\.la$" | xargs rm -f -- - find ${D} -regex ".*\.a$" | xargs rm -f -- - - install -d ${D}/${prefix}/share/genivi-shell/protocol/ - pwd - install -m 644 ${S}/protocol/ivi-application.xml ${D}/${prefix}/share/genivi-shell/protocol/ - install -m 644 ${S}/protocol/ivi-controller.xml ${D}/${prefix}/share/genivi-shell/protocol/ - install -m 644 protocol/ivi-application-server-protocol.h ${D}/${prefix}/share/genivi-shell/protocol/ - install -m 644 protocol/ivi-application-protocol.c ${D}/${prefix}/share/genivi-shell/protocol/ - install -m 644 protocol/ivi-controller-server-protocol.h ${D}/${prefix}/share/genivi-shell/protocol/ - install -m 644 protocol/ivi-controller-protocol.c ${D}/${prefix}/share/genivi-shell/protocol/ -} - PACKAGES += " genivi-shell-dbg " FILES_genivi-shell-dbg = "${prefix}/lib/weston/.debug/ivi-controller.so" diff --git a/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc b/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc index e7a605ab..81eb79b8 100644 --- a/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc +++ b/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc @@ -28,8 +28,7 @@ RDEPENDS_genivi-shell-dev += "wayland-ivi-extension" DEPENDS = "" #DEPENDS of genivi-shell -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "libxkbcommon" DEPENDS += "cairo" DEPENDS += "weston-ivi-shell" @@ -64,6 +63,7 @@ do_prep() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . diff --git a/recipes-tizen/weston-common/weston-common.inc b/recipes-tizen/weston-common/weston-common.inc index f4089a7c..c7751b69 100644 --- a/recipes-tizen/weston-common/weston-common.inc +++ b/recipes-tizen/weston-common/weston-common.inc @@ -39,8 +39,7 @@ DEPENDS += "weston" DEPENDS += "libxkbcommon" DEPENDS += "libjpeg-turbo" DEPENDS += "glib-2.0" -DEPENDS_append_class-native = " pkgconfig-native" -DEPENDS_append_class-target = " pkgconfig-native" +inherit pkgconfig DEPENDS_append_class-native = " automake-native" DEPENDS_append_class-target = " automake-native" DEPENDS += "xz" diff --git a/recipes-tizen/weston-ivi-shell/weston-ivi-shell.inc b/recipes-tizen/weston-ivi-shell/weston-ivi-shell.inc index 36e9b35c..2527034b 100644 --- a/recipes-tizen/weston-ivi-shell/weston-ivi-shell.inc +++ b/recipes-tizen/weston-ivi-shell/weston-ivi-shell.inc @@ -45,8 +45,7 @@ DEPENDS = "" DEPENDS += "mtdev" DEPENDS += "libxkbcommon" DEPENDS += "libjpeg-turbo" -DEPENDS_append_class-native = " pkgconfig-native" -DEPENDS_append_class-target = " pkgconfig-native" +inherit pkgconfig DEPENDS_append_class-native = " automake-native" DEPENDS_append_class-target = " automake-native" DEPENDS += "weston" diff --git a/recipes-tizen/weston/weston.inc b/recipes-tizen/weston/weston.inc index 78a2f97b..4d7aee3d 100644 --- a/recipes-tizen/weston/weston.inc +++ b/recipes-tizen/weston/weston.inc @@ -44,8 +44,7 @@ DEPENDS += "xz" DEPENDS += "poppler" DEPENDS += "mesa" DEPENDS += "systemd" -DEPENDS_append_class-native = " pkgconfig-native" -DEPENDS_append_class-target = " pkgconfig-native" +inherit pkgconfig DEPENDS += "glib-2.0" DEPENDS += "wayland" DEPENDS += "pixman" diff --git a/recipes-tizen/wifi/wifi.inc b/recipes-tizen/wifi/wifi.inc index 0929c2c5..32a74235 100644 --- a/recipes-tizen/wifi/wifi.inc +++ b/recipes-tizen/wifi/wifi.inc @@ -27,8 +27,7 @@ RDEPENDS_capi-network-${PN}-dev += "capi-network-wifi" DEPENDS = "" #DEPENDS of capi-network-wifi -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "common" @@ -70,6 +69,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DFULLVER=0.1.2_18 -DMAJORVER=${MAJORVER} make -j16 diff --git a/recipes-tizen/xdgmime/xdgmime.inc b/recipes-tizen/xdgmime/xdgmime.inc index 904d070c..4bf8d46a 100644 --- a/recipes-tizen/xdgmime/xdgmime.inc +++ b/recipes-tizen/xdgmime/xdgmime.inc @@ -26,8 +26,7 @@ RDEPENDS_${PN}-dev += "xdgmime" DEPENDS = "" #DEPENDS of xdgmime -DEPENDS_append_class-native = " cmake-native" -DEPENDS_append_class-target = " cmake-native" +inherit tizen_cmake do_prep() { cd ${S} @@ -62,6 +61,7 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . oe_runmake -j16 diff --git a/recipes-tizen/xmlsec1/xmlsec1-extraconf.inc b/recipes-tizen/xmlsec1/xmlsec1-extraconf.inc index e69de29b..5c58cfa9 100644 --- a/recipes-tizen/xmlsec1/xmlsec1-extraconf.inc +++ b/recipes-tizen/xmlsec1/xmlsec1-extraconf.inc @@ -0,0 +1 @@ +INSANE_SKIP_xmlsec1-dev-static = "staticdev"
\ No newline at end of file |