- Define new variable U_CC and U_CXX which do not have build path.
The output of icuinfo will not have build path in it:
...
root@qemux86-64:~# icuinfo
<icuSystemParams type="icu4c">
[snip]
<param name="build.cc">x86_64-poky-linux-gcc -m64 -march=core2
-mtune=core2 -msse3 -mfpmath=sse
<param name="build.cxx">x86_64-poky-linux-g++ -m64 -march=core2
-mtune=core2 -msse3 -mfpmath=sse
[snip]
</icuSystemParams>
...
- Remove build paths in pkgdata.inc, Makefile.inc and
icu-config.
[YOCTO #7058]
Signed-off-by: Hongxu Jia <hongxu....@windriver.com>
---
.../icu/icu/add-variable-U_CC-and-U_CXX.patch | 61 ++++++++++++++++++++++
meta/recipes-support/icu/icu_56.1.bb | 12 +++++
2 files changed, 73 insertions(+)
create mode 100644
meta/recipes-support/icu/icu/add-variable-U_CC-and-U_CXX.patch
diff --git a/meta/recipes-support/icu/icu/add-variable-U_CC-and-U_CXX.patch
b/meta/recipes-support/icu/icu/add-variable-U_CC-and-U_CXX.patch
new file mode 100644
index 0000000..826d934
--- /dev/null
+++ b/meta/recipes-support/icu/icu/add-variable-U_CC-and-U_CXX.patch
@@ -0,0 +1,61 @@
+From 3221b108a18edeff5424bc5c66589eb20148d9b2 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu....@windriver.com>
+Date: Wed, 2 Mar 2016 21:18:34 -0500
+Subject: [PATCH] add variable U_CC and U_CXX
+
+Define new variable U_CC and U_CXX which do not have build path.
+The output of icuinfo will not have build path in it:
+...
+root@qemux86-64:~# icuinfo
+ <icuSystemParams type="icu4c">
+ [snip]
+ <param name="build.cc">x86_64-poky-linux-gcc -m64 -march=core2
-mtune=core2 -msse3 -mfpmath=sse
+ <param name="build.cxx">x86_64-poky-linux-g++ -m64 -march=core2
-mtune=core2 -msse3 -mfpmath=sse
+ [snip]
+ </icuSystemParams>
+...
+
+Upstream-Status: Inappropriate [openembedded specific]
+
+Signed-off-by: Hongxu Jia <hongxu....@windriver.com>
+---
+ configure.ac | 9 +++++++++
+ tools/toolutil/Makefile.in | 2 +-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 595bd12..ec05c19 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -673,6 +673,15 @@ AC_SUBST(GENCCODE_ASSEMBLY)
+
+ AC_MSG_RESULT($GENCCODE_ASSEMBLY)
+
++# U_CC and U_CXX are used for icuinfo which remove
++# --sysroot for cross-compilation
++U_CC=${U_CC}
++AC_SUBST(U_CC)
++AC_MSG_RESULT(U_CC)
++U_CXX=${U_CXX}
++AC_SUBST(U_CXX)
++AC_MSG_RESULT(U_CXX)
++
+ # Checks for header files
+ AC_CHECK_HEADERS(inttypes.h)
+ if test $ac_cv_header_inttypes_h = no; then
+diff --git a/tools/toolutil/Makefile.in b/tools/toolutil/Makefile.in
+index 1fb42ed..a083522 100644
+--- a/tools/toolutil/Makefile.in
++++ b/tools/toolutil/Makefile.in
+@@ -46,7 +46,7 @@ CXXFLAGS += $(LIBCXXFLAGS)
+ CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(LIBCPPFLAGS)
+
+ # from icuinfo
+-CPPFLAGS+= "-DU_BUILD=\"@build@\"" "-DU_HOST=\"@host@\"" "-DU_CC=\"@CC@\""
"-DU_CXX=\"@CXX@\""
++CPPFLAGS+= "-DU_BUILD=\"@build@\"" "-DU_HOST=\"@host@\"" "-DU_CC=\"@U_CC@\""
"-DU_CXX=\"@U_CXX@\""
+ CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT=explicit
-DUNISTR_FROM_STRING_EXPLICIT=explicit
+
+ DEFS += -DU_TOOLUTIL_IMPLEMENTATION
+--
+1.9.1
+
diff --git a/meta/recipes-support/icu/icu_56.1.bb
b/meta/recipes-support/icu/icu_56.1.bb
index db0de10..1fd4dfc 100644
--- a/meta/recipes-support/icu/icu_56.1.bb
+++ b/meta/recipes-support/icu/icu_56.1.bb
@@ -17,6 +17,7 @@ SRC_URI = "${BASE_SRC_URI} \
file://icu-pkgdata-large-cmd.patch \
file://fix-install-manx.patch \
file://icu-release-56-1-flagparser-fix.patch \
+ file://add-variable-U_CC-and-U_CXX.patch \
"
SRC_URI_append_class-target = "\
@@ -27,3 +28,14 @@ SRC_URI[sha256sum] =
"3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/";
+
+inherit fix_buildpaths
+CACHED_CONFIGUREVARS += "U_CC="${@remove_buildpath_variable(d, 'CC')}" \
+ U_CXX="${@remove_buildpath_variable(d, 'CXX')}" \
+"
+PACKAGE_BUILDPATH_TEXT_FILES_${PN}-dev ?= " \
+ ${libdir}/${BPN}/${PV}/pkgdata.inc \
+ ${libdir}/${BPN}/${PV}/Makefile.inc \
+ ${bindir}/icu-config \
+"
+
--
1.9.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
