From f536d625a9006d331c5d78ffc5ac957ef9f1b073 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 17 Apr 2018 11:52:47 +0200 Subject: [PATCH] Add a patch to icu to correctly set the rpath in zimwriterfs build. --- kiwixbuild/dependencies.py | 3 ++- kiwixbuild/patches/icu4c_rpath.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 kiwixbuild/patches/icu4c_rpath.patch diff --git a/kiwixbuild/dependencies.py b/kiwixbuild/dependencies.py index e9c0066..e341c2d 100644 --- a/kiwixbuild/dependencies.py +++ b/kiwixbuild/dependencies.py @@ -240,7 +240,8 @@ class Icu(Dependency): patches = ["icu4c_fix_static_lib_name_mingw.patch", "icu4c_android_elf64_st_info.patch", "icu4c_custom_data.patch", - "icu4c_noxlocale.patch"] + "icu4c_noxlocale.patch", + "icu4c_rpath.patch"] class Builder(MakeBuilder): diff --git a/kiwixbuild/patches/icu4c_rpath.patch b/kiwixbuild/patches/icu4c_rpath.patch new file mode 100644 index 0000000..13d6f15 --- /dev/null +++ b/kiwixbuild/patches/icu4c_rpath.patch @@ -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