summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/icu/files/noldlibpath.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/icu/files/noldlibpath.patch')
-rw-r--r--meta/recipes-support/icu/files/noldlibpath.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/meta/recipes-support/icu/files/noldlibpath.patch b/meta/recipes-support/icu/files/noldlibpath.patch
deleted file mode 100644
index 8543044b2c..0000000000
--- a/meta/recipes-support/icu/files/noldlibpath.patch
+++ /dev/null
@@ -1,52 +0,0 @@
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
7Upstream-Status: Inappropriate [Other]
8Hacky workaround not likely to be accepted upstream.
9
10Signed-off-by: Scott Garman <scott.a.garman@intel.com>
11
12Index: source/config/Makefile.inc.in
13===================================================================
14--- source.orig/config/Makefile.inc.in 2010-06-10 21:49:19.000000000 +0100
15+++ source/config/Makefile.inc.in 2010-06-10 21:49:46.000000000 +0100
16@@ -126,7 +126,7 @@
17 ##################################################################
18 # Environment variable to set a runtime search path
19 # (Overridden when necessary in -mh files)
20-LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH
21+LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH2
22
23 # Versioned target for a shared library
24 FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)
25Index: source/icudefs.mk.in
26===================================================================
27--- source.orig/icudefs.mk.in 2010-06-10 21:51:03.000000000 +0100
28+++ source/icudefs.mk.in 2010-06-10 21:51:09.000000000 +0100
29@@ -150,7 +150,7 @@
30 SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared
31
32 # Environment variable to set a runtime search path
33-LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH
34+LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH2
35
36 # Versioned target for a shared library.
37 FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)
38Index: source/tools/genrb/gendtjar.pl
39===================================================================
40--- source.orig/tools/genrb/gendtjar.pl 2010-06-10 21:51:36.000000000 +0100
41+++ source/tools/genrb/gendtjar.pl 2010-06-10 21:52:03.000000000 +0100
42@@ -68,8 +68,8 @@
43 $icuLibDir = abs_path($icuBinDir."/../lib");
44 $path .=":$icuBinDir:$icuLibDir";
45
46- $libpath = $ENV{'LD_LIBRARY_PATH'}.":$icuLibDir";
47- $ENV{'LD_LIBRARY_PATH'} = $libpath;
48+ $libpath = $ENV{'LD_LIBRARY_PATH2'}.":$icuLibDir";
49+ $ENV{'LD_LIBRARY_PATH2'} = $libpath;
50
51 #print ("##### LD_LIBRARY_PATH = $ENV{'LD_LIBRARY_PATH'}\n");
52