From: Thomas Petazzoni Date: Thu, 5 Apr 2018 19:50:30 +0000 (+0200) Subject: icu: remove Blackfin patch X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ab6d421c58ed9aac610f5d246946c66cd3f2c08d;p=buildroot.git icu: remove Blackfin patch And renumber remaining patches. Signed-off-by: Thomas Petazzoni --- diff --git a/package/icu/0003-detect-compiler-symbol-prefix.patch b/package/icu/0003-detect-compiler-symbol-prefix.patch deleted file mode 100644 index 1e9537503b..0000000000 --- a/package/icu/0003-detect-compiler-symbol-prefix.patch +++ /dev/null @@ -1,116 +0,0 @@ -detect and add compiler symbol prefix to the assembly code - -Some compiler, such as Blackfin GNU compiler, prefix a charater to any -C symbol in generated assembly code. If any assembly symbol is invoked -from C code, it needs to be prefixed as well. - -Note: since autoreconf doesn't work with this package because automake -isn't support - -[Ryan: add information about why patching configure is ok] -[Gustavo: update for ICU4C 54.1] - -Signed-off-by: Sonic Zhang -Signed-off-by: Ryan Barnett -Signed-off-by: Gustavo Zacarias - -diff -Nura icu.orig/source/configure icu/source/configure ---- icu.orig/source/configure 2014-12-18 15:49:43.038628644 -0300 -+++ icu/source/configure 2014-12-18 15:56:05.793832186 -0300 -@@ -637,6 +637,7 @@ - ICUDATA_CHAR - SAMPLES_TRUE - TESTS_TRUE -+SYMBOL_PREFIX - ICULIBSUFFIXCNAME - U_HAVE_LIB_SUFFIX - ICULIBSUFFIX -@@ -7414,6 +7415,17 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_UTF16_STRING_RESULT" >&5 - $as_echo "$CHECK_UTF16_STRING_RESULT" >&6; } - -+# Check compiler generated symbol profix -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbol prefix" >&5 -+$as_echo "checking for symbol prefix... " >&6; } -+ SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \ -+ | ${CPP-${CC-gcc} -E} - 2>&1 \ -+ | ${EGREP-grep} "^PREFIX=" \ -+ | sed -e "s:^PREFIX=::" -e "s:__USER_LABEL_PREFIX__::"` -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYMBOL_PREFIX" >&5 -+$as_echo "$SYMBOL_PREFIX" >&6; } -+ - # Enable/disable extras - # Check whether --enable-extras was given. - if test "${enable_extras+set}" = set; then : -diff -Nura icu.orig/source/data/Makefile.in icu/source/data/Makefile.in ---- icu.orig/source/data/Makefile.in 2014-12-18 15:49:42.908624160 -0300 -+++ icu/source/data/Makefile.in 2014-12-18 16:01:32.751110913 -0300 -@@ -182,11 +182,11 @@ - packagedata: icupkg.inc $(PKGDATA_LIST) build-local - ifneq ($(ENABLE_STATIC),) - ifeq ($(PKGDATA_MODE),dll) -- $(PKGDATA_INVOKE) $(PKGDATA) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) -m static $(PKGDATA_VERSIONING) $(PKGDATA_LIST) -+ $(PKGDATA_INVOKE) $(PKGDATA) -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) -m static $(PKGDATA_VERSIONING) $(PKGDATA_LIST) - endif - endif - ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES) -- $(PKGDATA_INVOKE) $(PKGDATA) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) $(PKGDATA_LIBNAME) $(PKGDATA_LIST) -+ $(PKGDATA_INVOKE) $(PKGDATA) -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) $(PKGDATA_LIBNAME) $(PKGDATA_LIST) - else - $(INSTALL_DATA) $(ICUDATA_SOURCE_ARCHIVE) $(OUTDIR) - endif -@@ -209,11 +209,11 @@ - endif - ifneq ($(ENABLE_STATIC),) - ifeq ($(PKGDATA_MODE),dll) -- $(PKGDATA_INVOKE) $(PKGDATA) -m static -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_LIBDIR) -+ $(PKGDATA_INVOKE) $(PKGDATA) -m static -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_LIBDIR) - endif - endif - ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES) -- $(PKGDATA_INVOKE) $(PKGDATA) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_DIR) -+ $(PKGDATA_INVOKE) $(PKGDATA) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_DIR) - else - $(INSTALL_DATA) $(ICUDATA_SOURCE_ARCHIVE) $(DESTDIR)$(ICUPKGDATA_DIR) - endif -@@ -224,7 +224,7 @@ - #### 390 support - install390: package390 - $(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(libdir) -- $(INVOKE) $(PKGDATA) -s $(BUILDDIR)$(STUB_SUFFIX) -T $(OUTTMPDIR_390STUB) -p $(ICUDATA_NAME)$(STUB_SUFFIX) $(PKGDATA_LIBNAME)$(STUB_SUFFIX) -e $(ICUDATA_ENTRY_POINT) $(OS390LIST) -m dll $(PKGDATA_VERSIONING) -I $(DESTDIR)$(ICUPKGDATA_DIR) -+ $(INVOKE) $(PKGDATA) -s $(BUILDDIR)$(STUB_SUFFIX) -T $(OUTTMPDIR_390STUB) -p $(ICUDATA_NAME)$(STUB_SUFFIX) $(PKGDATA_LIBNAME)$(STUB_SUFFIX) -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) $(OS390LIST) -m dll $(PKGDATA_VERSIONING) -I $(DESTDIR)$(ICUPKGDATA_DIR) - ifeq ($(PKGDATA_MODE),dll) - $(INSTALL-L) $(ICUPKGDATA_OUTDIR)/$(FINAL_IMPORT_LIB) $(DESTDIR)$(ICUPKGDATA_DIR)/$(FINAL_IMPORT_LIB) - endif -@@ -232,7 +232,7 @@ - #### $(LIB_ICUDATA_NAME)$(STUB_SUFFIX) is the subset data for batch mode - package390: $(OUTTMPDIR)/icudata390.lst $(PKGDATA_LIST) ./icupkg.inc packagedata - ln -s $(ICUDATA_NAME) $(OUTDIR)/build/$(ICUDATA_NAME)$(STUB_SUFFIX) -- $(INVOKE) $(PKGDATA) -s $(BUILDDIR)$(STUB_SUFFIX) -T $(OUTTMPDIR_390STUB) -p $(ICUDATA_NAME)$(STUB_SUFFIX) $(PKGDATA_LIBNAME)$(STUB_SUFFIX) -e $(ICUDATA_ENTRY_POINT) $(OS390LIST) -m dll $(PKGDATA_VERSIONING) -+ $(INVOKE) $(PKGDATA) -s $(BUILDDIR)$(STUB_SUFFIX) -T $(OUTTMPDIR_390STUB) -p $(ICUDATA_NAME)$(STUB_SUFFIX) $(PKGDATA_LIBNAME)$(STUB_SUFFIX) -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) $(OS390LIST) -m dll $(PKGDATA_VERSIONING) - cp $(ICUPKGDATA_OUTDIR)/$(LIB_ICUDATA_NAME)$(STUB_SUFFIX).$(SO) $(top_builddir)/stubdata/$(LIB_ICUDATA_NAME)$(STUB_SUFFIX).$(SO) - - -diff -Nura icu.orig/source/extra/uconv/Makefile.in icu/source/extra/uconv/Makefile.in ---- icu.orig/source/extra/uconv/Makefile.in 2014-12-18 15:49:42.986626850 -0300 -+++ icu/source/extra/uconv/Makefile.in 2014-12-18 15:57:40.558101179 -0300 -@@ -58,7 +58,8 @@ - ## Static mode - ifeq ($(UCONVMSG_MODE),static) - DEFS += -DUCONVMSG_LINK=$(MSGNAME) --UCONVMSG_LIB = $(RESDIR)/$(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)$(MSGNAME).$(A) -+UCONVMSG_LIB = $(RESDIR)/$(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)@SYMBOL_PREFIX@$(MSGNAME).$(A) -+ - LIBS += $(UCONVMSG_LIB) - PKGMODE=static - INSTALLTO=$(libdir) -@@ -152,7 +153,7 @@ - endif - - $(UCONVMSG_LIB): $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc -- $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst -+ $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p @SYMBOL_PREFIX@$(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst - - $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk - @-$(RMV) $@ diff --git a/package/icu/0003-link-icudata-as-data-only.patch b/package/icu/0003-link-icudata-as-data-only.patch new file mode 100644 index 0000000000..d970e8d30d --- /dev/null +++ b/package/icu/0003-link-icudata-as-data-only.patch @@ -0,0 +1,35 @@ +From d5d0c4bb7cc9aa4a132ec0bea13255aee50c1cf9 Mon Sep 17 00:00:00 2001 +From: Maxime Hadjinlian +Date: Fri, 6 Jun 2014 14:55:58 +0200 +Subject: [PATCH] Don't link icudata as a data only library + +This patch cames straight from Debian. It fixes an issue when +libicudata would not have some flags indicating it's EABIhf, causing +applications linked against libicudata to not start on EABIhf +systems. Getting rid of the -nodefaultlibs -nostdlib flags solves the +problem, and is the solution that is used by Debian, see +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653457. + +Signed-off-by: Maxime Hadjinlian +--- + source/config/mh-linux | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/source/config/mh-linux b/source/config/mh-linux +index 531a3b2..5a2a7c4 100644 +--- a/source/config/mh-linux ++++ b/source/config/mh-linux +@@ -21,7 +21,9 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN + LD_RPATH_PRE = -Wl,-rpath, + + ## These are the library specific LDFLAGS +-LDFLAGSICUDT=-nodefaultlibs -nostdlib ++#LDFLAGSICUDT=-nodefaultlibs -nostdlib ++# Debian change: linking icudata as data only causes too many problems. ++LDFLAGSICUDT= + + ## Compiler switch to embed a library name + # The initial tab in the next line is to prevent icu-config from reading it. +-- +2.0.0.rc2 + diff --git a/package/icu/0004-fix-static-linking-with-icu-uc.patch b/package/icu/0004-fix-static-linking-with-icu-uc.patch new file mode 100644 index 0000000000..965906b9b9 --- /dev/null +++ b/package/icu/0004-fix-static-linking-with-icu-uc.patch @@ -0,0 +1,34 @@ +From ffff12fd321c7a056e796e74cc508726b0626ae0 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 22 Jul 2015 22:43:25 +0200 +Subject: [PATCH] fix static linking with icu-uc + +During static linking with a C application and libicuuc.a, +-lstdc++ is required. + +Add -lstdc++ in Libs.private of icu-uc.pc. + +Fixes: +http://autobuild.buildroot.net/results/210/2107f9dfb39eeb6559fb4271c7af8b39aef521ca/ + +Signed-off-by: Romain Naour +--- + source/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/Makefile.in b/source/Makefile.in +index 9db6c52..ca48e16 100644 +--- a/source/Makefile.in ++++ b/source/Makefile.in +@@ -264,7 +264,7 @@ config/icu-uc.pc: config/icu.pc Makefile icudefs.mk + @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Common and Data libraries" >> $@ + @echo "Name: $(PACKAGE)-uc" >> $@ + @echo "Libs:" '-L$${libdir}' "${ICULIBS_UC}" "${ICULIBS_DT}" >> $@ +- @echo "Libs.private:" '$${baselibs}' >> $@ ++ @echo "Libs.private:" '$${baselibs}' -lstdc++ >> $@ + @echo $@ updated. + + config/icu-i18n.pc: config/icu.pc Makefile icudefs.mk +-- +2.4.3 + diff --git a/package/icu/0004-link-icudata-as-data-only.patch b/package/icu/0004-link-icudata-as-data-only.patch deleted file mode 100644 index d970e8d30d..0000000000 --- a/package/icu/0004-link-icudata-as-data-only.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d5d0c4bb7cc9aa4a132ec0bea13255aee50c1cf9 Mon Sep 17 00:00:00 2001 -From: Maxime Hadjinlian -Date: Fri, 6 Jun 2014 14:55:58 +0200 -Subject: [PATCH] Don't link icudata as a data only library - -This patch cames straight from Debian. It fixes an issue when -libicudata would not have some flags indicating it's EABIhf, causing -applications linked against libicudata to not start on EABIhf -systems. Getting rid of the -nodefaultlibs -nostdlib flags solves the -problem, and is the solution that is used by Debian, see -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653457. - -Signed-off-by: Maxime Hadjinlian ---- - source/config/mh-linux | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/source/config/mh-linux b/source/config/mh-linux -index 531a3b2..5a2a7c4 100644 ---- a/source/config/mh-linux -+++ b/source/config/mh-linux -@@ -21,7 +21,9 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN - LD_RPATH_PRE = -Wl,-rpath, - - ## These are the library specific LDFLAGS --LDFLAGSICUDT=-nodefaultlibs -nostdlib -+#LDFLAGSICUDT=-nodefaultlibs -nostdlib -+# Debian change: linking icudata as data only causes too many problems. -+LDFLAGSICUDT= - - ## Compiler switch to embed a library name - # The initial tab in the next line is to prevent icu-config from reading it. --- -2.0.0.rc2 - diff --git a/package/icu/0005-fix-static-linking-with-icu-uc.patch b/package/icu/0005-fix-static-linking-with-icu-uc.patch deleted file mode 100644 index 965906b9b9..0000000000 --- a/package/icu/0005-fix-static-linking-with-icu-uc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ffff12fd321c7a056e796e74cc508726b0626ae0 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 22 Jul 2015 22:43:25 +0200 -Subject: [PATCH] fix static linking with icu-uc - -During static linking with a C application and libicuuc.a, --lstdc++ is required. - -Add -lstdc++ in Libs.private of icu-uc.pc. - -Fixes: -http://autobuild.buildroot.net/results/210/2107f9dfb39eeb6559fb4271c7af8b39aef521ca/ - -Signed-off-by: Romain Naour ---- - source/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/Makefile.in b/source/Makefile.in -index 9db6c52..ca48e16 100644 ---- a/source/Makefile.in -+++ b/source/Makefile.in -@@ -264,7 +264,7 @@ config/icu-uc.pc: config/icu.pc Makefile icudefs.mk - @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Common and Data libraries" >> $@ - @echo "Name: $(PACKAGE)-uc" >> $@ - @echo "Libs:" '-L$${libdir}' "${ICULIBS_UC}" "${ICULIBS_DT}" >> $@ -- @echo "Libs.private:" '$${baselibs}' >> $@ -+ @echo "Libs.private:" '$${baselibs}' -lstdc++ >> $@ - @echo $@ updated. - - config/icu-i18n.pc: config/icu.pc Makefile icudefs.mk --- -2.4.3 -