From 83d31c874c58c9e98f1f99cbad1a583e65ed72e6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 26 Feb 2016 06:47:59 +0000 Subject: gettext: Delete libintl.la file from install gettext installs a libtool .la file for non-glibc systems since it builds libintl for them unlike glibc where it finds that using libc's gettext implementation is just fine. Same is not true for musl even though musl provides itw own gettext implementation much on then lines of glibc. ideally gettetxt should be fixed to behave on musl, but at this time its not clear if APIs are same and complete. Deleting .la file helps compiling packages like util-linux when using fstack-protections since it does not alter the order of libc on linker cmdline Moved src_uri checksums just below the SRC_URI as matter of formatting Signed-off-by: Khem Raj Signed-off-by: Ross Burton --- meta/recipes-core/gettext/gettext_0.19.6.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'meta/recipes-core/gettext') diff --git a/meta/recipes-core/gettext/gettext_0.19.6.bb b/meta/recipes-core/gettext/gettext_0.19.6.bb index fead06aa85..592e4fc761 100644 --- a/meta/recipes-core/gettext/gettext_0.19.6.bb +++ b/meta/recipes-core/gettext/gettext_0.19.6.bb @@ -13,15 +13,15 @@ RCONFLICTS_${PN} = "proxy-libintl" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://parallel.patch \ file://add-with-bisonlocaledir.patch \ - " +" + +SRC_URI[md5sum] = "6d1447f8c5c45c329371ef4bfe7d79a5" +SRC_URI[sha256sum] = "ed4b4c19bd3a3034eb6769500a3592ff616759ef43cf30586dbb7a17c9dd695d" PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses," LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread " -SRC_URI[md5sum] = "6d1447f8c5c45c329371ef4bfe7d79a5" -SRC_URI[sha256sum] = "ed4b4c19bd3a3034eb6769500a3592ff616759ef43cf30586dbb7a17c9dd695d" - inherit autotools texinfo EXTRA_OECONF += "--without-lispdir \ @@ -49,6 +49,7 @@ acpaths = '-I ${S}/gettext-runtime/m4 \ do_install_append_libc-musl () { rm -f ${D}${libdir}/charset.alias rm -f ${D}${includedir}/libintl.h + rm -f ${D}${libdir}/libintl.la } # these lack the .x behind the .so, but shouldn't be in the -dev package -- cgit 1.2.3-korg