Add a patch to icu to correctly set the rpath in zimwriterfs build.
This commit is contained in:
parent
3ad73093f5
commit
f536d625a9
|
@ -240,7 +240,8 @@ class Icu(Dependency):
|
||||||
patches = ["icu4c_fix_static_lib_name_mingw.patch",
|
patches = ["icu4c_fix_static_lib_name_mingw.patch",
|
||||||
"icu4c_android_elf64_st_info.patch",
|
"icu4c_android_elf64_st_info.patch",
|
||||||
"icu4c_custom_data.patch",
|
"icu4c_custom_data.patch",
|
||||||
"icu4c_noxlocale.patch"]
|
"icu4c_noxlocale.patch",
|
||||||
|
"icu4c_rpath.patch"]
|
||||||
|
|
||||||
|
|
||||||
class Builder(MakeBuilder):
|
class Builder(MakeBuilder):
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
diff -ur icu4c/source/config/mh-linux icu4c.rpath/source/config/mh-linux
|
||||||
|
--- icu4c/source/config/mh-linux 2018-04-17 11:31:50.674012676 +0200
|
||||||
|
+++ icu4c.rpath/source/config/mh-linux 2018-04-17 11:28:57.776134587 +0200
|
||||||
|
@@ -19,7 +19,7 @@
|
||||||
|
LIBCPPFLAGS =
|
||||||
|
|
||||||
|
## Compiler switch to embed a runtime search path
|
||||||
|
-LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
|
||||||
|
+LD_RPATH= '-Wl,-zorigin,-rpath,\$ORIGIN'
|
||||||
|
LD_RPATH_PRE = -Wl,-rpath,
|
||||||
|
|
||||||
|
## These are the library specific LDFLAGS
|
||||||
|
Les fichiers binaires icu4c/.svn/wc.db et icu4c.rpath/.svn/wc.db sont différents
|
Loading…
Reference in New Issue