Patchwork [2/3] oprofile: Define PACKAGE and PACKAGE_VERSION

login
register
mail settings
Submitter Khem Raj
Date Nov. 28, 2012, 3:29 p.m.
Message ID <8ec33689eaab4c3fa5099a8c461bd2b648e29481.1354116375.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/39799/
State New
Headers show

Comments

Khem Raj - Nov. 28, 2012, 3:29 p.m.
oprofile uses bfd.h from binutils which expects
that the package which is using it is also compiled
using autotools and therefore tries to include
config.h to get above defines. We specify them
on commandline instead.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-kernel/oprofile/oprofile.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Saul Wold - Nov. 29, 2012, 3:40 a.m.
On 11/28/2012 07:29 AM, Khem Raj wrote:
> oprofile uses bfd.h from binutils which expects
> that the package which is using it is also compiled
> using autotools and therefore tries to include
> config.h to get above defines. We specify them
> on commandline instead.
>

Khem,

This patch seems to be causing issues when I build it with 
stage/master_under_test.

I am seeing a configure failure on the Autobuilder.
http://autobuilder.yoctoproject.org:8010/builders/nightly-x86-64/builds/735/steps/shell_28/logs/stdio

A number of failures like the above can be seen..

Thanks
	Sau!


> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>   meta/recipes-kernel/oprofile/oprofile.inc |    4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-kernel/oprofile/oprofile.inc b/meta/recipes-kernel/oprofile/oprofile.inc
> index ac8ce10..3c1c3cd 100644
> --- a/meta/recipes-kernel/oprofile/oprofile.inc
> +++ b/meta/recipes-kernel/oprofile/oprofile.inc
> @@ -19,7 +19,7 @@ FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN}"
>   FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la"
>   FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a"
>
> -INC_PR = "r1"
> +INC_PR = "r2"
>
>   SRC_URI = "file://opstart.patch \
>              file://oprofile-no-query-modules.patch \
> @@ -29,7 +29,7 @@ SRC_URI = "file://opstart.patch \
>   inherit autotools
>
>   EXTRA_OECONF = "--with-kernel-support --without-x"
> -
> +CFLAGS += '-DPACKAGE="${BPN}" -DPACKAGE_VERSION=${PV}'
>   do_configure () {
>   	cp ${WORKDIR}/acinclude.m4 ${S}/
>   	autotools_do_configure
>

Patch

diff --git a/meta/recipes-kernel/oprofile/oprofile.inc b/meta/recipes-kernel/oprofile/oprofile.inc
index ac8ce10..3c1c3cd 100644
--- a/meta/recipes-kernel/oprofile/oprofile.inc
+++ b/meta/recipes-kernel/oprofile/oprofile.inc
@@ -19,7 +19,7 @@  FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN}"
 FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la"
 FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 SRC_URI = "file://opstart.patch \
            file://oprofile-no-query-modules.patch \
@@ -29,7 +29,7 @@  SRC_URI = "file://opstart.patch \
 inherit autotools
 
 EXTRA_OECONF = "--with-kernel-support --without-x"
-
+CFLAGS += '-DPACKAGE="${BPN}" -DPACKAGE_VERSION=${PV}'
 do_configure () {
 	cp ${WORKDIR}/acinclude.m4 ${S}/
 	autotools_do_configure