[OE-core] [PATCH 9/30] gettext_0.19.8.1.bb: Add 'gettext-libintl' package

[Nathan Rossi]

Add a package called 'gettext-libintl' which ships the libintl shared
objects (.so/.dll). This allows for the library to be shipped without
the additional components included in the gettext-runtime package.

This packages is prefixed with 'gettext-' to define the source of the
library due to the existence of multiple providers for libintl.

This change also makes the libintl*.so and .h packaged into the
gettext-runtime-dev package by default. Removing the need for a uclibc
override to handle packaging these files. Targets that don't intend to
distribute these files already remove them during the do_install stage
(e.g. musl).

Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
---
 meta/recipes-core/gettext/gettext_0.19.8.1.bb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
index 67173f247c..f43594686e 100644
--- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
@@ -67,6 +67,9 @@ PACKAGES =+ "libgettextlib libgettextsrc"
 FILES_libgettextlib = "${libdir}/libgettextlib-*.so* ${bindir}/libgettextlib-*.dll"
 FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so* ${bindir}/libgettextsrc-*.dll"
 
+PACKAGES =+ "gettext-libintl"
+FILES_gettext-libintl = "${libdir}/libintl*.so.* ${bindir}/libintl*.dll"
+
 PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc"
 
 FILES_${PN} += "${libdir}/${BPN}/*"
@@ -83,15 +86,12 @@ FILES_gettext-runtime = "${bindir}/gettext \
                          ${libdir}/libasprintf.so* \
                          ${libdir}/GNU.Gettext.dll \
                         "
-FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl.so.* \
-                                             ${libdir}/charset.alias \
-                                           "
+FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/charset.alias"
 FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \
                       ${includedir}/autosprintf.h \
+                      ${libdir}/libintl*.so \
+                      ${includedir}/libintl.h \
                      "
-FILES_gettext-runtime-dev_append_libc-uclibc = " ${libdir}/libintl.so \
-                                                 ${includedir}/libintl.h \
-                                               "
 FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \
                              ${mandir}/man1/ngettext.* \
                              ${mandir}/man1/envsubst.* \
-- 
2.11.0