Skip to contentSkip to conversation

meta: 3 fixes

PATCH In review Robert Yang 2 participants 5 messages Jan 28, 2016

lore
Share & tools
lore

Robert Yang

author
#0 lore raw

cover meta: 3 fixes

The following changes since commit 2a6e061712cfe9cb4738806a0c351a64e0d30144:

cmake: update to 3.4.2 (2016-01-26 22:48:57 +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):
gdb-common.inc: add PACKAGECONFIG for readline autotools_stage.bbclass: remove it perf.bb: add python scripts corresponding packages

 meta/classes/autotools_stage.bbclass     |    2 --
 meta/recipes-devtools/gdb/gdb-common.inc |    8 ++++++--
 meta/recipes-kernel/perf/perf.bb         |    8 ++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)
 delete mode 100644 meta/classes/autotools_stage.bbclass
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/3 gdb-common.inc: add PACKAGECONFIG for readline

When compile with readline 5.2:
completer.o: In function `gdb_display_match_list':
completer.c:(.text+0x1c13): undefined reference to _rl_completion_prefix_display_length' completer.c:(.text+0x1ce8): undefined reference to rl_sort_completion_matches'
collect2: ld returned 1 exit status

The --without-system-readline will make it work.

Signed-off-by Robert Yang <[email protected]>
---
 meta/recipes-devtools/gdb/gdb-common.inc |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
meta/recipes-devtools/gdb/gdb-common.inc +6 -2
index 166ba8e..6baeb0b 100644
@@ -2,7 +2,7 @@ SUMMARY = "GNU debugger"
 HOMEPAGE = "http://www.gnu.org/software/gdb/"
 LICENSE = "GPLv3+"
 SECTION = "devel"
-DEPENDS = "expat zlib ncurses readline ${LTTNGUST}"
+DEPENDS = "expat zlib ncurses ${LTTNGUST}"
 
 LTTNGUST = "lttng-ust"
 LTTNGUST_aarch64 = ""

@@ -40,13 +40,17 @@ EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
 EXPAT = "--with-expat --with-libexpat-prefix=${STAGING_DIR_HOST}"
 
 EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x --disable-werror \
-                --with-curses --disable-multilib --with-system-readline --disable-sim \
+                --with-curses --disable-multilib --disable-sim \
                 --without-lzma --without-guile \
                 ${GDBPROPREFIX} ${EXPAT} \
                 ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)} \
                 --disable-rpath \
                "
 
+PACKAGECONFIG ??= "readline"
+# Use --without-system-readline to compile with readline 5.
+PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline"
+
 GDBPROPREFIX = "--program-prefix=''"
 
 do_configure () {
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 2/3 autotools_stage.bbclass: remove it

In reply to Robert Yang

Not needed any more, the autotools.bbclass can fully instead of it.

Signed-off-by Robert Yang <[email protected]>
---
 meta/classes/autotools_stage.bbclass |    2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 meta/classes/autotools_stage.bbclass
meta/classes/autotools_stage.bbclass deleted +0 -2
deleted file mode 100644
index b3c41e4..0000000
@@ -1,2 +0,0 @@
-inherit autotools
-
Signature · 1 line
1.7.9.5
author
#3 lore raw

PATCH 3/3 perf.bb: add python scripts corresponding packages

In reply to Robert Yang

Fixed:
/usr/libexec/perf-core/tests/attr.py contained in package perf requires /usr/bin/python, but no providers found in RDEPENDS_perf? [file-rdeps] /usr/libexec/perf-core/scripts/python/sched-migration.py contained in package perf requires /usr/bin/python, but no providers found in RDEPENDS_perf? [file-rdeps]

Signed-off-by Robert Yang <[email protected]>
---
 meta/recipes-kernel/perf/perf.bb |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
meta/recipes-kernel/perf/perf.bb +6 -2
index 33acb42..dde6046 100644
@@ -201,8 +201,12 @@ RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}"
 
 FILES_${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent"
 FILES_${PN}-archive = "${libdir}/perf/perf-core/perf-archive"
-FILES_${PN}-tests = "${libdir}/perf/perf-core/tests"
-FILES_${PN}-python = "${libdir}/python*/site-packages ${libdir}/perf/perf-core/scripts/python"
+FILES_${PN}-tests = "${libdir}/perf/perf-core/tests \
+                     ${libexecdir}/perf-core/tests \
+                     "
+FILES_${PN}-python = "${libdir}/python*/site-packages ${libdir}/perf/perf-core/scripts/python \
+                      ${libexecdir}/perf-core/scripts/python \
+                     "
 FILES_${PN}-perl = "${libdir}/perf/perf-core/scripts/perl"
Signature · 1 line
1.7.9.5
#4 lore raw

Re: [PATCH 3/3] perf.bb: add python scripts corresponding packages

Quoted 4 lines · Robert Yang

+FILES_${PN}-python = "${libdir}/python*/site-packages ${libdir}/perf/perf-core/scripts/python \
+ ${libexecdir}/perf-core/scripts/python \

Nothing in perf appears to be in $libdir/perf explicitly, it's all in $libexecdir.

(as verified by building perf with the libexecdir change, and nothing is in /usr/lib/perf)

Ross