From 500c9c1e0047ba9f35e3591f4252fe2dd38bc4f1 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Thu, 7 Jun 2012 16:37:01 -0700 Subject: 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) Signed-off-by: Joe Slater Signed-off-by: Mark Hatle Signed-off-by: Elizabeth Flanagan Signed-off-by: Richard Purdie --- .../gettext/gettext-0.18.1.1/parallel.patch | 34 ++++++++++++++++++++++ meta/recipes-core/gettext/gettext_0.18.1.1.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch 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 + +--- 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 \ -- cgit 1.2.3-korg