Patchwork [21/26] gettext: Use bitbake default FILES for packaging

login
register
mail settings
Submitter Saul Wold
Date July 11, 2011, 11:13 p.m.
Message ID <5735193f441aa8b1fd10a33d9a9c6fd1316d0ce8.1310425837.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/7375/
State New, archived
Headers show

Comments

Saul Wold - July 11, 2011, 11:13 p.m.
This will ensure correct -dev and -staticdev packging

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/gettext/gettext_0.16.1.bb   |    4 ++--
 meta/recipes-core/gettext/gettext_0.18.1.1.bb |   22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)
Koen Kooi - July 12, 2011, 7:17 a.m.
Op 12 jul 2011, om 01:13 heeft Saul Wold het volgende geschreven:

> This will ensure correct -dev and -staticdev packging

Missing PR bump

> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-core/gettext/gettext_0.16.1.bb   |    4 ++--
> meta/recipes-core/gettext/gettext_0.18.1.1.bb |   22 +++++++++++-----------
> 2 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/meta/recipes-core/gettext/gettext_0.16.1.bb b/meta/recipes-core/gettext/gettext_0.16.1.bb
> index 73e5f55..7399c48 100644
> --- a/meta/recipes-core/gettext/gettext_0.16.1.bb
> +++ b/meta/recipes-core/gettext/gettext_0.16.1.bb
> @@ -51,5 +51,5 @@ do_configure_prepend() {
> # 4       KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
> 
> PACKAGES =+ "libgettextlib libgettextsrc"
> -FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
> -FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
> +FILES_libgettextlib = "${libdir}/libgettextlib-*${SOLIBS}"
> +FILES_libgettextsrc = "${libdir}/libgettextsrc-*${SOLIBS}"
> diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
> index 0b11a90..6be3e77 100644
> --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
> +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
> @@ -53,27 +53,27 @@ acpaths = '-I ${S}/gettext-runtime/m4 \
> # 4       KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
> 
> PACKAGES =+ "libgettextlib libgettextsrc"
> -FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
> -FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
> +FILES_libgettextlib = "${libdir}/libgettextlib-*${SOLIBS}"
> +FILES_libgettextsrc = "${libdir}/libgettextsrc-*${SOLIBS}"
> 
> -PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc"
> +PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-staticdev gettext-runtime-doc"
> 
> FILES_gettext-runtime = "${bindir}/gettext \
>                          ${bindir}/ngettext \
>                          ${bindir}/envsubst \
>                          ${bindir}/gettext.sh \
> -                         ${libdir}/libasprintf.so* \
> +                         ${libdir}/libasprintf${SOLIBS} \
>                          ${libdir}/GNU.Gettext.dll \
>                         "
> -FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl.so* \
> +FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl${SOLIBS} \
>                                              ${libdir}/charset.alias \
>                                            "
> -FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \
> -                      ${includedir}/autosprintf.h \
> -                     "
> -FILES_gettext-runtime-dev_append_libc-uclibc = " ${libdir}/libintl.a \
> -                                                 ${includedir}/libintl.h \
> -                                               "
> +FILES_gettext-runtime-dev += "${includedir}/autosprintf.h"
> +FILES_gettext-runtime-staticdev = "${libdir}/libasprintf.a"
> +FILES_gettext-runtime-dev_append_libc-uclibc = " ${includedir}/libintl.h"
> +FILES_gettext-runtime-staticdev_append_libc-uclibc = " ${libdir}/libintl.a"
> +RDEPENDS_gettext-runtime-staticdev = "gettext-runtime-dev (= ${EXTENDPKGV})"
> +
> FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \
>                              ${mandir}/man1/ngettext.* \
>                              ${mandir}/man1/envsubst.* \
> -- 
> 1.7.3.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-core/gettext/gettext_0.16.1.bb b/meta/recipes-core/gettext/gettext_0.16.1.bb
index 73e5f55..7399c48 100644
--- a/meta/recipes-core/gettext/gettext_0.16.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.16.1.bb
@@ -51,5 +51,5 @@  do_configure_prepend() {
 # 4       KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
 
 PACKAGES =+ "libgettextlib libgettextsrc"
-FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
-FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
+FILES_libgettextlib = "${libdir}/libgettextlib-*${SOLIBS}"
+FILES_libgettextsrc = "${libdir}/libgettextsrc-*${SOLIBS}"
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index 0b11a90..6be3e77 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -53,27 +53,27 @@  acpaths = '-I ${S}/gettext-runtime/m4 \
 # 4       KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
 
 PACKAGES =+ "libgettextlib libgettextsrc"
-FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
-FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
+FILES_libgettextlib = "${libdir}/libgettextlib-*${SOLIBS}"
+FILES_libgettextsrc = "${libdir}/libgettextsrc-*${SOLIBS}"
 
-PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc"
+PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-staticdev gettext-runtime-doc"
 
 FILES_gettext-runtime = "${bindir}/gettext \
                          ${bindir}/ngettext \
                          ${bindir}/envsubst \
                          ${bindir}/gettext.sh \
-                         ${libdir}/libasprintf.so* \
+                         ${libdir}/libasprintf${SOLIBS} \
                          ${libdir}/GNU.Gettext.dll \
                         "
-FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl.so* \
+FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl${SOLIBS} \
                                              ${libdir}/charset.alias \
                                            "
-FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \
-                      ${includedir}/autosprintf.h \
-                     "
-FILES_gettext-runtime-dev_append_libc-uclibc = " ${libdir}/libintl.a \
-                                                 ${includedir}/libintl.h \
-                                               "
+FILES_gettext-runtime-dev += "${includedir}/autosprintf.h"
+FILES_gettext-runtime-staticdev = "${libdir}/libasprintf.a"
+FILES_gettext-runtime-dev_append_libc-uclibc = " ${includedir}/libintl.h"
+FILES_gettext-runtime-staticdev_append_libc-uclibc = " ${libdir}/libintl.a"
+RDEPENDS_gettext-runtime-staticdev = "gettext-runtime-dev (= ${EXTENDPKGV})"
+
 FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \
                              ${mandir}/man1/ngettext.* \
                              ${mandir}/man1/envsubst.* \