summaryrefslogtreecommitdiffstats
path: root/meta/packages/gettext
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-08-18 18:14:09 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-08-18 18:14:09 +0100
commitd3983072bc481df2803c12944f2eca6f7aa79809 (patch)
tree2249ca95498e58fb8edcc8cc072af7bfc7860c77 /meta/packages/gettext
parentb2d195641dcbd4939680c1ab7bd51863b68bcc55 (diff)
downloadpoky-d3983072bc481df2803c12944f2eca6f7aa79809.tar.gz
Add gettext 0.17 (from OE.dev)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/gettext')
-rw-r--r--meta/packages/gettext/gettext-0.17/autotools.patch62
-rw-r--r--meta/packages/gettext/gettext-0.17/gettext-error_print_progname.patch13
-rw-r--r--meta/packages/gettext/gettext-0.17/use_open_properly.patch15
-rw-r--r--meta/packages/gettext/gettext-0.17/wchar-uclibc.patch96
-rw-r--r--meta/packages/gettext/gettext-native_0.17.bb67
-rw-r--r--meta/packages/gettext/gettext_0.17.bb49
6 files changed, 302 insertions, 0 deletions
diff --git a/meta/packages/gettext/gettext-0.17/autotools.patch b/meta/packages/gettext/gettext-0.17/autotools.patch
new file mode 100644
index 0000000000..9f16b1881f
--- /dev/null
+++ b/meta/packages/gettext/gettext-0.17/autotools.patch
@@ -0,0 +1,62 @@
1Index: gettext-0.17/gettext-runtime/man/Makefile.am
2===================================================================
3--- gettext-0.17.orig/gettext-runtime/man/Makefile.am 2007-10-07 21:37:36.000000000 +0200
4+++ gettext-0.17/gettext-runtime/man/Makefile.am 2008-05-09 22:46:37.000000000 +0200
5@@ -158,8 +158,7 @@
6 $(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
7 mv t-$@ $@
8
9-install-html-local:
10- $(mkdir_p) $(DESTDIR)$(htmldir)
11+install-html: installdirs-html
12 for file in $(man_HTML); do \
13 if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
14 $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
15Index: gettext-0.17/gettext-tools/man/Makefile.am
16===================================================================
17--- gettext-0.17.orig/gettext-tools/man/Makefile.am 2007-10-28 00:18:37.000000000 +0200
18+++ gettext-0.17/gettext-tools/man/Makefile.am 2008-05-09 22:46:37.000000000 +0200
19@@ -186,8 +186,7 @@
20 $(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
21 mv t-$@ $@
22
23-install-html-local:
24- $(mkdir_p) $(DESTDIR)$(htmldir)
25+install-html: installdirs-html
26 for file in $(man_HTML); do \
27 if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
28 $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
29Index: gettext-0.17/gettext-runtime/libasprintf/configure.ac
30===================================================================
31--- gettext-0.17.orig/gettext-runtime/libasprintf/configure.ac 2008-05-09 22:53:42.000000000 +0200
32+++ gettext-0.17/gettext-runtime/libasprintf/configure.ac 2008-05-09 22:53:54.000000000 +0200
33@@ -1,5 +1,5 @@
34 dnl Configuration for the GNU libasprintf library
35-dnl Copyright (C) 2002-2006 Free Software Foundation, Inc.
36+dnl Copyright (C) 2002-2007 Free Software Foundation, Inc.
37 dnl
38 dnl This program is free software: you can redistribute it and/or modify
39 dnl it under the terms of the GNU General Public License as published by
40@@ -54,8 +54,7 @@
41 dnl Checks for typedefs, structures, and compiler characteristics.
42 AC_C_INLINE
43 AC_TYPE_SIZE_T
44-gl_AC_TYPE_LONG_LONG
45-gt_TYPE_LONGDOUBLE
46+AC_TYPE_LONG_LONG_INT
47 gt_TYPE_WCHAR_T
48 gt_TYPE_WINT_T
49 AC_CHECK_TYPE([ptrdiff_t], ,
50@@ -79,8 +78,11 @@
51 AC_SUBST([ALLOCA_H])
52
53 AC_CHECK_FUNCS([snprintf vasprintf wcslen])
54-AC_CHECK_DECLS([_snprintf])
55+dnl Use the _snprintf function only if it is declared (because on NetBSD it
56+dnl is defined as a weak alias of snprintf; we prefer to use the latter).
57+AC_CHECK_DECLS([_snprintf], , , [#include <stdio.h>])
58 gt_PRINTF_POSIX
59+gl_EOVERFLOW
60
61 dnl Check for tools needed for formatting the documentation.
62 ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
diff --git a/meta/packages/gettext/gettext-0.17/gettext-error_print_progname.patch b/meta/packages/gettext/gettext-0.17/gettext-error_print_progname.patch
new file mode 100644
index 0000000000..0f67cd0b2e
--- /dev/null
+++ b/meta/packages/gettext/gettext-0.17/gettext-error_print_progname.patch
@@ -0,0 +1,13 @@
1Index: gettext-0.17/gettext-tools/libgettextpo/error.h
2===================================================================
3--- gettext-0.17.orig/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:25.561115527 +0200
4+++ gettext-0.17/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:52.454440505 +0200
5@@ -49,7 +49,7 @@
6 /* If NULL, error will flush stdout, then print on stderr the program
7 name, a colon and a space. Otherwise, error will call this
8 function without parameters instead. */
9-extern DLL_VARIABLE void (*error_print_progname) (void);
10+void (*error_print_progname) (void);
11
12 /* This variable is incremented each time `error' is called. */
13 extern DLL_VARIABLE unsigned int error_message_count;
diff --git a/meta/packages/gettext/gettext-0.17/use_open_properly.patch b/meta/packages/gettext/gettext-0.17/use_open_properly.patch
new file mode 100644
index 0000000000..111714b543
--- /dev/null
+++ b/meta/packages/gettext/gettext-0.17/use_open_properly.patch
@@ -0,0 +1,15 @@
1Index: gettext-0.17/gettext-tools/src/write-catalog.c
2===================================================================
3--- gettext-0.17.orig/gettext-tools/src/write-catalog.c 2008-10-16 15:18:16.000000000 +0200
4+++ gettext-0.17/gettext-tools/src/write-catalog.c 2008-10-16 18:17:13.000000000 +0200
5@@ -220,7 +220,9 @@
6 /* Open the output file. */
7 if (!to_stdout)
8 {
9- fd = open (filename, O_WRONLY | O_CREAT);
10+ fd = open (filename, O_WRONLY | O_CREAT,
11+ /* 0666 in portable POSIX notation: */
12+ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
13 if (fd < 0)
14 {
15 const char *errno_description = strerror (errno);
diff --git a/meta/packages/gettext/gettext-0.17/wchar-uclibc.patch b/meta/packages/gettext/gettext-0.17/wchar-uclibc.patch
new file mode 100644
index 0000000000..7b3880bf77
--- /dev/null
+++ b/meta/packages/gettext/gettext-0.17/wchar-uclibc.patch
@@ -0,0 +1,96 @@
1Index: gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h
2===================================================================
3--- gettext-0.17.orig/gettext-runtime/gnulib-lib/wchar.in.h 2008-07-29 14:51:52.336394636 +0200
4+++ gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h 2008-07-29 14:52:25.546430195 +0200
5@@ -1,6 +1,6 @@
6 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
7
8- Copyright (C) 2007 Free Software Foundation, Inc.
9+ Copyright (C) 2007-2008 Free Software Foundation, Inc.
10
11 This program is free software; you can redistribute it and/or modify
12 it under the terms of the GNU General Public License as published by
13@@ -26,6 +26,14 @@
14 * the declaration of wcwidth().
15 */
16
17+#ifdef __need_mbstate_t
18+/* Special invocation convention inside uClibc header files. */
19+
20+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
21+
22+#else
23+/* Normal invocation convention. */
24+
25 #ifndef _GL_WCHAR_H
26
27 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
28@@ -80,3 +88,4 @@
29
30 #endif /* _GL_WCHAR_H */
31 #endif /* _GL_WCHAR_H */
32+#endif
33Index: gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h
34===================================================================
35--- gettext-0.17.orig/gettext-tools/gnulib-lib/wchar.in.h 2008-07-29 14:52:03.886393956 +0200
36+++ gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h 2008-07-29 14:52:50.876388000 +0200
37@@ -1,6 +1,6 @@
38 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
39
40- Copyright (C) 2007 Free Software Foundation, Inc.
41+ Copyright (C) 2007-2008 Free Software Foundation, Inc.
42
43 This program is free software; you can redistribute it and/or modify
44 it under the terms of the GNU General Public License as published by
45@@ -26,6 +26,14 @@
46 * the declaration of wcwidth().
47 */
48
49+#ifdef __need_mbstate_t
50+/* Special invocation convention inside uClibc header files. */
51+
52+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
53+
54+#else
55+/* Normal invocation convention. */
56+
57 #ifndef _GL_WCHAR_H
58
59 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
60@@ -80,3 +88,4 @@
61
62 #endif /* _GL_WCHAR_H */
63 #endif /* _GL_WCHAR_H */
64+#endif
65Index: gettext-0.17/gettext-tools/libgettextpo/wchar.in.h
66===================================================================
67--- gettext-0.17.orig/gettext-tools/libgettextpo/wchar.in.h 2008-07-29 14:51:58.826395009 +0200
68+++ gettext-0.17/gettext-tools/libgettextpo/wchar.in.h 2008-07-29 14:52:38.609723575 +0200
69@@ -1,6 +1,6 @@
70 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
71
72- Copyright (C) 2007 Free Software Foundation, Inc.
73+ Copyright (C) 2007-2008 Free Software Foundation, Inc.
74
75 This program is free software; you can redistribute it and/or modify
76 it under the terms of the GNU General Public License as published by
77@@ -26,6 +26,14 @@
78 * the declaration of wcwidth().
79 */
80
81+#ifdef __need_mbstate_t
82+/* Special invocation convention inside uClibc header files. */
83+
84+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
85+
86+#else
87+/* Normal invocation convention. */
88+
89 #ifndef _GL_WCHAR_H
90
91 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
92@@ -80,3 +88,4 @@
93
94 #endif /* _GL_WCHAR_H */
95 #endif /* _GL_WCHAR_H */
96+#endif
diff --git a/meta/packages/gettext/gettext-native_0.17.bb b/meta/packages/gettext/gettext-native_0.17.bb
new file mode 100644
index 0000000000..c73a19d78d
--- /dev/null
+++ b/meta/packages/gettext/gettext-native_0.17.bb
@@ -0,0 +1,67 @@
1require gettext_${PV}.bb
2PR = "r3"
3
4DEPENDS = ""
5PROVIDES = ""
6
7inherit native
8
9S = "${WORKDIR}/gettext-${PV}"
10FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}"
11
12M4 = "\
13ansi-c++.m4 \
14codeset.m4 \
15gettext.m4 \
16glibc21.m4 \
17glibc2.m4 \
18iconv.m4 \
19intdiv0.m4 \
20intldir.m4 \
21intl.m4 \
22intlmacosx.m4 \
23intmax.m4 \
24inttypes_h.m4 \
25inttypes-pri.m4 \
26lcmessage.m4 \
27lock.m4 \
28longlong.m4 \
29nls.m4 \
30po.m4 \
31printf-posix.m4 \
32progtest.m4 \
33size_max.m4 \
34stdint_h.m4 \
35uintmax_t.m4 \
36visibility.m4 \
37wchar_t.m4 \
38wint_t.m4 \
39xsize.m4 \
40lib-ld.m4 \
41lib-link.m4 \
42lib-prefix.m4 \
43"
44
45do_stage_append() {
46 for i in ${M4}; do
47 src="gettext-runtime/m4/$i"
48 if [ ! -f $src ]; then
49 src="gettext-tools/m4/$i"
50 fi
51 if [ ! -f $src ]; then
52 src="autoconf-lib-link/m4/$i"
53 fi
54 if [ ! -f $src ]; then
55 echo "can't find $i" >&2
56 exit 1
57 fi
58 install -m 0644 $src ${STAGING_DATADIR}/aclocal/$i
59 done
60
61 # config.rpath is needed by some configure macros and needs to be autoinstalled.
62 # automake will do this but config.rpath needs to be visible to automake
63 for i in `ls -d ${STAGING_DATADIR}/automake*`
64 do
65 cp ${STAGING_DATADIR}/gettext/config.rpath $i
66 done
67}
diff --git a/meta/packages/gettext/gettext_0.17.bb b/meta/packages/gettext/gettext_0.17.bb
new file mode 100644
index 0000000000..83d1e24a91
--- /dev/null
+++ b/meta/packages/gettext/gettext_0.17.bb
@@ -0,0 +1,49 @@
1DESCRIPTION = "The GNU internationalization library."
2HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
3SECTION = "libs"
4LICENSE = "GPLv3"
5PR = "r2"
6DEPENDS = "gettext-native virtual/libiconv ncurses expat"
7PROVIDES = "virtual/libintl"
8
9SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
10 file://autotools.patch;patch=1 \
11 file://wchar-uclibc.patch;patch=1 \
12 file://use_open_properly.patch;patch=1 \
13 "
14
15SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
16SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"
17
18PARALLEL_MAKE = ""
19
20inherit autotools_stage
21
22EXTRA_OECONF += "--without-lispdir \
23 --disable-csharp \
24 --disable-libasprintf \
25 --disable-java \
26 --disable-native-java \
27 --disable-openmp \
28 --with-included-glib \
29 --without-emacs \
30 "
31
32acpaths = '-I ${S}/autoconf-lib-link/m4/ \
33 -I ${S}/gettext-runtime/m4 \
34 -I ${S}/gettext-tools/m4'
35
36
37# these lack the .x behind the .so, but shouldn't be in the -dev package
38# Otherwise you get the following results:
39# 7.4M glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
40# 25M uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
41# because gettext depends on gettext-dev, which pulls in more -dev packages:
42# 15228 KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk
43# 1300 KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk
44# 140 KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk
45# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
46
47PACKAGES =+ "libgettextlib libgettextsrc"
48FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
49FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"