From: Ronan Le Martret Date: Tue, 13 May 2014 11:11:01 +0000 (+0200) Subject: remove CMAKE_TOOLCHAIN_FILE for cmake build X-Git-Tag: demo_release_0.1~121 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd747e6c38c84e88b06b7acf1e69f1cd4b63ce07;p=scm%2Fbb%2Fmeta-tizen.git remove CMAKE_TOOLCHAIN_FILE for cmake build Change-Id: I69936299ea751ad19b8ee145673e970fd353f71d --- diff --git a/recipes-tizen/ail/ail.inc b/recipes-tizen/ail/ail.inc index d32496b..ea98294 100644 --- a/recipes-tizen/ail/ail.inc +++ b/recipes-tizen/ail/ail.inc @@ -73,8 +73,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . -DBUILD_PKGTYPE=rpm \ + -DBUILD_SHARED_LIBS:BOOL=ON . -DBUILD_PKGTYPE=rpm \ -DSMACK=Off make -j16 diff --git a/recipes-tizen/alarm-manager/alarm-manager.inc b/recipes-tizen/alarm-manager/alarm-manager.inc index da8fc18..f44ba4c 100644 --- a/recipes-tizen/alarm-manager/alarm-manager.inc +++ b/recipes-tizen/alarm-manager/alarm-manager.inc @@ -41,11 +41,10 @@ DEPENDS += "dbus" DEPENDS += "app-svc" DEPENDS += "security-server" DEPENDS += "bundle" -DEPENDS += "glib-2.0" +DEPENDS += "libtapi-legacy" DEPENDS += "dlog" DEPENDS += "libslp-pm" DEPENDS += "heynoti" -DEPENDS += "libtapi-legacy" DEPENDS += "vconf" DEPENDS += "libslp-db-util" diff --git a/recipes-tizen/app-checker/app-checker.inc b/recipes-tizen/app-checker/app-checker.inc index b39bdd0..7b1fa7a 100644 --- a/recipes-tizen/app-checker/app-checker.inc +++ b/recipes-tizen/app-checker/app-checker.inc @@ -38,7 +38,6 @@ DEPENDS = "" #DEPENDS of app-checker DEPENDS_append_class-native = " cmake-native" DEPENDS += "dlog" -DEPENDS += "glib-2.0" do_prep() { cd ${S} @@ -80,8 +79,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/app-core/app-core.inc b/recipes-tizen/app-core/app-core.inc index 3c74fe1..82516e3 100644 --- a/recipes-tizen/app-core/app-core.inc +++ b/recipes-tizen/app-core/app-core.inc @@ -54,7 +54,6 @@ DEPENDS += "aul-1" DEPENDS_append_class-native = " cmake-native" DEPENDS += "librua" DEPENDS += "dlog" -DEPENDS += "glib-2.0" DEPENDS += "libslp-sensor" DEPENDS += "elementary" DEPENDS += "ecore" @@ -98,8 +97,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . \ + -DBUILD_SHARED_LIBS:BOOL=ON . \ -Dwith_wayland=TRUE\ -DENABLE_GTK=OFF diff --git a/recipes-tizen/app-svc/app-svc.inc b/recipes-tizen/app-svc/app-svc.inc index 588544a..109c182 100644 --- a/recipes-tizen/app-svc/app-svc.inc +++ b/recipes-tizen/app-svc/app-svc.inc @@ -33,7 +33,6 @@ DEPENDS_append_class-native = " cmake-native" DEPENDS += "iniparser" DEPENDS += "dbus" DEPENDS += "bundle" -DEPENDS += "glib-2.0" DEPENDS += "xdgmime" DEPENDS += "ail" DEPENDS += "dlog" @@ -80,8 +79,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . \ + -DBUILD_SHARED_LIBS:BOOL=ON . \ -Dwith_wayland=TRUE make -j16 diff --git a/recipes-tizen/appcore-agent/appcore-agent.inc b/recipes-tizen/appcore-agent/appcore-agent.inc index c012392..45fa512 100644 --- a/recipes-tizen/appcore-agent/appcore-agent.inc +++ b/recipes-tizen/appcore-agent/appcore-agent.inc @@ -27,7 +27,6 @@ DEPENDS = "" DEPENDS += "aul-1" DEPENDS_append_class-native = " cmake-native" DEPENDS += "dlog" -DEPENDS += "glib-2.0" DEPENDS += "application" DEPENDS += "libslp-sysman" DEPENDS += "libslp-pm" @@ -71,8 +70,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/application/application.inc b/recipes-tizen/application/application.inc index 97adf50..8335de8 100644 --- a/recipes-tizen/application/application.inc +++ b/recipes-tizen/application/application.inc @@ -76,8 +76,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . -DFULLVER=0.1.0 -DMAJORVER=${MAJORVER} + -DBUILD_SHARED_LIBS:BOOL=ON . -DFULLVER=0.1.0 -DMAJORVER=${MAJORVER} make -j16 diff --git a/recipes-tizen/audio-session-manager/audio-session-manager.inc b/recipes-tizen/audio-session-manager/audio-session-manager.inc index 0bbefce..debad0d 100644 --- a/recipes-tizen/audio-session-manager/audio-session-manager.inc +++ b/recipes-tizen/audio-session-manager/audio-session-manager.inc @@ -37,7 +37,6 @@ DEPENDS = "" DEPENDS += "avsystem" DEPENDS += "libmm-common" DEPENDS += "security-server" -DEPENDS += "glib-2.0" DEPENDS += "libslp-sysman" DEPENDS += "vconf" diff --git a/recipes-tizen/aul-1/aul-1.inc b/recipes-tizen/aul-1/aul-1.inc index f5e1e1b..f0880f7 100644 --- a/recipes-tizen/aul-1/aul-1.inc +++ b/recipes-tizen/aul-1/aul-1.inc @@ -84,8 +84,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . -DWITH_WAYLAND=On + -DBUILD_SHARED_LIBS:BOOL=ON . -DWITH_WAYLAND=On make -j16 diff --git a/recipes-tizen/bundle/bundle.inc b/recipes-tizen/bundle/bundle.inc index 78fa554..8e529db 100644 --- a/recipes-tizen/bundle/bundle.inc +++ b/recipes-tizen/bundle/bundle.inc @@ -26,7 +26,6 @@ DEPENDS = "" #DEPENDS of bundle DEPENDS_append_class-native = " cmake-native" DEPENDS += "dlog" -DEPENDS += "glib-2.0" do_prep() { cd ${S} @@ -67,8 +66,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/com-core/com-core.inc b/recipes-tizen/com-core/com-core.inc index ccb4625..e1a3607 100644 --- a/recipes-tizen/com-core/com-core.inc +++ b/recipes-tizen/com-core/com-core.inc @@ -26,10 +26,9 @@ DEPENDS = "" #DEPENDS of libcom-core #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext -DEPENDS_append_class-native = " cmake-native" DEPENDS += "systemd" +DEPENDS_append_class-native = " cmake-native" DEPENDS += "dlog" -DEPENDS += "glib-2.0" do_prep() { cd ${S} @@ -70,8 +69,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake + -DBUILD_SHARED_LIBS:BOOL=ON make -j16 diff --git a/recipes-tizen/common/common.inc b/recipes-tizen/common/common.inc index eb3fc3d..5bdf328 100644 --- a/recipes-tizen/common/common.inc +++ b/recipes-tizen/common/common.inc @@ -64,8 +64,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/crosswalk/crosswalk.inc b/recipes-tizen/crosswalk/crosswalk.inc index 2085773..4d5c77a 100644 --- a/recipes-tizen/crosswalk/crosswalk.inc +++ b/recipes-tizen/crosswalk/crosswalk.inc @@ -42,7 +42,6 @@ DEPENDS += "freetype" DEPENDS += "gperf" inherit pythonnative DEPENDS += "pkgmgr-info" -DEPENDS += "glib-2.0" DEPENDS += "libdrm" DEPENDS += "python-xml" DEPENDS_append_class-native = " ninja-native" diff --git a/recipes-tizen/heynoti/heynoti.inc b/recipes-tizen/heynoti/heynoti.inc index 6469cc5..da54cd2 100644 --- a/recipes-tizen/heynoti/heynoti.inc +++ b/recipes-tizen/heynoti/heynoti.inc @@ -27,7 +27,6 @@ DEPENDS = "" DEPENDS += "ecore" DEPENDS_append_class-native = " cmake-native" DEPENDS += "dlog" -DEPENDS += "glib-2.0" do_prep() { cd ${S} @@ -68,8 +67,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . -DCMAKE_BUILD_TYPE="Debug" + -DBUILD_SHARED_LIBS:BOOL=ON . -DCMAKE_BUILD_TYPE="Debug" make -j16 diff --git a/recipes-tizen/libdevice-node/libdevice-node.inc b/recipes-tizen/libdevice-node/libdevice-node.inc index b2c88e4..41c59dc 100644 --- a/recipes-tizen/libdevice-node/libdevice-node.inc +++ b/recipes-tizen/libdevice-node/libdevice-node.inc @@ -65,8 +65,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/libhaptic/libhaptic.inc b/recipes-tizen/libhaptic/libhaptic.inc index 6b2c2d1..6864938 100644 --- a/recipes-tizen/libhaptic/libhaptic.inc +++ b/recipes-tizen/libhaptic/libhaptic.inc @@ -70,8 +70,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/libmm-common/libmm-common.inc b/recipes-tizen/libmm-common/libmm-common.inc index 27ab79d..ea4b1d6 100644 --- a/recipes-tizen/libmm-common/libmm-common.inc +++ b/recipes-tizen/libmm-common/libmm-common.inc @@ -25,7 +25,6 @@ RDEPENDS_${PN}-dev += "libmm-common" DEPENDS = "" #DEPENDS of libmm-common DEPENDS += "libmm-log" -DEPENDS += "glib-2.0" do_prep() { cd ${S} diff --git a/recipes-tizen/libmm-sound/libmm-sound.inc b/recipes-tizen/libmm-sound/libmm-sound.inc index f41e692..a4b909d 100644 --- a/recipes-tizen/libmm-sound/libmm-sound.inc +++ b/recipes-tizen/libmm-sound/libmm-sound.inc @@ -45,7 +45,6 @@ DEPENDS += "libmm-common" DEPENDS += "audio-session-manager" DEPENDS += "libmm-log" DEPENDS += "security-server" -DEPENDS += "glib-2.0" DEPENDS += "vconf" DEPENDS += "libslp-sysman" DEPENDS += "heynoti" diff --git a/recipes-tizen/libprivilege-control/libprivilege-control.inc b/recipes-tizen/libprivilege-control/libprivilege-control.inc index 2d832fa..2ff5afa 100644 --- a/recipes-tizen/libprivilege-control/libprivilege-control.inc +++ b/recipes-tizen/libprivilege-control/libprivilege-control.inc @@ -77,8 +77,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . -DCMAKE_BUILD_TYPE=RELEASE \ + -DBUILD_SHARED_LIBS:BOOL=ON . -DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_VERBOSE_MAKEFILE=ON VERBOSE=1 make -j16 diff --git a/recipes-tizen/librua/librua.inc b/recipes-tizen/librua/librua.inc index 05b49dc..a3882ef 100644 --- a/recipes-tizen/librua/librua.inc +++ b/recipes-tizen/librua/librua.inc @@ -67,8 +67,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/libsf-common/libsf-common.inc b/recipes-tizen/libsf-common/libsf-common.inc index 58b1488..d42169c 100644 --- a/recipes-tizen/libsf-common/libsf-common.inc +++ b/recipes-tizen/libsf-common/libsf-common.inc @@ -66,8 +66,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . 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 6e84c4a..98dc210 100644 --- a/recipes-tizen/libslp-db-util/libslp-db-util.inc +++ b/recipes-tizen/libslp-db-util/libslp-db-util.inc @@ -28,7 +28,6 @@ DEPENDS += "sqlite3" DEPENDS_append_class-native = " cmake-native" DEPENDS += "icu" DEPENDS += "dlog" -DEPENDS += "glib-2.0" do_prep() { cd ${S} @@ -68,8 +67,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/libslp-pm/libslp-pm.inc b/recipes-tizen/libslp-pm/libslp-pm.inc index 1850705..eeee89b 100644 --- a/recipes-tizen/libslp-pm/libslp-pm.inc +++ b/recipes-tizen/libslp-pm/libslp-pm.inc @@ -65,8 +65,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/libslp-sensor/libslp-sensor.inc b/recipes-tizen/libslp-sensor/libslp-sensor.inc index 7a594f8..2d40a22 100644 --- a/recipes-tizen/libslp-sensor/libslp-sensor.inc +++ b/recipes-tizen/libslp-sensor/libslp-sensor.inc @@ -27,7 +27,6 @@ DEPENDS = "" DEPENDS += "libsf-common" DEPENDS_append_class-native = " cmake-native" DEPENDS += "vconf" -DEPENDS += "glib-2.0" do_prep() { cd ${S} @@ -67,8 +66,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/libslp-sysman/libslp-sysman.inc b/recipes-tizen/libslp-sysman/libslp-sysman.inc index 117e03c..fcebdc4 100644 --- a/recipes-tizen/libslp-sysman/libslp-sysman.inc +++ b/recipes-tizen/libslp-sysman/libslp-sysman.inc @@ -73,8 +73,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/libtapi-legacy/libtapi-legacy.inc b/recipes-tizen/libtapi-legacy/libtapi-legacy.inc index f50550c..b45b04b 100644 --- a/recipes-tizen/libtapi-legacy/libtapi-legacy.inc +++ b/recipes-tizen/libtapi-legacy/libtapi-legacy.inc @@ -31,7 +31,6 @@ DEPENDS += "libtapi" DEPENDS_append_class-native = " cmake-native" DEPENDS += "security-server" DEPENDS += "dlog" -DEPENDS += "glib-2.0" do_prep() { cd ${S} @@ -72,8 +71,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/libtapi/libtapi.inc b/recipes-tizen/libtapi/libtapi.inc index 94ac1eb..8879e30 100644 --- a/recipes-tizen/libtapi/libtapi.inc +++ b/recipes-tizen/libtapi/libtapi.inc @@ -27,7 +27,6 @@ DEPENDS = "" DEPENDS_append_class-native = " cmake-native" DEPENDS += "security-server" DEPENDS += "dlog" -DEPENDS += "glib-2.0" do_prep() { cd ${S} @@ -68,8 +67,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/location-manager/location-manager.inc b/recipes-tizen/location-manager/location-manager.inc index e34f51f..f1be30c 100644 --- a/recipes-tizen/location-manager/location-manager.inc +++ b/recipes-tizen/location-manager/location-manager.inc @@ -68,8 +68,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . -DFULLVER=0.1.11 -DMAJORVER=${MAJORVER} + -DBUILD_SHARED_LIBS:BOOL=ON . -DFULLVER=0.1.11 -DMAJORVER=${MAJORVER} make -j16 diff --git a/recipes-tizen/lua/lua-extraconf.inc b/recipes-tizen/lua/lua-extraconf.inc index fe730b2..e69de29 100644 --- a/recipes-tizen/lua/lua-extraconf.inc +++ b/recipes-tizen/lua/lua-extraconf.inc @@ -1,38 +0,0 @@ -TARGET_CC_ARCH += " -fPIC ${LDFLAGS}" -EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -DLUA_USE_LINUX -fPIC' MYLDFLAGS='${LDFLAGS}' V=5.1" - -BBCLASSEXTEND = "nativesdk" - -do_configure_prepend() { - sed -i -e s:/usr/local:${prefix}:g ${S}/src/luaconf.h - sed -i -e s:lib/lua/5.1/:${base_libdir}/lua/5.1/:g ${S}/src/luaconf.h -} - -B = "${S}" - -do_compile () { - pwd - oe_runmake linux -} - -do_install () { - oe_runmake \ - 'INSTALL_TOP=${D}${prefix}' \ - 'INSTALL_BIN=${D}${bindir}' \ - 'INSTALL_INC=${D}${includedir}/' \ - 'INSTALL_MAN=${D}${mandir}/man1' \ - 'INSTALL_SHARE=${D}${datadir}/lua' \ - 'INSTALL_LIB=${D}${libdir}' \ - 'INSTALL_CMOD=${D}${libdir}/lua/5.1' \ - install - install -d ${D}${libdir}/pkgconfig - install -m 0644 ${S}/etc/lua.pc ${D}${libdir}/pkgconfig/lua.pc - rmdir ${D}${libdir}/lua/5.1 - rmdir ${D}${libdir}/lua - rmdir ${D}${datadir}/lua/5.1 - rmdir ${D}${datadir}/lua - - rm ${D}${bindir}/luac -} - -lua-doc_files += "/usr/share/man/man1" diff --git a/recipes-tizen/notification/notification.inc b/recipes-tizen/notification/notification.inc index d5ba5c5..709d7cf 100644 --- a/recipes-tizen/notification/notification.inc +++ b/recipes-tizen/notification/notification.inc @@ -79,8 +79,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/pkgmgr-info/pkgmgr-info.inc b/recipes-tizen/pkgmgr-info/pkgmgr-info.inc index 1427aa5..4cfab94 100644 --- a/recipes-tizen/pkgmgr-info/pkgmgr-info.inc +++ b/recipes-tizen/pkgmgr-info/pkgmgr-info.inc @@ -82,8 +82,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/privacy-manager/privacy-manager.inc b/recipes-tizen/privacy-manager/privacy-manager.inc index 746fa7f..09b6aad 100644 --- a/recipes-tizen/privacy-manager/privacy-manager.inc +++ b/recipes-tizen/privacy-manager/privacy-manager.inc @@ -58,7 +58,6 @@ DEPENDS_append_class-native = " cmake-native" DEPENDS += "libxml2" DEPENDS += "dbus" DEPENDS += "dlog" -DEPENDS += "glib-2.0" DEPENDS += "system-info" DEPENDS += "common" DEPENDS += "sqlite3" @@ -108,8 +107,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . -DPREFIX=${prefix} \ + -DBUILD_SHARED_LIBS:BOOL=ON . -DPREFIX=${prefix} \ -DEXEC_PREFIX=${prefix} \ -DLIBDIR=${prefix}/lib \ -DINCLUDEDIR=${prefix}/include \ diff --git a/recipes-tizen/python-rpm/python-rpm-extraconf.inc b/recipes-tizen/python-rpm/python-rpm-extraconf.inc index 5a9d332..e69de29 100644 --- a/recipes-tizen/python-rpm/python-rpm-extraconf.inc +++ b/recipes-tizen/python-rpm/python-rpm-extraconf.inc @@ -1,112 +0,0 @@ -SRC_URI += "file://pythondeps.sh \ - file://fix-python-rpm-conf.patch \ - file://rpmmodule.c.patch \ - " - -BBCLASSEXTEND_append = " nativesdk " - -do_prep() { - cd ${S} - chmod -Rf a+rX,u+w,g-w,o-w ${S} - #setup -q -n rpm-4.11.0.1 - ### PREP BEGIN ### - cp ${S}/packaging/rpm.manifest . - rm -rf sqlite - tar xjf ${S}/packaging/db-4.8.30.tar.bz2 - ln -s db-4.8.30 db - chmod -R u+w db/* - # will get linked from db3 - rm -f rpmdb/db.h - patch -p0 < ${S}/packaging/db-4.8.30-integration.dif - - if [ -s /etc/rpm/tizen_macros ]; then - cp -a /etc/rpm/tizen_macros ${S}/packaging/rpm-tizen_macros - fi - cp -a ${S}/packaging/rpm-tizen_macros tizen_macros - rm -f m4/libtool.m4 - rm -f m4/lt*.m4 - ### PREP END ### - - -} - -do_compile_prepend() { - cd ${S} - LANG=C - export LANG - unset DISPLAY - CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables" ; export CFLAGS ; - CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; - FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; - LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - ### BUILD BEGIN ### - CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss` " - export CPPFLAGS - export CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -ffunction-sections" - export LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic-functions -ffunction-sections" - - export CCFLAGS+=" -fPIC " - export CXXFLAGS+=" -fPIC " - export CFLAGS+=" -fPIC " - - cd db3 - ./configure --build=${TARGET_SYS} --host=x86_64-linux-gnu - cd .. - - cp db3/configure db3/configure.ac -} - -do_compile() { - cd ${S} - LANG=C - export LANG - unset DISPLAY - CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables" ; export CFLAGS ; - CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; - FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; - LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - ### BUILD BEGIN ### - CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss` " - CPPFLAGS="$CPPFLAGS `pkg-config --cflags python`" - export CPPFLAGS - export CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -ffunction-sections" - export LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic-functions -ffunction-sections" - - BUILDTARGET="--build=x86_64-tizen-linux --host=x86_64-linux-gnu " - - autoreconf -i -f - export CFLAGS+=" -DRPM_VENDOR_OE " - ./configure \ - --sysconfdir=${sysconfdir} \ - --prefix=${prefix} \ - --mandir=${prefix}/share/man \ - --infodir=${prefix}/share/info \ - --libdir=${prefix}/lib \ - --sysconfdir=/${sysconfdir} \ - --localstatedir=/${localstatedir} \ - --disable-dependency-tracking \ - --with-lua \ - --with-acl \ - --with-cap \ - --enable-shared \ - --enable-python \ - --with-python-inc-dir=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \ - --with-python-lib-dir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ - --with-msm \ - $BUILDTARGET - - make -j16 - ### BUILD END ### - -} - -FILES_${PN}-dbg += "\ - ${libdir}/python2.7/site-packages/rpm/.debug/* \ - " - - - - - diff --git a/recipes-tizen/rpm/rpm-extraconf.inc b/recipes-tizen/rpm/rpm-extraconf.inc index 247c59d..e69de29 100644 --- a/recipes-tizen/rpm/rpm-extraconf.inc +++ b/recipes-tizen/rpm/rpm-extraconf.inc @@ -1,140 +0,0 @@ -SRC_URI += "file://disable_debuginfo.patch \ - file://disable_shortcircuited.patch \ - file://fix_libdir.patch \ - file://rpm-scriptetexechelp.patch \ - file://rpmmodule.c.patch " - -DEPENDS += "popt-native" -DEPENDS += "uthash-native" -DEPENDS += "smack-native" -DEPENDS += "acl-native" -DEPENDS += "lua-native" - -CFLAGS_append = " -DRPM_VENDOR_OE " - -do_compile_prepend() { - cd ${S} - LANG=C - export LANG - unset DISPLAY - CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables" ; export CFLAGS ; - CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; - FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; - LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - ### BUILD BEGIN ### - CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`" - export CPPFLAGS - export CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -ffunction-sections" - export LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic-functions -ffunction-sections" - - export CCFLAGS+=" -fPIC " - export CXXFLAGS+=" -fPIC " - export CFLAGS+=" -fPIC " - cd db3 - ./configure --build=${TARGET_SYS} --host=x86_64-linux-gnu - cd .. - - cp db3/configure db3/configure.ac - - export CFLAGS+=" -DRPM_VENDOR_OE " -} -do_install_append() { - mkdir -p ${D}${prefix}/lib/rpm/bin - ln -s ../debugedit ${D}${prefix}/lib/rpm/bin/debugedit - ln -s ../rpmdeps ${D}${prefix}/lib/rpm/bin/rpmdeps-oecore -} - -do_install() { - echo export RPM_BUILD_ROOT=${D} - cd ${S} - LANG=C - export LANG - unset DISPLAY - rm -rf ${D} - mkdir -p ${D} - - mkdir -p ${D}${prefix}/lib - mkdir -p ${D}${prefix}/share/locale - ln -s ../share/locale ${D}${prefix}/lib/locale - - oe_runmake \ - DESTDIR=${D} \ - INSTALL_ROOT=${D} \ - BINDIR=${prefix}/bin \ - install - rm -f ${D}${infodir}/dir - find ${D} -regex ".*\.la$" | xargs rm -f -- - find ${D} -regex ".*\.a$" | xargs rm -f -- - install -m 644 db3/db.h ${D}${prefix}/include/rpm - # remove .la file and the static variant of libpopt - # have to remove the dependency from other .la files as well - #for f in ${D}/${prefix}/lib/*.la; do - # sed -i -e "s,/lib/libpopt.la,-lpopt,g" $f - #done - mkdir -p ${D}${sysconfdir}/rpm - cp -a tizen_macros ${D}${prefix}/lib/rpm - mkdir -p ${D}${prefix}/lib/rpm/tizen - install -m 755 ${S}/packaging/find-docs.sh ${D}${prefix}/lib/rpm/tizen - install -m 755 ${S}/packaging/find-provides.ksyms ${D}${prefix}/lib/rpm - install -m 644 ${S}/packaging/device-sec-policy ${D}${sysconfdir}/device-sec-policy - install -m 644 ${S}/packaging/device-sec-policy ${D}${prefix}/lib/rpm-plugins/msm-device-sec-policy - ln -s ../tizen_macros ${D}${prefix}/lib/rpm/tizen/macros - for d in BUILD RPMS SOURCES SPECS SRPMS BUILDROOT ; do - mkdir -p ${D}${prefix}/src/packages/$d - chmod 755 ${D}${prefix}/src/packages/$d - done - for d in ${D}${prefix}/lib/rpm/platform/*-linux/macros ; do - dd=${d%-linux/macros} - dd=${dd##*/} - mkdir ${D}${prefix}/src/packages/RPMS/$dd - chmod 755 ${D}${prefix}/src/packages/RPMS/$dd - done - mkdir -p ${D}${localstatedir}/lib/rpm - gzip -9 ${D}${mandir}/man[18]/*.[18] - export RPM_BUILD_ROOT - chmod 755 doc/manual - rm -rf doc/manual/Makefile* - rm -f ${D}/usr/lib/rpmpopt - rm -rf ${D}${mandir}/{fr,ja,ko,pl,ru,sk} - rm -f ${D}${prefix}/share/locale/de/LC_MESSAGES/rpm.mo - rm -f ${D}${prefix}/lib/rpm/cpanflute ${D}${prefix}/lib/rpm/cpanflute2 - install -m 755 scripts/find-supplements{,.ksyms} ${D}${prefix}/lib/rpm - install -m 755 scripts/firmware.prov ${D}${prefix}/lib/rpm - install -m 755 scripts/debuginfo.prov ${D}${prefix}/lib/rpm - rm -f ${D}${prefix}/lib/locale ${D}/usr/lib/rpmrc - mkdir -p ${D}${sysconfdir}/rpm - chmod 755 ${D}${sysconfdir}/rpm - mkdir -p ${D}${prefix}/lib/rpm/macros.d - # remove some nonsense or non-working scripts - pushd ${D}${prefix}/lib/rpm/ - for f in rpm2cpio.sh rpm.daily rpmdiff* rpm.log rpm.xinetd freshen.sh u_pkg.sh \ - magic magic.mgc magic.mime* rpmfile *.pl javadeps brp-redhat \ - brp-strip-static-archive vpkg-provides*.sh http.req sql.req tcl.req \ - rpmdb_* brp-sparc64-linux brp-strip-comment-note brp-java-gcjcompile - do - rm -f $f - done - for i in ${prefix}/share/automake-*/*; do - if test -f "$i" && test -f "${i##*/}"; then - rm -f "${i##*/}" - fi - done - popd - rm -rf ${D}/${prefix}/lib/python2.7 - rm -f ${D}${prefix}/lib/*.la - rm -f ${D}${prefix}/lib/rpm-plugins/*.la - - rm ${D}${prefix}/bin/rpmgraph - rm -fr ${D}${localstatedir}/tmp - rm -fr ${D}${localstatedir}/volatile -} - -FILES_${PN}-dbg += "\ - ${libdir}/rpm-plugins/.debug/* \ - " - - -DEPENDS_native += "popt-native" -DEPENDS_native += "uthash-native" -DEPENDS_native += "smack-native" \ No newline at end of file diff --git a/recipes-tizen/security-server/security-server.inc b/recipes-tizen/security-server/security-server.inc index adb0a44..997e779 100644 --- a/recipes-tizen/security-server/security-server.inc +++ b/recipes-tizen/security-server/security-server.inc @@ -99,8 +99,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . -DVERSION=0.0.118 \ + -DBUILD_SHARED_LIBS:BOOL=ON . -DVERSION=0.0.118 \ -DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_VERBOSE_MAKEFILE=ON make -j16 diff --git a/recipes-tizen/slp-pkgmgr/slp-pkgmgr.inc b/recipes-tizen/slp-pkgmgr/slp-pkgmgr.inc index c110d2a..ce756ae 100644 --- a/recipes-tizen/slp-pkgmgr/slp-pkgmgr.inc +++ b/recipes-tizen/slp-pkgmgr/slp-pkgmgr.inc @@ -107,8 +107,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . \ + -DBUILD_SHARED_LIBS:BOOL=ON . \ -DX11_SUPPORT=Off make -j16 diff --git a/recipes-tizen/smack/smack-extraconf.inc b/recipes-tizen/smack/smack-extraconf.inc index ebf05c2..e69de29 100644 --- a/recipes-tizen/smack/smack-extraconf.inc +++ b/recipes-tizen/smack/smack-extraconf.inc @@ -1 +0,0 @@ -BBCLASSEXTEND_append = " nativesdk " \ No newline at end of file diff --git a/recipes-tizen/sound-manager/sound-manager.inc b/recipes-tizen/sound-manager/sound-manager.inc index 0c7ea86..b51524b 100644 --- a/recipes-tizen/sound-manager/sound-manager.inc +++ b/recipes-tizen/sound-manager/sound-manager.inc @@ -70,8 +70,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . -DFULLVER=0.1.1 -DMAJORVER=${MAJORVER} + -DBUILD_SHARED_LIBS:BOOL=ON . -DFULLVER=0.1.1 -DMAJORVER=${MAJORVER} make -j16 diff --git a/recipes-tizen/system-info/system-info.inc b/recipes-tizen/system-info/system-info.inc index 23f00b0..7c40395 100644 --- a/recipes-tizen/system-info/system-info.inc +++ b/recipes-tizen/system-info/system-info.inc @@ -72,8 +72,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . -DFULLVER=0.2.0 -DMAJORVER=${MAJORVER} -DENABLE_WAYLAND=TRUE + -DBUILD_SHARED_LIBS:BOOL=ON . -DFULLVER=0.2.0 -DMAJORVER=${MAJORVER} -DENABLE_WAYLAND=TRUE make -j16 diff --git a/recipes-tizen/uthash/uthash-extraconf.inc b/recipes-tizen/uthash/uthash-extraconf.inc index ebf05c2..e69de29 100644 --- a/recipes-tizen/uthash/uthash-extraconf.inc +++ b/recipes-tizen/uthash/uthash-extraconf.inc @@ -1 +0,0 @@ -BBCLASSEXTEND_append = " nativesdk " \ No newline at end of file diff --git a/recipes-tizen/vconf-internal-keys/vconf-internal-keys.inc b/recipes-tizen/vconf-internal-keys/vconf-internal-keys.inc index 4661234..04e633d 100644 --- a/recipes-tizen/vconf-internal-keys/vconf-internal-keys.inc +++ b/recipes-tizen/vconf-internal-keys/vconf-internal-keys.inc @@ -61,8 +61,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/vconf/vconf.inc b/recipes-tizen/vconf/vconf.inc index b4b3c24..076cfc7 100644 --- a/recipes-tizen/vconf/vconf.inc +++ b/recipes-tizen/vconf/vconf.inc @@ -30,8 +30,8 @@ RDEPENDS_${PN} += "eglibc" RDEPENDS_${PN} += "systemd" #RDEPENDS of vconf-dev (${PN}-dev) +RDEPENDS_${PN}-dev += "eglibc" RDEPENDS_${PN}-dev += "vconf" -RDEPENDS_${PN}-dev += "glib-2.0" DEPENDS = "" @@ -39,7 +39,6 @@ DEPENDS = "" DEPENDS += "vconf-internal-keys" DEPENDS_append_class-native = " cmake-native" DEPENDS += "dlog" -DEPENDS += "glib-2.0" do_prep() { cd ${S} @@ -79,8 +78,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 diff --git a/recipes-tizen/weston-common/weston-common.inc b/recipes-tizen/weston-common/weston-common.inc index 39c5a49..6b16985 100644 --- a/recipes-tizen/weston-common/weston-common.inc +++ b/recipes-tizen/weston-common/weston-common.inc @@ -35,7 +35,6 @@ DEPENDS = "" DEPENDS += "weston" DEPENDS += "libxkbcommon" DEPENDS += "cairo" -DEPENDS += "glib-2.0" DEPENDS_append_class-native = " pkgconfig-native" DEPENDS += "jpeg" DEPENDS_append_class-native = " automake-native" diff --git a/recipes-tizen/xdgmime/xdgmime.inc b/recipes-tizen/xdgmime/xdgmime.inc index c290d79..368d04c 100644 --- a/recipes-tizen/xdgmime/xdgmime.inc +++ b/recipes-tizen/xdgmime/xdgmime.inc @@ -64,8 +64,7 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16