summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-06-10 22:04:20 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-06-10 22:04:20 +0100
commitea45876d7ba3d4d2b132fd38a2c40834a2385f34 (patch)
tree9678174478c06b311076448c3e307b89f2d08f4a /meta
parentbeef002bb4c23f105458b8a8ead2c8eec06eb829 (diff)
downloadopenembedded-core-ea45876d7ba3d4d2b132fd38a2c40834a2385f34.tar.gz
openembedded-core-ea45876d7ba3d4d2b132fd38a2c40834a2385f34.tar.bz2
openembedded-core-ea45876d7ba3d4d2b132fd38a2c40834a2385f34.tar.xz
openembedded-core-ea45876d7ba3d4d2b132fd38a2c40834a2385f34.zip
icu: Fix LD_LIBRARY_PATH corruption causing build failures
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/icu/files/noldlibpath.patch47
-rw-r--r--meta/packages/icu/icu-3.6.inc1
-rw-r--r--meta/packages/icu/icu_3.6.bb2
3 files changed, 49 insertions, 1 deletions
diff --git a/meta/packages/icu/files/noldlibpath.patch b/meta/packages/icu/files/noldlibpath.patch
new file mode 100644
index 000000000..eba3d805d
--- /dev/null
+++ b/meta/packages/icu/files/noldlibpath.patch
@@ -0,0 +1,47 @@
+Setting LD_LIBRARY_PATH is a really bad idea when cross compiling. Simplest way
+to disable this is to rename the variable as per the patch below, then its
+harmless. This is a hack.
+
+RP 10/6/2010
+
+Index: source/config/Makefile.inc.in
+===================================================================
+--- source.orig/config/Makefile.inc.in 2010-06-10 21:49:19.000000000 +0100
++++ source/config/Makefile.inc.in 2010-06-10 21:49:46.000000000 +0100
+@@ -126,7 +126,7 @@
+ ##################################################################
+ # Environment variable to set a runtime search path
+ # (Overridden when necessary in -mh files)
+-LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH
++LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH2
+
+ # Versioned target for a shared library
+ FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)
+Index: source/icudefs.mk.in
+===================================================================
+--- source.orig/icudefs.mk.in 2010-06-10 21:51:03.000000000 +0100
++++ source/icudefs.mk.in 2010-06-10 21:51:09.000000000 +0100
+@@ -150,7 +150,7 @@
+ SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared
+
+ # Environment variable to set a runtime search path
+-LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH
++LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH2
+
+ # Versioned target for a shared library.
+ FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)
+Index: source/tools/genrb/gendtjar.pl
+===================================================================
+--- source.orig/tools/genrb/gendtjar.pl 2010-06-10 21:51:36.000000000 +0100
++++ source/tools/genrb/gendtjar.pl 2010-06-10 21:52:03.000000000 +0100
+@@ -68,8 +68,8 @@
+ $icuLibDir = abs_path($icuBinDir."/../lib");
+ $path .=":$icuBinDir:$icuLibDir";
+
+- $libpath = $ENV{'LD_LIBRARY_PATH'}.":$icuLibDir";
+- $ENV{'LD_LIBRARY_PATH'} = $libpath;
++ $libpath = $ENV{'LD_LIBRARY_PATH2'}.":$icuLibDir";
++ $ENV{'LD_LIBRARY_PATH2'} = $libpath;
+
+ #print ("##### LD_LIBRARY_PATH = $ENV{'LD_LIBRARY_PATH'}\n");
+
diff --git a/meta/packages/icu/icu-3.6.inc b/meta/packages/icu/icu-3.6.inc
index 3a186150d..e99fc4a20 100644
--- a/meta/packages/icu/icu-3.6.inc
+++ b/meta/packages/icu/icu-3.6.inc
@@ -1,6 +1,7 @@
SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \
file://gccfix.patch;patch=1 \
+ file://noldlibpath.patch;patch=1 \
file://use-g++-for-linking.patch;patch=1"
LICENSE = "ICU"
DEPENDS = "icu-native"
diff --git a/meta/packages/icu/icu_3.6.bb b/meta/packages/icu/icu_3.6.bb
index 7490dbd6c..20e7df857 100644
--- a/meta/packages/icu/icu_3.6.bb
+++ b/meta/packages/icu/icu_3.6.bb
@@ -1,6 +1,6 @@
require icu-3.6.inc
-PR = "r4"
+PR = "r5"