From patchwork Thu Jun 7 23:37:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Consolidated, Pull, 13/22] gettext: install libgettextlib.a before removing it Date: Thu, 07 Jun 2012 23:37:01 -0000 From: Elizabeth Flanagan X-Patchwork-Id: 29409 Message-Id: <19bc0f08e5a5e9ef7f4287cacef2a9a78c74a7e2.1339111944.git.elizabeth.flanagan@intel.com> To: openembedded-core@lists.openembedded.org From: Joe Slater In a multiple job build, Makefile can simultaneously be installing and removing libgettextlib.a. We serialize the operations. Signed-off-by: Joe Slater Signed-off-by: Mark Hatle Signed-off-by: Elizabeth Flanagan --- .../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 deletions(-) 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 0000000..4ca44cc --- /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 5685bbe..253ea43 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 = "r12" +PR = "r13" 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 \