Merge branch 'jethro' into fct
This commit is contained in:
		
						commit
						de7af45233
					
				|  | @ -0,0 +1,23 @@ | ||||||
|  | instal libgettextlib.a before removing it | ||||||
|  | 
 | ||||||
|  | In a multiple job build, Makefile can simultaneously | ||||||
|  | be installing and removing libgettextlib.a.  We serialize | ||||||
|  | the operations. | ||||||
|  | 
 | ||||||
|  | Upstream-Status: Pending | ||||||
|  | 
 | ||||||
|  | Signed-off-by: Joe Slater <jslater@windriver.com> | ||||||
|  | 
 | ||||||
|  | --- a/gettext-tools/gnulib-lib/Makefile.am
 | ||||||
|  | +++ b/gettext-tools/gnulib-lib/Makefile.am
 | ||||||
|  | @@ -57,6 +57,10 @@ endif
 | ||||||
|  |  # Rules generated and collected by gnulib-tool. | ||||||
|  |  include Makefile.gnulib | ||||||
|  |   | ||||||
|  | +# defined in Makefile.gnulib but missing this dependency
 | ||||||
|  | +#
 | ||||||
|  | +install-exec-clean: install-libLTLIBRARIES
 | ||||||
|  | +
 | ||||||
|  |  # Which classes to export from the shared library. | ||||||
|  |  MOOPPFLAGS += --dllexport=styled_ostream | ||||||
|  |   | ||||||
|  | @ -0,0 +1,106 @@ | ||||||
|  | SUMMARY = "Utilities and libraries for producing multi-lingual messages" | ||||||
|  | DESCRIPTION = "GNU gettext is a set of tools that provides a framework to help other programs produce multi-lingual messages. These tools include a set of conventions about how programs should be written to support message catalogs, a directory and file naming organization for the message catalogs themselves, a runtime library supporting the retrieval of translated messages, and a few stand-alone programs to massage in various ways the sets of translatable and already translated strings." | ||||||
|  | HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" | ||||||
|  | SECTION = "libs" | ||||||
|  | LICENSE = "GPLv3+ & LGPL-2.1+" | ||||||
|  | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||||||
|  | 
 | ||||||
|  | DEPENDS = "gettext-native virtual/libiconv expat" | ||||||
|  | DEPENDS_class-native = "gettext-minimal-native" | ||||||
|  | PROVIDES = "virtual/libintl virtual/gettext" | ||||||
|  | PROVIDES_class-native = "virtual/gettext-native" | ||||||
|  | RCONFLICTS_${PN} = "proxy-libintl" | ||||||
|  | SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ | ||||||
|  | 	   file://parallel.patch \ | ||||||
|  |           " | ||||||
|  | 
 | ||||||
|  | PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses," | ||||||
|  | 
 | ||||||
|  | LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread " | ||||||
|  | 
 | ||||||
|  | SRC_URI[md5sum] = "87c4ab267c4dce8a75db5d057bb3c92f" | ||||||
|  | SRC_URI[sha256sum] = "5386d2a40500295783c6a52121adcf42a25519e2d23675950619c9e69558c23f" | ||||||
|  | 
 | ||||||
|  | inherit autotools texinfo | ||||||
|  | 
 | ||||||
|  | EXTRA_OECONF += "--without-lispdir \ | ||||||
|  |                  --disable-csharp \ | ||||||
|  |                  --disable-libasprintf \ | ||||||
|  |                  --disable-java \ | ||||||
|  |                  --disable-native-java \ | ||||||
|  |                  --disable-openmp \ | ||||||
|  |                  --disable-acl \ | ||||||
|  |                  --with-included-glib \ | ||||||
|  |                  --without-emacs \ | ||||||
|  |                  --without-cvs \ | ||||||
|  |                  --without-git \ | ||||||
|  |                  --with-included-libxml \ | ||||||
|  |                  --with-included-libcroco \ | ||||||
|  |                  --with-included-libunistring \ | ||||||
|  |                 " | ||||||
|  | 
 | ||||||
|  | acpaths = '-I ${S}/gettext-runtime/m4 \ | ||||||
|  |            -I ${S}/gettext-tools/m4' | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | # these lack the .x behind the .so, but shouldn't be in the -dev package | ||||||
|  | # Otherwise you get the following results: | ||||||
|  | # 7.4M    glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz | ||||||
|  | # 25M     uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz | ||||||
|  | # because gettext depends on gettext-dev, which pulls in more -dev packages: | ||||||
|  | # 15228   KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk | ||||||
|  | # 1300    KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk | ||||||
|  | # 140     KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk | ||||||
|  | # 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*" | ||||||
|  | 
 | ||||||
|  | PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc" | ||||||
|  | 
 | ||||||
|  | FILES_${PN} += "${libdir}/${BPN}/*" | ||||||
|  | 
 | ||||||
|  | FILES_gettext-runtime = "${bindir}/gettext \ | ||||||
|  |                          ${bindir}/ngettext \ | ||||||
|  |                          ${bindir}/envsubst \ | ||||||
|  |                          ${bindir}/gettext.sh \ | ||||||
|  |                          ${libdir}/libasprintf.so* \ | ||||||
|  |                          ${libdir}/GNU.Gettext.dll \ | ||||||
|  |                         " | ||||||
|  | FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl.so.* \ | ||||||
|  |                                              ${libdir}/charset.alias \ | ||||||
|  |                                            " | ||||||
|  | FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \ | ||||||
|  |                       ${includedir}/autosprintf.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.* \ | ||||||
|  |                              ${mandir}/man1/.* \ | ||||||
|  |                              ${mandir}/man3/* \ | ||||||
|  |                              ${docdir}/gettext/gettext.* \ | ||||||
|  |                              ${docdir}/gettext/ngettext.* \ | ||||||
|  |                              ${docdir}/gettext/envsubst.* \ | ||||||
|  |                              ${docdir}/gettext/*.3.html \ | ||||||
|  |                              ${datadir}/gettext/ABOUT-NLS \ | ||||||
|  |                              ${docdir}/gettext/csharpdoc/* \ | ||||||
|  |                              ${docdir}/libasprintf/autosprintf.html \ | ||||||
|  |                              ${infodir}/autosprintf.info \ | ||||||
|  |                             " | ||||||
|  | 
 | ||||||
|  | do_install_append() { | ||||||
|  |     rm -f ${D}${libdir}/preloadable_libintl.so | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | do_install_append_class-native () { | ||||||
|  | 	rm ${D}${datadir}/aclocal/* | ||||||
|  | 	rm ${D}${datadir}/gettext/config.rpath | ||||||
|  | 	rm ${D}${datadir}/gettext/po/Makefile.in.in | ||||||
|  | 	rm ${D}${datadir}/gettext/po/remove-potcdate.sin | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | BBCLASSEXTEND = "native nativesdk" | ||||||
		Loading…
	
		Reference in New Issue