From 39e783decf0559165750d665a7bcf3d369f6e811 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 30 Mar 2010 11:11:55 +0200 Subject: scons bbclass: convert to new style staging --- classes/scons.bbclass | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'classes') diff --git a/classes/scons.bbclass b/classes/scons.bbclass index b139411c19..b7007b03a6 100644 --- a/classes/scons.bbclass +++ b/classes/scons.bbclass @@ -11,10 +11,4 @@ scons_do_install() { oefatal "scons install execution failed." } -scons_do_stage() { - install -d ${D}${prefix} - ${STAGING_BINDIR_NATIVE}/scons PREFIX=${STAGING_DIR_HOST}/${prefix} prefix=${STAGING_DIR_HOST}/${prefix} install || \ - oefatal "scons stage execution failed." -} - -EXPORT_FUNCTIONS do_compile do_install do_stage +EXPORT_FUNCTIONS do_compile do_install -- cgit v1.2.3 From 01d75b1a857f53f22304266e3d88c11993851563 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 30 Mar 2010 13:04:33 +0200 Subject: scons bbclass: add SCONS_FIX_ENV option that allows you to fix the toolchain from env --- classes/scons.bbclass | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/scons.bbclass b/classes/scons.bbclass index b7007b03a6..2a935e4685 100644 --- a/classes/scons.bbclass +++ b/classes/scons.bbclass @@ -1,8 +1,18 @@ DEPENDS += "python-scons-native" +export TARGET_LINK_HASH_STYLE + scons_do_compile() { - ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} || \ - oefatal "scons build execution failed." + if [ "${SCONS_FIX_ENV}" = "1" ] ; then + if grep "toolchain-from-env" ${S}/SConstruct ; then + echo "Toolchain overrides already applied" + else + cat ${STAGING_DATADIR_NATIVE}/scons/toolchain-from-env.SConscript >> ${S}/SConstruct + fi + fi + + ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} CXX="${CXX}" PREFIX=${prefix} prefix=${prefix} || \ + oefatal "scons build execution failed." } scons_do_install() { -- cgit v1.2.3 From 13c2cfea0ce4c35083daf6e71518975092d211bb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 1 Apr 2010 13:49:49 +0200 Subject: gnome bbclass: package polkit stuff into ${PN} by default --- classes/gnome.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass index 7e26e03104..36a9f3496b 100644 --- a/classes/gnome.bbclass +++ b/classes/gnome.bbclass @@ -12,7 +12,9 @@ FILES_${PN} += "${datadir}/application-registry \ ${datadir}/mime-info \ ${datadir}/mime/packages \ ${datadir}/mime/application \ - ${datadir}/gnome-2.0" + ${datadir}/gnome-2.0 \ + ${datadir}/polkit* \ +" inherit autotools gtk-icon-cache pkgconfig gconf mime -- cgit v1.2.3 From 61a4d2af2319ea876bc35ce0bca63eb2e0252431 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 1 Apr 2010 15:55:58 +0200 Subject: gnome bbclass: put devhelp stuff in -doc --- classes/gnome.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'classes') diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass index 36a9f3496b..57ff3672b2 100644 --- a/classes/gnome.bbclass +++ b/classes/gnome.bbclass @@ -16,6 +16,8 @@ FILES_${PN} += "${datadir}/application-registry \ ${datadir}/polkit* \ " +FILES_${PN}-doc += "${datadir}/devhelp" + inherit autotools gtk-icon-cache pkgconfig gconf mime AUTOTOOLS_STAGE_PKGCONFIG = "1" -- cgit v1.2.3 From 643e6207dd84d170df88527beb095de20a41a78d Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Thu, 1 Apr 2010 22:08:25 +0200 Subject: vala: prohibit PARALELL_MAKE --- classes/vala.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'classes') diff --git a/classes/vala.bbclass b/classes/vala.bbclass index 26339058c8..433b64e87e 100644 --- a/classes/vala.bbclass +++ b/classes/vala.bbclass @@ -1,3 +1,6 @@ +# Vala has problems with multiple concurrent invocations +PARALLEL_MAKE = "" + DEPENDS += "vala-native" FILES_${PN}-dev += "\ -- cgit v1.2.3 From 973169bb71ab44fa234ea65b409a2d45cf018112 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 1 Apr 2010 15:10:58 +0000 Subject: insane.bbclass: Switch to endswith() and fix la/pc check This changes insane.bbclass to use s.endswith("str") rather than s[-3:] == "str". The primary motivation for this is that we have tests that check for 'la' and 'pc' files when we really want '.la' and '.pc' to be what we check for. Also, our -dev symlink test does if test1: if test2 and test3: action, when it could just be if test1 and test2 and test3. Signed-off-by: Tom Rini Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz --- classes/insane.bbclass | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index c2e8d9cf1d..c85703eee2 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -263,11 +263,10 @@ def package_qa_check_dev(path, name,d, elf): if bb.data.inherits_class(s, d): return True - if not "-dev" in name: - if path[-3:] == ".so" and os.path.islink(path): - error_msg = "non -dev package contains symlink .so: %s path '%s'" % \ - (name, package_qa_clean_path(path,d)) - sane = package_qa_handle_error(0, error_msg, name, path, d) + if not name.endswith("-dev") and path.endswith(".so") and os.path.islink(path): + error_msg = "non -dev package contains symlink .so: %s path '%s'" % \ + (name, package_qa_clean_path(path,d)) + sane = package_qa_handle_error(0, error_msg, name, path, d) return sane @@ -412,7 +411,7 @@ def package_qa_check_staged(path,d): for root, dirs, files in os.walk(path): for file in files: path = os.path.join(root,file) - if file[-2:] == "la": + if file.endswith(".la"): file_content = open(path).read() # Don't check installed status for native/cross packages if not iscrossnative: @@ -422,7 +421,7 @@ def package_qa_check_staged(path,d): if workdir in file_content: error_msg = "%s failed sanity test (workdir) in path %s" % (file,root) sane = package_qa_handle_error(8, error_msg, "staging", path, d) - elif file[-2:] == "pc": + elif file.endswith(".pc"): file_content = open(path).read() if pkgconfigcheck in file_content: error_msg = "%s failed sanity test (tmpdir) in path %s" % (file,root) -- cgit v1.2.3