Patchwork [CONSOLIDATED,PULL,12/33] pkgconfig: Move pkg.m4 from -dev to package

login
register
mail settings
Submitter Saul Wold
Date Jan. 19, 2012, 9:22 a.m.
Message ID <07e6db4cffae944800892d934c11be3876eeaa92.1326964778.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/19747/
State Accepted
Commit 80fdf2cf2b048d7c2e8dff9c47490f47fc62e820
Headers show

Comments

Saul Wold - Jan. 19, 2012, 9:22 a.m.
[YOCTO #1908]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/pkgconfig/pkgconfig.inc     |    2 ++
 meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
Koen Kooi - Jan. 19, 2012, 10:30 a.m.
Op 19 jan. 2012, om 10:22 heeft Saul Wold het volgende geschreven:

> [YOCTO #1908]
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-devtools/pkgconfig/pkgconfig.inc     |    2 ++
> meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb |    2 +-
> 2 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> index 641bfae..00c23d7 100644
> --- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> +++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> @@ -31,3 +31,5 @@ do_configure_prepend () {
> }
> 
> BBCLASSEXTEND = "native nativesdk"
> +
> +FILES_${PN} += "${datadir}/aclocal/pkg.m4"

Why is this done exactly? M4 files do belong in the -dev package.
Richard Purdie - Jan. 19, 2012, 10:57 a.m.
On Thu, 2012-01-19 at 11:30 +0100, Koen Kooi wrote:
> Op 19 jan. 2012, om 10:22 heeft Saul Wold het volgende geschreven:
> 
> > [YOCTO #1908]
> > 
> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
> > ---
> > meta/recipes-devtools/pkgconfig/pkgconfig.inc     |    2 ++
> > meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb |    2 +-
> > 2 files changed, 3 insertions(+), 1 deletions(-)
> > 
> > diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> > index 641bfae..00c23d7 100644
> > --- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> > +++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> > @@ -31,3 +31,5 @@ do_configure_prepend () {
> > }
> > 
> > BBCLASSEXTEND = "native nativesdk"
> > +
> > +FILES_${PN} += "${datadir}/aclocal/pkg.m4"
> 
> Why is this done exactly? M4 files do belong in the -dev package.

Think about the use cases for having pkgconfig installed. In the
pkgconfig case, the -dev package isn't particularly useful. 

You can argue this one both ways though...

Cheers,

Richard
Koen Kooi - Jan. 19, 2012, 11:04 a.m.
Op 19 jan. 2012, om 11:57 heeft Richard Purdie het volgende geschreven:

> On Thu, 2012-01-19 at 11:30 +0100, Koen Kooi wrote:
>> Op 19 jan. 2012, om 10:22 heeft Saul Wold het volgende geschreven:
>> 
>>> [YOCTO #1908]
>>> 
>>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>>> ---
>>> meta/recipes-devtools/pkgconfig/pkgconfig.inc     |    2 ++
>>> meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb |    2 +-
>>> 2 files changed, 3 insertions(+), 1 deletions(-)
>>> 
>>> diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
>>> index 641bfae..00c23d7 100644
>>> --- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
>>> +++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
>>> @@ -31,3 +31,5 @@ do_configure_prepend () {
>>> }
>>> 
>>> BBCLASSEXTEND = "native nativesdk"
>>> +
>>> +FILES_${PN} += "${datadir}/aclocal/pkg.m4"
>> 
>> Why is this done exactly? M4 files do belong in the -dev package.
> 
> Think about the use cases for having pkgconfig installed. In the
> pkgconfig case, the -dev package isn't particularly useful. 

So put that in the commit message :)

> 
> You can argue this one both ways though...

I know, just being obnoxious about missing commit messages.

Patch

diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index 641bfae..00c23d7 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -31,3 +31,5 @@  do_configure_prepend () {
 }
 
 BBCLASSEXTEND = "native nativesdk"
+
+FILES_${PN} += "${datadir}/aclocal/pkg.m4"
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
index 76c0df9..1d7ba49 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
@@ -1,6 +1,6 @@ 
 require pkgconfig.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745"
 SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e"