| Submitter | Kang Kai |
|---|---|
| Date | April 16, 2012, 2:20 a.m. |
| Message ID | <1334542833-27552-4-git-send-email-kai.kang@windriver.com> |
| Download | mbox | patch |
| Permalink | /patch/25881/ |
| State | Accepted |
| Headers | show |
Comments
2012/4/16 Kang Kai <kai.kang@windriver.com>: > qt4-native has been updated and open phonon and openssl support, > makekdewidgets could be successfully build. So build it. > > Signed-off-by: Kang Kai <kai.kang@windriver.com> > --- > recipes-kde-base/kdelibs4-native_git.bb | 14 ++++++-------- > 1 files changed, 6 insertions(+), 8 deletions(-) > > diff --git a/recipes-kde-base/kdelibs4-native_git.bb b/recipes-kde-base/kdelibs4-native_git.bb > index decba41..36241fa 100644 > --- a/recipes-kde-base/kdelibs4-native_git.bb > +++ b/recipes-kde-base/kdelibs4-native_git.bb > @@ -2,18 +2,15 @@ LICENSE = "GPLv2" > > LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24" > > -DEPENDS = "automoc4-native giflib-native attica-native perl-native" > -#strigi-native > -#soprano-native > -# jpeg-native libpng-native > - > +DEPENDS = "automoc4-native giflib-native attica-native perl-native libdbusmenu-qt-native" > > inherit kde_cmake kde_without_docs mime native perlnative > > - > SRC_URI = "git://anongit.kde.org/kdelibs.git;branch=v4.8.0 \ > file://0001-Don-t-build-documentation-disable-Strigi.patch \ > file://0002-Fix-openssl-check.patch \ > + file://0003-Fix-FindKDE4Internals-cmake-file.patch \ > + file://0004-Fix-the-path-to-Icemaker.patch \ > file://0005-Remove-docs-so-they-don-t-get-pulled-in-elsewhere.patch \ > " > > @@ -32,12 +29,13 @@ EXTRA_OECMAKE =+ "\ > -DKJS_FORCE_DISABLE_PCRE=TRUE \ > -DSTRIGI_REQUIRED=FALSE \ > -DSTRIGI_INCLUDE_DIR=TRUE \ > + -DOE_CROSSCOMPILING=FALSE \ > " > > do_compile() { > cd ${S}/build && make -C kdecore/kconfig_compiler > cd ${S}/build && make -C kjs icemaker > -# cd ${S}/build && oe_runmake CC="${CC}" CXX="${CXX}" > + cd ${S}/build && make -C kdewidgets makekdewidgets > } > > do_install() { > @@ -45,5 +43,5 @@ do_install() { > > install -m 0755 ${S}/build/bin/icemaker ${D}${bindir} > install -m 0755 ${S}/build/bin/kconfig_compiler ${D}${bindir} > -# install -m 0755 ${S}/build/bin/makekdewidgets ${D}${bindir} > + install -m 0755 ${S}/build/bin/makekdewidgets ${D}${bindir} > } > -- > 1.7.5.4 > Hi Kai, looks good. I applied this patch together with the adjustment of kdelibs4 and kde_cmake.bbclass.
Patch
diff --git a/recipes-kde-base/kdelibs4-native_git.bb b/recipes-kde-base/kdelibs4-native_git.bb index decba41..36241fa 100644 --- a/recipes-kde-base/kdelibs4-native_git.bb +++ b/recipes-kde-base/kdelibs4-native_git.bb @@ -2,18 +2,15 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24" -DEPENDS = "automoc4-native giflib-native attica-native perl-native" -#strigi-native -#soprano-native -# jpeg-native libpng-native - +DEPENDS = "automoc4-native giflib-native attica-native perl-native libdbusmenu-qt-native" inherit kde_cmake kde_without_docs mime native perlnative - SRC_URI = "git://anongit.kde.org/kdelibs.git;branch=v4.8.0 \ file://0001-Don-t-build-documentation-disable-Strigi.patch \ file://0002-Fix-openssl-check.patch \ + file://0003-Fix-FindKDE4Internals-cmake-file.patch \ + file://0004-Fix-the-path-to-Icemaker.patch \ file://0005-Remove-docs-so-they-don-t-get-pulled-in-elsewhere.patch \ " @@ -32,12 +29,13 @@ EXTRA_OECMAKE =+ "\ -DKJS_FORCE_DISABLE_PCRE=TRUE \ -DSTRIGI_REQUIRED=FALSE \ -DSTRIGI_INCLUDE_DIR=TRUE \ + -DOE_CROSSCOMPILING=FALSE \ " do_compile() { cd ${S}/build && make -C kdecore/kconfig_compiler cd ${S}/build && make -C kjs icemaker -# cd ${S}/build && oe_runmake CC="${CC}" CXX="${CXX}" + cd ${S}/build && make -C kdewidgets makekdewidgets } do_install() { @@ -45,5 +43,5 @@ do_install() { install -m 0755 ${S}/build/bin/icemaker ${D}${bindir} install -m 0755 ${S}/build/bin/kconfig_compiler ${D}${bindir} -# install -m 0755 ${S}/build/bin/makekdewidgets ${D}${bindir} + install -m 0755 ${S}/build/bin/makekdewidgets ${D}${bindir} }
qt4-native has been updated and open phonon and openssl support, makekdewidgets could be successfully build. So build it. Signed-off-by: Kang Kai <kai.kang@windriver.com> --- recipes-kde-base/kdelibs4-native_git.bb | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-)