summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2012-12-03 18:21:08 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:12 +0000
commitbd368cf0e6478edd98cbb7a29f00195a0b789bf3 (patch)
tree7eeb3bb5a6c9bdd2517c46edd8ed8a354842de7c /meta
parent60fc9a9ef98814f7d9e848f3c4656ab719541610 (diff)
downloadpoky-bd368cf0e6478edd98cbb7a29f00195a0b789bf3.tar.gz
ICU: add pkgconfig support
Add pkgconfig support to ICU. [YOCTO #2453] (From OE-Core rev: a0b553bf00f819c3f0d6744461189179f578a75e) Signed-off-by: Chen Qi <Qi.Chen@windriver.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-support/icu/files/icu-add-pkgconfig-support.patch43
-rw-r--r--meta/recipes-support/icu/icu-3.6.inc11
-rw-r--r--meta/recipes-support/icu/icu_3.6.bb2
3 files changed, 55 insertions, 1 deletions
diff --git a/meta/recipes-support/icu/files/icu-add-pkgconfig-support.patch b/meta/recipes-support/icu/files/icu-add-pkgconfig-support.patch
new file mode 100644
index 0000000000..c7cd9d5d7e
--- /dev/null
+++ b/meta/recipes-support/icu/files/icu-add-pkgconfig-support.patch
@@ -0,0 +1,43 @@
1Upstream-Status: Inappropriate [version]
2ICU-3.6 has no pkgconfig, so I add it here.
3But ICU has had pkgconfig support since 4.6.
4So this patch is inappropriate to upstream.
5
6Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
7
8Index: configure.in
9=============================================================
10--- a/configure.in
11+++ b/configure.in
12@@ -1057,4 +1057,7 @@ echo "This may cause ICU to fail to build. Please make sure that GNU make"
13 echo "is in your PATH so that this configure script can detect its location."
14 fi
15
16+AC_CONFIG_FILES([icu.pc])
17+AC_OUTPUT
18+
19 $as_unset _CXX_CXXSUFFIX
20
21Index: icu.pc.in
22=============================================================
23--- /dev/null
24+++ b/icu.pc.in
25@@ -0,0 +1,15 @@
26+# Process this file with autoconf to produce a pkg-config metadata file.
27+
28+prefix=@prefix@
29+exec_prefix=@exec_prefix@
30+libdir=@libdir@
31+includedir=@includedir@
32+unicode_version=@UNICODE_VERSION@
33+
34+Name: ICU
35+Description: International Component for Unicode libraries
36+Requires:
37+Version: @VERSION@
38+Libs: -L${libdir} -licui18n -licuuc -licudata
39+Libs.private: -L{libdir} -lpthread -lm
40+Cflags: -I${includedir} -O2 -pipe -g -feliminate-unused-debug-types
41--
421.7.11.2
43
diff --git a/meta/recipes-support/icu/icu-3.6.inc b/meta/recipes-support/icu/icu-3.6.inc
index 272f6d15ba..8caf71c645 100644
--- a/meta/recipes-support/icu/icu-3.6.inc
+++ b/meta/recipes-support/icu/icu-3.6.inc
@@ -7,6 +7,7 @@ BASE_SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-
7 file://fix-parallel-build.patch \ 7 file://fix-parallel-build.patch \
8 file://use-g++-for-linking.patch \ 8 file://use-g++-for-linking.patch \
9 file://larger-cmd-size.patch \ 9 file://larger-cmd-size.patch \
10 file://icu-add-pkgconfig-support.patch \
10 " 11 "
11SRC_URI = "${BASE_SRC_URI} \ 12SRC_URI = "${BASE_SRC_URI} \
12 file://noldlibpath.patch \ 13 file://noldlibpath.patch \
@@ -28,6 +29,12 @@ inherit autotools pkgconfig binconfig
28do_configure() { 29do_configure() {
29 libtoolize --force 30 libtoolize --force
30 gnu-configize --force 31 gnu-configize --force
32 if [ "${PN}" != "icu-native" ]; then
33 OLD=`pwd`
34 cd ${S}
35 autoconf
36 cd ${OLD}
37 fi
31 oe_runconf 38 oe_runconf
32 if [ "${PN}" != "icu-native" ]; then 39 if [ "${PN}" != "icu-native" ]; then
33 # In the non-native case we need to make substitutions to use 40 # In the non-native case we need to make substitutions to use
@@ -45,6 +52,10 @@ do_compile() {
45 52
46do_install_append() { 53do_install_append() {
47 chmod +x ${D}${libdir}/lib* 54 chmod +x ${D}${libdir}/lib*
55 if [ "${PN}" != "icu-native" ]; then
56 install -d ${D}/${libdir}/pkgconfig
57 install -m 0644 ${S}/icu.pc ${D}/${libdir}/pkgconfig
58 fi
48} 59}
49 60
50PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio" 61PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio"
diff --git a/meta/recipes-support/icu/icu_3.6.bb b/meta/recipes-support/icu/icu_3.6.bb
index f941acf81f..f50abe231c 100644
--- a/meta/recipes-support/icu/icu_3.6.bb
+++ b/meta/recipes-support/icu/icu_3.6.bb
@@ -1,6 +1,6 @@
1require icu-3.6.inc 1require icu-3.6.inc
2 2
3PR = "r9" 3PR = "r10"
4 4
5SRC_URI[md5sum] = "6243f7a19e03e05403ce84e597510d4c" 5SRC_URI[md5sum] = "6243f7a19e03e05403ce84e597510d4c"
6SRC_URI[sha256sum] = "5135e8d69d6206d320515df7aeee7027711ab1aef9d8dbf29571a97a9746b041" 6SRC_URI[sha256sum] = "5135e8d69d6206d320515df7aeee7027711ab1aef9d8dbf29571a97a9746b041"