summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-12-13 00:48:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-17 17:24:55 +0000
commit9050f30ec5bd1a750a383d1a7355a7773234ffbe (patch)
tree69dd1d6e79ee447a3e9c876847a2e4782f0bb043 /meta/recipes-core
parentea2a7ae8c62f52f55419e169cc8fd24e823a61c8 (diff)
downloadpoky-9050f30ec5bd1a750a383d1a7355a7773234ffbe.tar.gz
gettext: move remove-potcdate.sin from gettext-native to gettext-minimal-native
* now autotools.bbclass are copying not only Makefile.in.in but also remove-potcdate.sin which is used by Makefile.in.in, so we need to provide this file already in gettext-minimal-native otherwise build can fail, when autotools.bbclass is used before gettext-native (full) is built. (From OE-Core rev: e60612a9fed96d92c5119ab3b26a355d152db1b8) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin19
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb4
-rw-r--r--meta/recipes-core/gettext/gettext_0.18.1.1.bb3
3 files changed, 24 insertions, 2 deletions
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.1.1/remove-potcdate.sin
new file mode 100644
index 0000000000..2436c49e78
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin
@@ -0,0 +1,19 @@
1# Sed script that remove the POT-Creation-Date line in the header entry
2# from a POT file.
3#
4# The distinction between the first and the following occurrences of the
5# pattern is achieved by looking at the hold space.
6/^"POT-Creation-Date: .*"$/{
7x
8# Test if the hold space is empty.
9s/P/P/
10ta
11# Yes it was empty. First occurrence. Remove the line.
12g
13d
14bb
15:a
16# The hold space was nonempty. Following occurrences. Do nothing.
17x
18:b
19}
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.1.1.bb
index a46a40d492..f008a792d4 100644
--- a/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb
@@ -1,6 +1,7 @@
1SRC_URI = "file://aclocal.tgz \ 1SRC_URI = "file://aclocal.tgz \
2 file://config.rpath \ 2 file://config.rpath \
3 file://Makefile.in.in \ 3 file://Makefile.in.in \
4 file://remove-potcdate.sin \
4 file://COPYING" 5 file://COPYING"
5 6
6INHIBIT_DEFAULT_DEPS = "1" 7INHIBIT_DEFAULT_DEPS = "1"
@@ -11,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0854da868a929923087141d9d7aba7d5"
11 12
12inherit native 13inherit native
13 14
14PR = "r4" 15PR = "r5"
15 16
16S = "${WORKDIR}" 17S = "${WORKDIR}"
17 18
@@ -21,4 +22,5 @@ do_install () {
21 install -d ${D}${datadir}/gettext/po/ 22 install -d ${D}${datadir}/gettext/po/
22 cp ${WORKDIR}/config.rpath ${D}${datadir}/gettext/ 23 cp ${WORKDIR}/config.rpath ${D}${datadir}/gettext/
23 cp ${WORKDIR}/Makefile.in.in ${D}${datadir}/gettext/po/ 24 cp ${WORKDIR}/Makefile.in.in ${D}${datadir}/gettext/po/
25 cp ${WORKDIR}/remove-potcdate.sin ${D}${datadir}/gettext/po/
24} 26}
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 c3265e1a22..4639481a54 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
5LICENSE = "GPLv3+ & LGPL-2.1+" 5LICENSE = "GPLv3+ & LGPL-2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
7 7
8PR = "r18" 8PR = "r19"
9DEPENDS = "gettext-native virtual/libiconv ncurses expat" 9DEPENDS = "gettext-native virtual/libiconv ncurses expat"
10DEPENDS_class-native = "gettext-minimal-native" 10DEPENDS_class-native = "gettext-minimal-native"
11PROVIDES = "virtual/libintl virtual/gettext" 11PROVIDES = "virtual/libintl virtual/gettext"
@@ -104,6 +104,7 @@ do_install_append_class-native () {
104 rm ${D}${datadir}/aclocal/* 104 rm ${D}${datadir}/aclocal/*
105 rm ${D}${datadir}/gettext/config.rpath 105 rm ${D}${datadir}/gettext/config.rpath
106 rm ${D}${datadir}/gettext/po/Makefile.in.in 106 rm ${D}${datadir}/gettext/po/Makefile.in.in
107 rm ${D}${datadir}/gettext/po/remove-potcdate.sin
107} 108}
108 109
109BBCLASSEXTEND = "native nativesdk" 110BBCLASSEXTEND = "native nativesdk"