On Fri, Feb 28, 2014 at 01:51:31AM +0100, Andreas Oberritter wrote:
> Allows to install versions for Qt4/X11 and Qt4/Embedded into
> the same filesystem by overriding the target name.
>
> This version also removes a superflous .pc file from ${libdir}.
>
> Signed-off-by: Andreas Oberritter <[email protected]>
> ---
> meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
> b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
> index 77e70e8..3f91be2 100644
> --- a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
> +++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
> @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/nemomobile/libconnman-qt";
> SECTION = "qt/lib"
> LICENSE = "Apache-2.0"
> LIC_FILES_CHKSUM =
> "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
> -SRCREV = "ddbeaf72b4d3c49285b0513b28948edacfc40b51"
> -PV = "1.0.46+git${SRCPV}"
> +SRCREV = "80ac184d859ea90c026403f5a520644945a5081a"
> +PV = "1.0.50+git${SRCPV}"
>
> SRC_URI = "git://github.com/nemomobile/libconnman-qt.git;branch=master"
>
> @@ -12,7 +12,7 @@ S = "${WORKDIR}/git"
>
> inherit pkgconfig
>
> -EXTRA_QMAKEVARS_PRE += "CONFIG+=notests"
> +EXTRA_QMAKEVARS_PRE += "CONFIG+=notests TARGET_SUFFIX=${QT_DIR_NAME}"
>
> do_configure_prepend() {
> # Hack *.pro variables
> @@ -37,7 +37,6 @@ FILES_${PN}-dev = " \
> ${libdir}/libconnman-qt*${SOLIBSDEV} \
> ${libdir}/libconnman-qt*.prl \
> ${libdir}/pkgconfig/connman-qt*.pc \
> - ${libdir}/connman-qt*.pc \
> "
> FILES_${PN}-plugin = " \
> ${PLUGINS_TARGET}/qmldir \
> --
> 1.8.3.2last world build reports failure to build libconnman-qte with this, can you please look into it? | x86_64-oe-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemux86-64 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-rpath-link,/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -shared -o libConnmanQtDeclarative.so components.o networkingmodel.o technologymodel.o savedservicemodel.o moc_components.o moc_networkingmodel.o moc_technologymodel.o moc_savedservicemodel.o -L/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -L../libconnman-qt -lconnman-qt4 -lQtDeclarativeE -lQtScriptE -lQtSvgE -lQtSqlE -lQtXmlPatternsE -lQtGuiE -lQtNetworkE -lQtDBusE -lQtXmlE -lQtCoreE -lpthread | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/core2-64-oe-linux/gcc/x86_64-oe-linux/4.8.2/ld: error: cannot find -lconnman-qt4 | collect2: error: ld returned 1 exit status | make[1]: *** [libConnmanQtDeclarative.so] Error 1 | make[1]: Leaving directory `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/libconnman-qte/1.0.50+gitAUTOINC+80ac184d85-r0/git/plugin' | make: *** [sub-plugin-make_default-ordered] Error 2 | ERROR: oe_runmake failed | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_compile (log file is located at /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/libconnman-qte/1.0.50+gitAUTOINC+80ac184d85-r0/temp/log.do_compile.15974) (link to full log in last State of bitbake world, Failed tasks 2014-03-11 e-mail) -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
