summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-04 08:50:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-10 23:43:07 +0000
commit25e5ba1366d0a9b4d9a90820b4b0bf66c1ac3f15 (patch)
tree3904145b7b32071de4f1969c8595a573c84bd6ae /meta
parent024405ca01d09b80e9a7147df973c02d3a0f0da9 (diff)
downloadpoky-25e5ba1366d0a9b4d9a90820b4b0bf66c1ac3f15.tar.gz
gettext-minimal: update files from gettext 0.18.2
(From OE-Core rev: 3f5706348c8c586359ac7fbccadc4bbd55cd8bc9) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.18.1.1/aclocal.tgzbin36374 -> 0 bytes
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.18.2/COPYING (renamed from meta/recipes-core/gettext/gettext-minimal-0.18.1.1/COPYING)0
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.18.2/Makefile.in.in (renamed from meta/recipes-core/gettext/gettext-minimal-0.18.1.1/Makefile.in.in)19
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.18.2/Makevars.template (renamed from meta/recipes-core/gettext/gettext-minimal-0.18.1.1/Makevars.template)12
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.18.2/aclocal.tgzbin0 -> 37504 bytes
-rwxr-xr-xmeta/recipes-core/gettext/gettext-minimal-0.18.2/config.rpath (renamed from meta/recipes-core/gettext/gettext-minimal-0.18.1.1/config.rpath)106
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.18.2/remove-potcdate.sin (renamed from meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin)0
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-native_0.18.2.bb (renamed from meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb)2
8 files changed, 89 insertions, 50 deletions
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/aclocal.tgz b/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/aclocal.tgz
deleted file mode 100644
index 6dab00d165..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/aclocal.tgz
+++ /dev/null
Binary files differ
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/COPYING b/meta/recipes-core/gettext/gettext-minimal-0.18.2/COPYING
index 3485c5a2cb..3485c5a2cb 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/COPYING
+++ b/meta/recipes-core/gettext/gettext-minimal-0.18.2/COPYING
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/Makefile.in.in b/meta/recipes-core/gettext/gettext-minimal-0.18.2/Makefile.in.in
index 83d8838ac0..fce63a6e95 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/Makefile.in.in
+++ b/meta/recipes-core/gettext/gettext-minimal-0.18.2/Makefile.in.in
@@ -8,7 +8,7 @@
8# Please note that the actual code of GNU gettext is covered by the GNU 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. 9# General Public License and is *not* in the public domain.
10# 10#
11# Origin: gettext-0.18 11# Origin: gettext-0.18.2
12GETTEXT_MACRO_VERSION = 0.18 12GETTEXT_MACRO_VERSION = 0.18
13 13
14PACKAGE = @PACKAGE@ 14PACKAGE = @PACKAGE@
@@ -96,14 +96,14 @@ CATALOGS = @CATALOGS@
96 mv t-$@ $@ 96 mv t-$@ $@
97 97
98 98
99all: check-macro-version all-@USE_NLS@ 99all: all-@USE_NLS@
100 100
101all-yes: stamp-po 101all-yes: stamp-po
102all-no: 102all-no:
103 103
104# Ensure that the gettext macros and this Makefile.in.in are in sync. 104# Ensure that the gettext macros and this Makefile.in.in are in sync.
105check-macro-version: 105CHECK_MACRO_VERSION = \
106 @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ 106 test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
107 || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ 107 || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
108 exit 1; \ 108 exit 1; \
109 } 109 }
@@ -123,6 +123,7 @@ check-macro-version:
123# $(POFILES) has been designed to not touch files that don't need to be 123# $(POFILES) has been designed to not touch files that don't need to be
124# changed. 124# changed.
125stamp-po: $(srcdir)/$(DOMAIN).pot 125stamp-po: $(srcdir)/$(DOMAIN).pot
126 @$(CHECK_MACRO_VERSION)
126 test ! -f $(srcdir)/$(DOMAIN).pot || \ 127 test ! -f $(srcdir)/$(DOMAIN).pot || \
127 test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) 128 test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
128 @test ! -f $(srcdir)/$(DOMAIN).pot || { \ 129 @test ! -f $(srcdir)/$(DOMAIN).pot || { \
@@ -137,8 +138,16 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
137 138
138# This target rebuilds $(DOMAIN).pot; it is an expensive operation. 139# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
139# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. 140# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
141# The determination of whether the package xyz is a GNU one is based on the
142# heuristic whether some file in the top level directory mentions "GNU xyz".
143# If GNU 'find' is available, we avoid grepping through monster files.
140$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed 144$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
141 if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \ 145 if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
146 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
147 else \
148 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
149 fi; \
150 } | grep -v 'libtool:' >/dev/null; then \
142 package_gnu='GNU '; \ 151 package_gnu='GNU '; \
143 else \ 152 else \
144 package_gnu=''; \ 153 package_gnu=''; \
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/Makevars.template b/meta/recipes-core/gettext/gettext-minimal-0.18.2/Makevars.template
index 32692ab4b9..4a9ff7d231 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/Makevars.template
+++ b/meta/recipes-core/gettext/gettext-minimal-0.18.2/Makevars.template
@@ -39,3 +39,15 @@ MSGID_BUGS_ADDRESS =
39# This is the list of locale categories, beyond LC_MESSAGES, for which the 39# This is the list of locale categories, beyond LC_MESSAGES, for which the
40# message catalogs shall be used. It is usually empty. 40# message catalogs shall be used. It is usually empty.
41EXTRA_LOCALE_CATEGORIES = 41EXTRA_LOCALE_CATEGORIES =
42
43# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
44# context. Possible values are "yes" and "no". Set this to yes if the
45# package uses functions taking also a message context, like pgettext(), or
46# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
47USE_MSGCTXT = no
48
49# These options get passed to msgmerge.
50# Useful options are in particular:
51# --previous to keep previous msgids of translated messages,
52# --quiet to reduce the verbosity.
53MSGMERGE_OPTIONS =
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.2/aclocal.tgz b/meta/recipes-core/gettext/gettext-minimal-0.18.2/aclocal.tgz
new file mode 100644
index 0000000000..a97953049d
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-minimal-0.18.2/aclocal.tgz
Binary files differ
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/config.rpath b/meta/recipes-core/gettext/gettext-minimal-0.18.2/config.rpath
index 17298f2348..1a07018281 100755
--- a/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/config.rpath
+++ b/meta/recipes-core/gettext/gettext-minimal-0.18.2/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-2010 Free Software Foundation, Inc. 5# Copyright 1996-2012 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#
@@ -25,7 +25,7 @@
25# known workaround is to choose shorter directory names for the build 25# known workaround is to choose shorter directory names for the build
26# directory and/or the installation directory. 26# directory and/or the installation directory.
27 27
28# All known linkers require a `.a' archive for static linking (except MSVC, 28# All known linkers require a '.a' archive for static linking (except MSVC,
29# which needs '.lib'). 29# which needs '.lib').
30libext=a 30libext=a
31shrext=.so 31shrext=.so
@@ -57,13 +57,6 @@ else
57 aix*) 57 aix*)
58 wl='-Wl,' 58 wl='-Wl,'
59 ;; 59 ;;
60 darwin*)
61 case $cc_basename in
62 xlc*)
63 wl='-Wl,'
64 ;;
65 esac
66 ;;
67 mingw* | cygwin* | pw32* | os2* | cegcc*) 60 mingw* | cygwin* | pw32* | os2* | cegcc*)
68 ;; 61 ;;
69 hpux9* | hpux10* | hpux11*) 62 hpux9* | hpux10* | hpux11*)
@@ -72,9 +65,7 @@ else
72 irix5* | irix6* | nonstopux*) 65 irix5* | irix6* | nonstopux*)
73 wl='-Wl,' 66 wl='-Wl,'
74 ;; 67 ;;
75 newsos6) 68 linux* | k*bsd*-gnu | kopensolaris*-gnu)
76 ;;
77 linux* | k*bsd*-gnu)
78 case $cc_basename in 69 case $cc_basename in
79 ecc*) 70 ecc*)
80 wl='-Wl,' 71 wl='-Wl,'
@@ -85,17 +76,26 @@ else
85 lf95*) 76 lf95*)
86 wl='-Wl,' 77 wl='-Wl,'
87 ;; 78 ;;
88 pgcc | pgf77 | pgf90) 79 nagfor*)
80 wl='-Wl,-Wl,,'
81 ;;
82 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
89 wl='-Wl,' 83 wl='-Wl,'
90 ;; 84 ;;
91 ccc*) 85 ccc*)
92 wl='-Wl,' 86 wl='-Wl,'
93 ;; 87 ;;
88 xl* | bgxl* | bgf* | mpixl*)
89 wl='-Wl,'
90 ;;
94 como) 91 como)
95 wl='-lopt=' 92 wl='-lopt='
96 ;; 93 ;;
97 *) 94 *)
98 case `$CC -V 2>&1 | sed 5q` in 95 case `$CC -V 2>&1 | sed 5q` in
96 *Sun\ F* | *Sun*Fortran*)
97 wl=
98 ;;
99 *Sun\ C*) 99 *Sun\ C*)
100 wl='-Wl,' 100 wl='-Wl,'
101 ;; 101 ;;
@@ -103,13 +103,24 @@ else
103 ;; 103 ;;
104 esac 104 esac
105 ;; 105 ;;
106 newsos6)
107 ;;
108 *nto* | *qnx*)
109 ;;
106 osf3* | osf4* | osf5*) 110 osf3* | osf4* | osf5*)
107 wl='-Wl,' 111 wl='-Wl,'
108 ;; 112 ;;
109 rdos*) 113 rdos*)
110 ;; 114 ;;
111 solaris*) 115 solaris*)
112 wl='-Wl,' 116 case $cc_basename in
117 f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
118 wl='-Qoption ld '
119 ;;
120 *)
121 wl='-Wl,'
122 ;;
123 esac
113 ;; 124 ;;
114 sunos4*) 125 sunos4*)
115 wl='-Qoption ld ' 126 wl='-Qoption ld '
@@ -171,15 +182,14 @@ if test "$with_gnu_ld" = yes; then
171 fi 182 fi
172 ;; 183 ;;
173 amigaos*) 184 amigaos*)
174 hardcode_libdir_flag_spec='-L$libdir' 185 case "$host_cpu" in
175 hardcode_minus_L=yes 186 powerpc)
176 # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports 187 ;;
177 # that the semantics of dynamic libraries on AmigaOS, at least up 188 m68k)
178 # to version 4, is to share data among multiple programs linked 189 hardcode_libdir_flag_spec='-L$libdir'
179 # with the same dynamic library. Since this doesn't match the 190 hardcode_minus_L=yes
180 # behavior of shared libraries on other platforms, we cannot use 191 ;;
181 # them. 192 esac
182 ld_shlibs=no
183 ;; 193 ;;
184 beos*) 194 beos*)
185 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then 195 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -198,11 +208,13 @@ if test "$with_gnu_ld" = yes; then
198 ld_shlibs=no 208 ld_shlibs=no
199 fi 209 fi
200 ;; 210 ;;
211 haiku*)
212 ;;
201 interix[3-9]*) 213 interix[3-9]*)
202 hardcode_direct=no 214 hardcode_direct=no
203 hardcode_libdir_flag_spec='${wl}-rpath,$libdir' 215 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
204 ;; 216 ;;
205 gnu* | linux* | k*bsd*-gnu) 217 gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
206 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then 218 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
207 : 219 :
208 else 220 else
@@ -325,10 +337,14 @@ else
325 fi 337 fi
326 ;; 338 ;;
327 amigaos*) 339 amigaos*)
328 hardcode_libdir_flag_spec='-L$libdir' 340 case "$host_cpu" in
329 hardcode_minus_L=yes 341 powerpc)
330 # see comment about different semantics on the GNU ld section 342 ;;
331 ld_shlibs=no 343 m68k)
344 hardcode_libdir_flag_spec='-L$libdir'
345 hardcode_minus_L=yes
346 ;;
347 esac
332 ;; 348 ;;
333 bsdi[45]*) 349 bsdi[45]*)
334 ;; 350 ;;
@@ -342,24 +358,15 @@ else
342 ;; 358 ;;
343 darwin* | rhapsody*) 359 darwin* | rhapsody*)
344 hardcode_direct=no 360 hardcode_direct=no
345 if test "$GCC" = yes ; then 361 if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
346 : 362 :
347 else 363 else
348 case $cc_basename in 364 ld_shlibs=no
349 xlc*)
350 ;;
351 *)
352 ld_shlibs=no
353 ;;
354 esac
355 fi 365 fi
356 ;; 366 ;;
357 dgux*) 367 dgux*)
358 hardcode_libdir_flag_spec='-L$libdir' 368 hardcode_libdir_flag_spec='-L$libdir'
359 ;; 369 ;;
360 freebsd1*)
361 ld_shlibs=no
362 ;;
363 freebsd2.2*) 370 freebsd2.2*)
364 hardcode_libdir_flag_spec='-R$libdir' 371 hardcode_libdir_flag_spec='-R$libdir'
365 hardcode_direct=yes 372 hardcode_direct=yes
@@ -420,6 +427,8 @@ else
420 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 427 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
421 hardcode_libdir_separator=: 428 hardcode_libdir_separator=:
422 ;; 429 ;;
430 *nto* | *qnx*)
431 ;;
423 openbsd*) 432 openbsd*)
424 if test -f /usr/libexec/ld.so; then 433 if test -f /usr/libexec/ld.so; then
425 hardcode_direct=yes 434 hardcode_direct=yes
@@ -515,7 +524,12 @@ case "$host_os" in
515 library_names_spec='$libname$shrext' 524 library_names_spec='$libname$shrext'
516 ;; 525 ;;
517 amigaos*) 526 amigaos*)
518 library_names_spec='$libname.a' 527 case "$host_cpu" in
528 powerpc*)
529 library_names_spec='$libname$shrext' ;;
530 m68k)
531 library_names_spec='$libname.a' ;;
532 esac
519 ;; 533 ;;
520 beos*) 534 beos*)
521 library_names_spec='$libname$shrext' 535 library_names_spec='$libname$shrext'
@@ -534,8 +548,6 @@ case "$host_os" in
534 dgux*) 548 dgux*)
535 library_names_spec='$libname$shrext' 549 library_names_spec='$libname$shrext'
536 ;; 550 ;;
537 freebsd1*)
538 ;;
539 freebsd* | dragonfly*) 551 freebsd* | dragonfly*)
540 case "$host_os" in 552 case "$host_os" in
541 freebsd[123]*) 553 freebsd[123]*)
@@ -547,6 +559,9 @@ case "$host_os" in
547 gnu*) 559 gnu*)
548 library_names_spec='$libname$shrext' 560 library_names_spec='$libname$shrext'
549 ;; 561 ;;
562 haiku*)
563 library_names_spec='$libname$shrext'
564 ;;
550 hpux9* | hpux10* | hpux11*) 565 hpux9* | hpux10* | hpux11*)
551 case $host_cpu in 566 case $host_cpu in
552 ia64*) 567 ia64*)
@@ -582,7 +597,7 @@ case "$host_os" in
582 ;; 597 ;;
583 linux*oldld* | linux*aout* | linux*coff*) 598 linux*oldld* | linux*aout* | linux*coff*)
584 ;; 599 ;;
585 linux* | k*bsd*-gnu) 600 linux* | k*bsd*-gnu | kopensolaris*-gnu)
586 library_names_spec='$libname$shrext' 601 library_names_spec='$libname$shrext'
587 ;; 602 ;;
588 knetbsd*-gnu) 603 knetbsd*-gnu)
@@ -594,7 +609,7 @@ case "$host_os" in
594 newsos6) 609 newsos6)
595 library_names_spec='$libname$shrext' 610 library_names_spec='$libname$shrext'
596 ;; 611 ;;
597 nto-qnx*) 612 *nto* | *qnx*)
598 library_names_spec='$libname$shrext' 613 library_names_spec='$libname$shrext'
599 ;; 614 ;;
600 openbsd*) 615 openbsd*)
@@ -625,6 +640,9 @@ case "$host_os" in
625 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) 640 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
626 library_names_spec='$libname$shrext' 641 library_names_spec='$libname$shrext'
627 ;; 642 ;;
643 tpf*)
644 library_names_spec='$libname$shrext'
645 ;;
628 uts4*) 646 uts4*)
629 library_names_spec='$libname$shrext' 647 library_names_spec='$libname$shrext'
630 ;; 648 ;;
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin b/meta/recipes-core/gettext/gettext-minimal-0.18.2/remove-potcdate.sin
index 2436c49e78..2436c49e78 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin
+++ b/meta/recipes-core/gettext/gettext-minimal-0.18.2/remove-potcdate.sin
diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.18.2.bb
index f008a792d4..da6d3bc6a1 100644
--- a/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext-minimal-native_0.18.2.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0854da868a929923087141d9d7aba7d5"
12 12
13inherit native 13inherit native
14 14
15PR = "r5" 15PR = "r0"
16 16
17S = "${WORKDIR}" 17S = "${WORKDIR}"
18 18