diff options
| author |   Joe Slater <jslater@windriver.com> | 2012-06-07 16:37:01 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-07 15:58:16 +0000 |
| commit | 40e6fc6a65cafb56e5f762333c6ae4d6699a5b0b (patch) | |
| tree | 697b568f7abcbc7ce61c0c54a1d16b7f1c6b72d2 | |
| parent | e9c2218231404d2ad64b9840199ab96b9a4ddda7 (diff) | |
| download | poky-40e6fc6a65cafb56e5f762333c6ae4d6699a5b0b.tar.gz poky-40e6fc6a65cafb56e5f762333c6ae4d6699a5b0b.tar.bz2 poky-40e6fc6a65cafb56e5f762333c6ae4d6699a5b0b.zip | |
gettext: install libgettextlib.a before removing it
In a multiple job build, Makefile can simultaneously
be installing and removing libgettextlib.a. We serialize
the operations.
(From OE-Core rev: 2750546b2152eecdbb37e963a2495383f6944184)
(From OE-Core rev: 500c9c1e0047ba9f35e3591f4252fe2dd38bc4f1)
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-core/gettext/gettext_0.18.1.1.bb | 3 |
2 files changed, 36 insertions, 1 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch new file mode 100644 index 0000000000..4ca44cce88 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch @@ -0,0 +1,34 @@ +instal libgettextlib.a before removing it + +In a multiple job build, Makefile can simultaneously +be installing and removing libgettextlib.a. We serialize +the operations. + +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 + +--- a/gettext-tools/src/Makefile.am ++++ b/gettext-tools/src/Makefile.am +@@ -229,8 +229,8 @@ libgettextsrc_la_LDFLAGS += -Wl,--export + endif + + # No need to install libgettextsrc.a, except on AIX. +-install-exec-local: install-libLTLIBRARIES install-exec-clean +-install-exec-clean: ++install-exec-local: install-exec-clean ++install-exec-clean: install-libLTLIBRARIES + case "@host_os@" in \ + aix*) ;; \ + *) $(RM) $(DESTDIR)$(libdir)/libgettextsrc.a ;; \ 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 46647512fa..1e67afb57c 100644 --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb @@ -5,13 +5,14 @@ SECTION = "libs" LICENSE = "GPLv3+ & LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -PR = "r11" +PR = "r12" DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native" PROVIDES = "virtual/libintl virtual/gettext" PROVIDES_virtclass-native = "virtual/gettext-native" CONFLICTS_${PN} = "proxy-libintl" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ + file://parallel.patch \ " SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \ |