diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 19:09:11 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 19:09:57 +0100 |
commit | d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 (patch) | |
tree | f36fe3008f36ff75cbdd31b630f8f13f1f205ebb /meta/recipes-support/icu/files/noldlibpath.patch | |
parent | caab7fc509bf27706ff3248689f6afd04225cfda (diff) | |
download | openembedded-core-contrib-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.gz |
packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/icu/files/noldlibpath.patch')
-rw-r--r-- | meta/recipes-support/icu/files/noldlibpath.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-support/icu/files/noldlibpath.patch b/meta/recipes-support/icu/files/noldlibpath.patch new file mode 100644 index 0000000000..eba3d805d4 --- /dev/null +++ b/meta/recipes-support/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"); + |