fabad007c6
Also regenerated all patches using make icu.genpatch (hence the .1 suffix that indicates the path level) as some hunks did not apply anyway and all now have the correct offset. Using genpatch may have the future benefit to yield smaller diffs between different versions of patches. Also prefixed all patch names with icu4c- for a cleaner listing. New patches introduced are prefixed with icu4c-59-... Change-Id: Ia83754b0823839887fce1a1d4ed04f8375b113c2 Reviewed-on: https://gerrit.libreoffice.org/36809 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
36 lines
1.5 KiB
Groff
36 lines
1.5 KiB
Groff
diff -ur icu.org/source/config/mh-linux icu/source/config/mh-linux
|
|
--- icu.org/source/config/mh-linux 2016-06-15 20:58:17.000000000 +0200
|
|
+++ icu/source/config/mh-linux 2017-04-21 22:38:18.893927819 +0200
|
|
@@ -22,6 +22,10 @@
|
|
LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
|
|
LD_RPATH_PRE = -Wl,-rpath,
|
|
|
|
+## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH:
|
|
+ENABLE_RPATH=YES
|
|
+RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN'
|
|
+
|
|
## These are the library specific LDFLAGS
|
|
LDFLAGSICUDT=-nodefaultlibs -nostdlib
|
|
|
|
diff -ur icu.org/source/data/pkgdataMakefile.in icu/source/data/pkgdataMakefile.in
|
|
--- icu.org/source/data/pkgdataMakefile.in 2016-06-15 20:58:17.000000000 +0200
|
|
+++ icu/source/data/pkgdataMakefile.in 2017-04-21 22:38:18.892927822 +0200
|
|
@@ -17,6 +17,9 @@
|
|
OUTPUTFILE=icupkg.inc
|
|
MIDDLE_SO_TARGET=
|
|
|
|
+# escape $ with \ when passing to echo; needed to preserve $ORIGIN
|
|
+SHLIB.c.shell := $(subst $$,\$$,$(SHLIB.c))
|
|
+
|
|
all : clean
|
|
@echo GENCCODE_ASSEMBLY_TYPE=$(GENCCODE_ASSEMBLY) >> $(OUTPUTFILE)
|
|
@echo SO=$(SO) >> $(OUTPUTFILE)
|
|
@@ -26,7 +29,7 @@
|
|
@echo LIB_EXT_ORDER=$(FINAL_SO_TARGET) >> $(OUTPUTFILE)
|
|
@echo COMPILE="$(COMPILE.c)" >> $(OUTPUTFILE)
|
|
@echo LIBFLAGS="-I$(top_srcdir)/common -I$(top_builddir)/common $(SHAREDLIBCPPFLAGS) $(SHAREDLIBCFLAGS)" >> $(OUTPUTFILE)
|
|
- @echo GENLIB="$(SHLIB.c)" >> $(OUTPUTFILE)
|
|
+ @echo GENLIB="$(SHLIB.c.shell)" >> $(OUTPUTFILE)
|
|
@echo LDICUDTFLAGS=$(LDFLAGSICUDT) >> $(OUTPUTFILE)
|
|
@echo LD_SONAME=$(LD_SONAME) >> $(OUTPUTFILE)
|
|
@echo RPATH_FLAGS=$(RPATH_FLAGS) >> $(OUTPUTFILE)
|