Patchwork pkgconfig: Fix packaging issue

login
register
mail settings
Submitter Saul Wold
Date July 26, 2012, 7:39 a.m.
Message ID <1343288380-11588-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/33107/
State New
Headers show

Comments

Saul Wold - July 26, 2012, 7:39 a.m.
[YOCTO #1908]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/pkgconfig/pkgconfig.inc |    4 ++++
 1 file changed, 4 insertions(+)
Koen Kooi - July 26, 2012, 8:07 a.m.
Op 26 jul. 2012, om 09:39 heeft Saul Wold <sgw@linux.intel.com> het volgende geschreven:

> [YOCTO #1908]
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-devtools/pkgconfig/pkgconfig.inc |    4 ++++
> 1 file changed, 4 insertions(+)
> 
> diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> index 00c23d7..8a8320e 100644
> --- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> +++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> @@ -32,4 +32,8 @@ do_configure_prepend () {
> 
> BBCLASSEXTEND = "native nativesdk"
> 
> +# Set an empty dev package to ensure the base PN package gets
> +# the pkg.m4 macros, pkgconfig does not deliver any other -dev
> +# files.
> +FILES_${PN}-dev = ""
> FILES_${PN} += "${datadir}/aclocal/pkg.m4"

Missing PR bump and broken upgrade path due to files moving around and no RREPLACES_foo. And I suspect you'll want ALLOW_EMPTY_${PN}-dev in there as well :)

Patch

diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index 00c23d7..8a8320e 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -32,4 +32,8 @@  do_configure_prepend () {
 
 BBCLASSEXTEND = "native nativesdk"
 
+# Set an empty dev package to ensure the base PN package gets
+# the pkg.m4 macros, pkgconfig does not deliver any other -dev
+# files.
+FILES_${PN}-dev = ""
 FILES_${PN} += "${datadir}/aclocal/pkg.m4"