summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2012-06-07 23:37:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-07 15:58:16 (GMT)
commit40e6fc6a65cafb56e5f762333c6ae4d6699a5b0b (patch)
tree697b568f7abcbc7ce61c0c54a1d16b7f1c6b72d2 /meta
parente9c2218231404d2ad64b9840199ab96b9a4ddda7 (diff)
downloadpoky-40e6fc6a65cafb56e5f762333c6ae4d6699a5b0b.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch34
-rw-r--r--meta/recipes-core/gettext/gettext_0.18.1.1.bb3
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 0000000..4ca44cc
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch
@@ -0,0 +1,34 @@
1instal libgettextlib.a before removing it
2
3In a multiple job build, Makefile can simultaneously
4be installing and removing libgettextlib.a. We serialize
5the operations.
6
7Signed-off-by: Joe Slater <jslater@windriver.com>
8
9--- a/gettext-tools/gnulib-lib/Makefile.am
10+++ b/gettext-tools/gnulib-lib/Makefile.am
11@@ -57,6 +57,10 @@ endif
12 # Rules generated and collected by gnulib-tool.
13 include Makefile.gnulib
14
15+# defined in Makefile.gnulib but missing this dependency
16+#
17+install-exec-clean: install-libLTLIBRARIES
18+
19 # Which classes to export from the shared library.
20 MOOPPFLAGS += --dllexport=styled_ostream
21
22--- a/gettext-tools/src/Makefile.am
23+++ b/gettext-tools/src/Makefile.am
24@@ -229,8 +229,8 @@ libgettextsrc_la_LDFLAGS += -Wl,--export
25 endif
26
27 # No need to install libgettextsrc.a, except on AIX.
28-install-exec-local: install-libLTLIBRARIES install-exec-clean
29-install-exec-clean:
30+install-exec-local: install-exec-clean
31+install-exec-clean: install-libLTLIBRARIES
32 case "@host_os@" in \
33 aix*) ;; \
34 *) $(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 4664751..1e67afb 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"
5LICENSE = "GPLv3+ & LGPL-2.1+" 5LICENSE = "GPLv3+ & LGPL-2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
7 7
8PR = "r11" 8PR = "r12"
9DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" 9DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat"
10DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native" 10DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native"
11PROVIDES = "virtual/libintl virtual/gettext" 11PROVIDES = "virtual/libintl virtual/gettext"
12PROVIDES_virtclass-native = "virtual/gettext-native" 12PROVIDES_virtclass-native = "virtual/gettext-native"
13CONFLICTS_${PN} = "proxy-libintl" 13CONFLICTS_${PN} = "proxy-libintl"
14SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ 14SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
15 file://parallel.patch \
15 " 16 "
16 17
17SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \ 18SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \