summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-07-25 01:16:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-26 08:56:26 +0100
commit36f6219c4913980d62e89bb867a476c289d1c4a3 (patch)
treed8314ec7ae9811f967bb1a3356c832a78fb44f63
parentcff21235c20adc2cfceb7923e3dc9c276445b29c (diff)
downloadpoky-36f6219c4913980d62e89bb867a476c289d1c4a3.tar.gz
gettext-minimal-native: 0.19.4 -> 0.19.8.1
How to upgrade gettext-minimal-native: - Build gettext-native - Copy gettext-runtime/po/Makefile.in.in, build-aux/config.rpath and gettext-runtime/po/remove-potcdate.sin from gettext-native. - Update COPYING when needed (usually update the year), do not copy the whole COPYING file from gettext-native. - Go to gettext-native's ${S}/gettext-runtime/m4: > Remove lt*.m4 and libtool.m4 > copy lib-ld.m4 lib-link.m4 lib-prefix.m4 from ${S}/gettext-runtime/gnulib-m4/ > tar czvf /path/to/aclocal.tgz *.m4 (From OE-Core rev: 2b82c24a6b0148d1cc548605eab9be85f356ab6d) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.19.4/aclocal.tgzbin39744 -> 0 bytes
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch (renamed from meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch)0
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING (renamed from meta/recipes-core/gettext/gettext-minimal-0.19.4/COPYING)2
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.19.8.1/Makefile.in.in (renamed from meta/recipes-core/gettext/gettext-minimal-0.19.4/Makefile.in.in)44
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgzbin0 -> 40014 bytes
-rwxr-xr-xmeta/recipes-core/gettext/gettext-minimal-0.19.8.1/config.rpath (renamed from meta/recipes-core/gettext/gettext-minimal-0.19.4/config.rpath)2
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin (renamed from meta/recipes-core/gettext/gettext-minimal-0.19.4/remove-potcdate.sin)0
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb (renamed from meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb)3
8 files changed, 34 insertions, 17 deletions
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.4/aclocal.tgz b/meta/recipes-core/gettext/gettext-minimal-0.19.4/aclocal.tgz
deleted file mode 100644
index b04ba55032..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.4/aclocal.tgz
+++ /dev/null
Binary files differ
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch b/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
index 29ef2a5a63..29ef2a5a63 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
+++ b/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.4/COPYING b/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING
index 8d11d1d8e9..3671ab6985 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.4/COPYING
+++ b/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING
@@ -1,4 +1,4 @@
1dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. 1dnl Copyright (C) 1995-2016 Free Software Foundation, Inc.
2dnl This file is free software; the Free Software Foundation 2dnl This file is free software; the Free Software Foundation
3dnl gives unlimited permission to copy and/or distribute it, 3dnl gives unlimited permission to copy and/or distribute it,
4dnl with or without modifications, as long as this notice is preserved. 4dnl with or without modifications, as long as this notice is preserved.
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.4/Makefile.in.in b/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/Makefile.in.in
index 8906ba0ff1..38c293d2ed 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.4/Makefile.in.in
+++ b/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/Makefile.in.in
@@ -1,14 +1,12 @@
1# Makefile for PO directory in any package using GNU gettext. 1# Makefile for PO directory in any package using GNU gettext.
2# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu> 2# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
3# 3#
4# This file can be copied and used freely without restrictions. It can 4# Copying and distribution of this file, with or without modification,
5# be used in projects which are not available under the GNU General Public 5# are permitted in any medium without royalty provided the copyright
6# License but which still want to provide support for the GNU gettext 6# notice and this notice are preserved. This file is offered as-is,
7# functionality. 7# without any warranty.
8# Please note that the actual code of GNU gettext is covered by the GNU
9# General Public License and is *not* in the public domain.
10# 8#
11# Origin: gettext-0.19 9# Origin: gettext-0.19.8
12GETTEXT_MACRO_VERSION = 0.19 10GETTEXT_MACRO_VERSION = 0.19
13 11
14PACKAGE = @PACKAGE@ 12PACKAGE = @PACKAGE@
@@ -33,7 +31,22 @@ gettextsrcdir = $(datadir)/gettext/po
33INSTALL = @INSTALL@ 31INSTALL = @INSTALL@
34INSTALL_DATA = @INSTALL_DATA@ 32INSTALL_DATA = @INSTALL_DATA@
35 33
34# We use $(mkdir_p).
35# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
36# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
37# @install_sh@ does not start with $(SHELL), so we add it.
38# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
39# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
40# versions, $(mkinstalldirs) and $(install_sh) are unused.
41mkinstalldirs = $(SHELL) @install_sh@ -d
42install_sh = $(SHELL) @install_sh@
36MKDIR_P = @MKDIR_P@ 43MKDIR_P = @MKDIR_P@
44mkdir_p = @mkdir_p@
45
46# When building gettext-tools, we prefer to use the built programs
47# rather than installed programs. However, we can't do that when we
48# are cross compiling.
49CROSS_COMPILING = @CROSS_COMPILING@
37 50
38GMSGFMT_ = @GMSGFMT@ 51GMSGFMT_ = @GMSGFMT@
39GMSGFMT_no = @GMSGFMT@ 52GMSGFMT_no = @GMSGFMT@
@@ -187,6 +200,11 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
187 ;; \ 200 ;; \
188 esac 201 esac
189 test ! -f $(DOMAIN).po || { \ 202 test ! -f $(DOMAIN).po || { \
203 if test -f $(srcdir)/$(DOMAIN).pot-header; then \
204 sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \
205 cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po; \
206 rm -f $(DOMAIN).1po; \
207 fi; \
190 if test -f $(srcdir)/$(DOMAIN).pot; then \ 208 if test -f $(srcdir)/$(DOMAIN).pot; then \
191 sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ 209 sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
192 sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ 210 sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
@@ -216,7 +234,7 @@ $(POFILES): $(POFILESDEPS)
216 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ 234 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
217 echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ 235 echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
218 cd $(srcdir) \ 236 cd $(srcdir) \
219 && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ 237 && { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
220 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ 238 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
221 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ 239 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
222 *) \ 240 *) \
@@ -232,7 +250,7 @@ install: install-exec install-data
232install-exec: 250install-exec:
233install-data: install-data-@USE_NLS@ 251install-data: install-data-@USE_NLS@
234 if test "$(PACKAGE)" = "gettext-tools"; then \ 252 if test "$(PACKAGE)" = "gettext-tools"; then \
235 $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \ 253 $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
236 for file in $(DISTFILES.common) Makevars.template; do \ 254 for file in $(DISTFILES.common) Makevars.template; do \
237 $(INSTALL_DATA) $(srcdir)/$$file \ 255 $(INSTALL_DATA) $(srcdir)/$$file \
238 $(DESTDIR)$(gettextsrcdir)/$$file; \ 256 $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -250,7 +268,7 @@ install-data-yes: all
250 cat=`basename $$cat`; \ 268 cat=`basename $$cat`; \
251 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ 269 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
252 dir=$(localedir)/$$lang/LC_MESSAGES; \ 270 dir=$(localedir)/$$lang/LC_MESSAGES; \
253 $(MKDIR_P) $(DESTDIR)$$dir; \ 271 $(mkdir_p) $(DESTDIR)$$dir; \
254 if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ 272 if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
255 $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ 273 $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
256 echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ 274 echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -290,7 +308,7 @@ installdirs: installdirs-exec installdirs-data
290installdirs-exec: 308installdirs-exec:
291installdirs-data: installdirs-data-@USE_NLS@ 309installdirs-data: installdirs-data-@USE_NLS@
292 if test "$(PACKAGE)" = "gettext-tools"; then \ 310 if test "$(PACKAGE)" = "gettext-tools"; then \
293 $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \ 311 $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
294 else \ 312 else \
295 : ; \ 313 : ; \
296 fi 314 fi
@@ -301,7 +319,7 @@ installdirs-data-yes:
301 cat=`basename $$cat`; \ 319 cat=`basename $$cat`; \
302 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ 320 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
303 dir=$(localedir)/$$lang/LC_MESSAGES; \ 321 dir=$(localedir)/$$lang/LC_MESSAGES; \
304 $(MKDIR_P) $(DESTDIR)$$dir; \ 322 $(mkdir_p) $(DESTDIR)$$dir; \
305 for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ 323 for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
306 if test -n "$$lc"; then \ 324 if test -n "$$lc"; then \
307 if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ 325 if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
@@ -417,7 +435,7 @@ update-po: Makefile
417 435
418.nop.po-update: 436.nop.po-update:
419 @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ 437 @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
420 if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ 438 if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; fi; \
421 tmpdir=`pwd`; \ 439 tmpdir=`pwd`; \
422 echo "$$lang:"; \ 440 echo "$$lang:"; \
423 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ 441 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz b/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz
new file mode 100644
index 0000000000..9b2d1f561d
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz
Binary files differ
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.4/config.rpath b/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/config.rpath
index b625621fac..98183ff2f2 100755
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.4/config.rpath
+++ b/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/config.rpath
@@ -2,7 +2,7 @@
2# Output a system dependent set of variables, describing how to set the 2# Output a system dependent set of variables, describing how to set the
3# run time search path of shared libraries in an executable. 3# run time search path of shared libraries in an executable.
4# 4#
5# Copyright 1996-2014 Free Software Foundation, Inc. 5# Copyright 1996-2016 Free Software Foundation, Inc.
6# Taken from GNU libtool, 2001 6# Taken from GNU libtool, 2001
7# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 7# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
8# 8#
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.4/remove-potcdate.sin b/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin
index 2436c49e78..2436c49e78 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.4/remove-potcdate.sin
+++ b/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin
diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb
index 1d4a443b7f..26ff19975d 100644
--- a/meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb
+++ b/meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb
@@ -15,11 +15,10 @@ INHIBIT_DEFAULT_DEPS = "1"
15INHIBIT_AUTOTOOLS_DEPS = "1" 15INHIBIT_AUTOTOOLS_DEPS = "1"
16 16
17LICENSE = "FSF-Unlimited" 17LICENSE = "FSF-Unlimited"
18LIC_FILES_CHKSUM = "file://COPYING;md5=1b20675cd5158442f6007d022f46b35b" 18LIC_FILES_CHKSUM = "file://COPYING;md5=4bd090a20bfcd1a18f1f79837b5e3e91"
19 19
20inherit native 20inherit native
21 21
22
23S = "${WORKDIR}" 22S = "${WORKDIR}"
24 23
25do_install () { 24do_install () {