summaryrefslogtreecommitdiffstats
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)
downloadpoky-ea45876d7ba3d4d2b132fd38a2c40834a2385f34.tar.gz
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 0000000000..eba3d805d4
--- /dev/null
+++ b/meta/packages/icu/files/noldlibpath.patch
@@ -0,0 +1,47 @@
1Setting LD_LIBRARY_PATH is a really bad idea when cross compiling. Simplest way
2to disable this is to rename the variable as per the patch below, then its
3harmless. This is a hack.
4
5RP 10/6/2010
6
7Index: source/config/Makefile.inc.in
8===================================================================
9--- source.orig/config/Makefile.inc.in 2010-06-10 21:49:19.000000000 +0100
10+++ source/config/Makefile.inc.in 2010-06-10 21:49:46.000000000 +0100
11@@ -126,7 +126,7 @@
12 ##################################################################
13 # Environment variable to set a runtime search path
14 # (Overridden when necessary in -mh files)
15-LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH
16+LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH2
17
18 # Versioned target for a shared library
19 FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)
20Index: source/icudefs.mk.in
21===================================================================
22--- source.orig/icudefs.mk.in 2010-06-10 21:51:03.000000000 +0100
23+++ source/icudefs.mk.in 2010-06-10 21:51:09.000000000 +0100
24@@ -150,7 +150,7 @@
25 SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared
26
27 # Environment variable to set a runtime search path
28-LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH
29+LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH2
30
31 # Versioned target for a shared library.
32 FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)
33Index: source/tools/genrb/gendtjar.pl
34===================================================================
35--- source.orig/tools/genrb/gendtjar.pl 2010-06-10 21:51:36.000000000 +0100
36+++ source/tools/genrb/gendtjar.pl 2010-06-10 21:52:03.000000000 +0100
37@@ -68,8 +68,8 @@
38 $icuLibDir = abs_path($icuBinDir."/../lib");
39 $path .=":$icuBinDir:$icuLibDir";
40
41- $libpath = $ENV{'LD_LIBRARY_PATH'}.":$icuLibDir";
42- $ENV{'LD_LIBRARY_PATH'} = $libpath;
43+ $libpath = $ENV{'LD_LIBRARY_PATH2'}.":$icuLibDir";
44+ $ENV{'LD_LIBRARY_PATH2'} = $libpath;
45
46 #print ("##### LD_LIBRARY_PATH = $ENV{'LD_LIBRARY_PATH'}\n");
47
diff --git a/meta/packages/icu/icu-3.6.inc b/meta/packages/icu/icu-3.6.inc
index 3a186150de..e99fc4a202 100644
--- a/meta/packages/icu/icu-3.6.inc
+++ b/meta/packages/icu/icu-3.6.inc
@@ -1,6 +1,7 @@
1 1
2SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \ 2SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \
3 file://gccfix.patch;patch=1 \ 3 file://gccfix.patch;patch=1 \
4 file://noldlibpath.patch;patch=1 \
4 file://use-g++-for-linking.patch;patch=1" 5 file://use-g++-for-linking.patch;patch=1"
5LICENSE = "ICU" 6LICENSE = "ICU"
6DEPENDS = "icu-native" 7DEPENDS = "icu-native"
diff --git a/meta/packages/icu/icu_3.6.bb b/meta/packages/icu/icu_3.6.bb
index 7490dbd6cf..20e7df857d 100644
--- a/meta/packages/icu/icu_3.6.bb
+++ b/meta/packages/icu/icu_3.6.bb
@@ -1,6 +1,6 @@
1require icu-3.6.inc 1require icu-3.6.inc
2 2
3PR = "r4" 3PR = "r5"
4 4
5 5
6 6