meta: 3 fixes
cover meta: 3 fixes
The following changes since commit 818bcba063819b80d5a99827c5adb8ee157dbfe1:
build-appliance-image: Update to master head revision (2015-02-02 14:57:40 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/3fixes
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/3fixes
Robert Yang (3):
valgrind: depends on boost when ptest
gcc-configure-common.inc: remove ac_cv_path_SED
binconfig-disabled.bbclass: fix echo command
meta/classes/binconfig-disabled.bbclass | 2 +- meta/recipes-devtools/gcc/gcc-configure-common.inc | 1 - meta/recipes-devtools/valgrind/valgrind_3.10.1.bb | 4 +++- 3 files changed, 4 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/3 valgrind: depends on boost when ptest
Fixed:
drd/tests/boost_thread.cpp:5:38: fatal error: boost/thread/condition.hpp: No such file or directory
#include <boost/thread/condition.hpp>
--- meta/recipes-devtools/valgrind/valgrind_3.10.1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-devtools/valgrind/valgrind_3.10.1.bb +3 -1
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \ file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215" X11DEPENDS = "virtual/libx11" -DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" +DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'boost', '', d)} \ + " SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ file://fixed-perl-path.patch \
Signature · 1 line
1.7.9.5
PATCH 2/3 gcc-configure-common.inc: remove ac_cv_path_SED
In reply to Robert YangIt is not needed any more since sed-native had been dropped.
--- meta/recipes-devtools/gcc/gcc-configure-common.inc | 1 - 1 file changed, 1 deletion(-)
meta/recipes-devtools/gcc/gcc-configure-common.inc +0 -1
@@ -52,7 +52,6 @@ EXTRA_OECONF = "\ ${@get_gcc_multiarch_setting(bb, d)} \ " -export ac_cv_path_SED = 'sed' export gcc_cv_collect2_libs = 'none required' # We need to set gcc_cv_collect2_libs else there is cross-compilation badness # in the config.log files (which might not get generated until do_compile
Signature · 1 line
1.7.9.5
PATCH 3/3 binconfig-disabled.bbclass: fix echo command
In reply to Robert YangThe ">" should be ">>".
We had got something like the following in pcap-config:
echo '--should-not-have-used-/usr/bin/pcap-config' exit 1
(Lacks of #!/bin/sh)
(LOCAL REV: NOT UPSTREAM) -- Sent to oe-core on 20150202
--- meta/classes/binconfig-disabled.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/binconfig-disabled.bbclass +1 -1
@@ -12,7 +12,7 @@ do_install_append () { echo "#!/bin/sh" > ${D}$x # Make the disabled script emit invalid parameters for those configure # scripts which call it without checking the return code. - echo "echo '--should-not-have-used-$x'" > ${D}$x + echo "echo '--should-not-have-used-$x'" >> ${D}$x echo "exit 1" >> ${D}$x done }
Signature · 1 line
1.7.9.5
Re: [PATCH 3/3] binconfig-disabled.bbclass: fix echo command
Quoted 9 lines · Robert Yang
The ">" should be ">>".
We had got something like the following in pcap-config:
echo '--should-not-have-used-/usr/bin/pcap-config' exit 1(Lacks of #!/bin/sh)
(LOCAL REV: NOT UPSTREAM) -- Sent to oe-core on 20150202
Sorry, the (LOCAL: xxx) should not be here, I've updated in the repo.
// Robert
Quoted 20 lines
Signed-off-by Robert Yang <[email protected]>--- meta/classes/binconfig-disabled.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/classes/binconfig-disabled.bbclass +1
-1@@ -12,7 +12,7 @@ do_install_append () { echo "#!/bin/sh" > ${D}$x # Make the disabled script emit invalid parameters for those configure # scripts which call it without checking the return code. - echo "echo '--should-not-have-used-$x'" > ${D}$x + echo "echo '--should-not-have-used-$x'" >> ${D}$x echo "exit 1" >> ${D}$x done }