475e4b477c
...as stoc/Library_javavm.mk depends on it since
9b09a217c7 "Resolves: #i86470# Wrong Java locale
when using 'nl' and 'fr'". The i18nlangtag lib in turn depends on libs from
external/liblangtag and external/icu, so those needed to be moved to URELIB,
too.
On Windows, the external icu package was already split into icu and icu_ure
(because "libxml2 is in URE and depends on icuuc*.dll on Windows"), so use that
splitting on all platforms. (However, the corresponding changes that were
necessary in RepositoryExternal.mk suggest that they had been missing for the
split Windows case until now, and things had happened to work by accident?)
On macOS, a library's install name reflects its (URELIB, OOO, ...) layer, and in
external/icu/icu4c-build.patch there is only a single place to set that for all
libs from external/icu. This patch changes that from OOO to URELIB, but for the
icui18n lib that should stay at OOO. The hack to make it URELIB nonetheless
works for now. To clean this up again, either the whole of icu could go into
URE (dropping the icu vs. icu_ure package split completely), or the macOS layers
URELIB and OOO could be combined into one (as the libs end up in the same
directory anyway).
Change-Id: Idc262fa41481d06ba2cae86ad7629cdccb392c07
Reviewed-on: https://gerrit.libreoffice.org/30272
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
88 lines
3.2 KiB
Diff
88 lines
3.2 KiB
Diff
--- misc/icu/source/tools/toolutil/pkg_genc.h
|
|
+++ misc/build/icu/source/tools/toolutil/pkg_genc.h
|
|
@@ -58,7 +58,7 @@
|
|
#endif
|
|
|
|
#define LARGE_BUFFER_MAX_SIZE 2048
|
|
-#define SMALL_BUFFER_MAX_SIZE 512
|
|
+#define SMALL_BUFFER_MAX_SIZE 2048
|
|
#define SMALL_BUFFER_FLAG_NAMES 32
|
|
#define BUFFER_PADDING_SIZE 20
|
|
|
|
--- misc/icu/source/tools/toolutil/pkg_genc.c
|
|
+++ misc/build/icu/source/tools/toolutil/pkg_genc.c
|
|
@@ -152,6 +152,28 @@
|
|
|
|
".long ","",HEX_0X
|
|
},
|
|
+ {"gcc-android-arm",
|
|
+ "\t.arch armv5te\n"
|
|
+ "\t.fpu softvfp\n"
|
|
+ "\t.eabi_attribute 20, 1\n"
|
|
+ "\t.eabi_attribute 21, 1\n"
|
|
+ "\t.eabi_attribute 23, 3\n"
|
|
+ "\t.eabi_attribute 24, 1\n"
|
|
+ "\t.eabi_attribute 25, 1\n"
|
|
+ "\t.eabi_attribute 26, 2\n"
|
|
+ "\t.eabi_attribute 30, 6\n"
|
|
+ "\t.eabi_attribute 18, 4\n"
|
|
+ "\t.file \"%s.s\"\n"
|
|
+ "\t.global %s\n"
|
|
+ "\t.section .rodata\n"
|
|
+ "\t.align 2\n"
|
|
+ "\t.type %s, %%object\n"
|
|
+ "%s:\n",
|
|
+
|
|
+ "\t.word ",
|
|
+ "\t.section .note.GNU-stack,\"\",%%progbits\n",
|
|
+ HEX_0X
|
|
+ },
|
|
/* 16 bytes alignment. */
|
|
/* http://docs.oracle.com/cd/E19641-01/802-1947/802-1947.pdf */
|
|
{"sun",
|
|
--- misc/icu/source/config/mh-darwin 2010-09-29 20:37:36.000000000 +0200
|
|
+++ misc/build/icu/source/config/mh-darwin 2011-03-15 10:56:26.653056004 +0100
|
|
@@ -28,11 +28,7 @@
|
|
SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
|
|
|
|
## Compiler switches to embed a library name and version information
|
|
-ifeq ($(ENABLE_RPATH),YES)
|
|
-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
|
|
-else
|
|
-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
|
|
-endif
|
|
+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @__________________________________________________URELIB/$(notdir $(MIDDLE_SO_TARGET))
|
|
|
|
## Compiler switch to embed a runtime search path
|
|
LD_RPATH=
|
|
@@ -48,10 +44,6 @@
|
|
## Non-shared intermediate object suffix
|
|
STATIC_O = ao
|
|
|
|
-## Override Versioned target for a shared library.
|
|
-FINAL_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO)
|
|
-MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO)
|
|
-
|
|
## Compilation and dependency rules
|
|
%.$(STATIC_O): $(srcdir)/%.c
|
|
$(call SILENT_COMPILE,$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<)
|
|
@@ -65,16 +57,10 @@
|
|
|
|
## Versioned libraries rules
|
|
|
|
-%.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO)
|
|
+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
|
|
$(RM) $@ && ln -s ${<F} $@
|
|
-%.$(SO): %.$(SO_TARGET_VERSION_MAJOR).$(SO)
|
|
- $(RM) $@ && ln -s ${*F}.$(SO_TARGET_VERSION).$(SO) $@
|
|
-
|
|
-# tzcode option
|
|
-TZORIG_EXTRA_CFLAGS=-DSTD_INSPIRED
|
|
-
|
|
-# genren opts
|
|
-GENREN_PL_OPTS=-x Mach-O -n '-g' -p '| c++filt'
|
|
+%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
|
|
+ $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
|
|
|
|
## Remove shared library 's'
|
|
STATIC_PREFIX_WHEN_USED =
|