diff --git a/icu-Add-sw64-architecture-compat.patch b/icu-Add-sw64-architecture-compat.patch deleted file mode 100644 index d9f639b37e9050360bfeec1afc4494f5e34c14bc..0000000000000000000000000000000000000000 --- a/icu-Add-sw64-architecture-compat.patch +++ /dev/null @@ -1,314 +0,0 @@ -From a4fb55ae3de789cf645d4939ed8af9dbaad242ce Mon Sep 17 00:00:00 2001 -From: wuzx -Date: Fri, 18 Nov 2022 02:53:10 +0800 -Subject: [PATCH] Add sw64 architecture - -Signed-off-by: wuzx ---- - source/acinclude.m4 | 6 ++ - source/config.guess | 8 +++ - source/config.sub | 2 + - source/config/mh-sw_64-linux-cc | 87 +++++++++++++++++++++++++++ - source/config/mh-sw_64-linux-gcc | 85 ++++++++++++++++++++++++++ - source/configure | 8 ++- - source/configure.ac | 2 +- - source/i18n/double-conversion-utils.h | 2 +- - 8 files changed, 197 insertions(+), 3 deletions(-) - create mode 100644 source/config/mh-sw_64-linux-cc - create mode 100644 source/config/mh-sw_64-linux-gcc - -diff --git a/source/acinclude.m4 b/source/acinclude.m4 -index 507f41f..381a91f 100644 ---- a/source/acinclude.m4 -+++ b/source/acinclude.m4 -@@ -21,6 +21,12 @@ case "${host}" in - else - icu_cv_host_frag=mh-solaris - fi ;; -+sw_64*-*-linux-gnu) -+ if test "$GCC" = yes; then -+ icu_cv_host_frag=mh-sw_64-linux-gcc -+ else -+ icu_cv_host_frag=mh-sw_64-linux-cc -+ fi ;; - alpha*-*-linux-gnu) - if test "$GCC" = yes; then - icu_cv_host_frag=mh-alpha-linux-gcc -diff --git a/source/config.guess b/source/config.guess -index 31e01ef..1dfe5d5 100644 ---- a/source/config.guess -+++ b/source/config.guess -@@ -894,6 +894,14 @@ EOF - UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; -+ sw_64:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ SW) UNAME_MACHINE=sw_64 ;; -+ esac -+ objdump --private-headers /bin/sh | grep -q ld.so.1 -+ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi -+ echo ${UNAME_MACHINE}-sunway-linux-${LIBC} -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -diff --git a/source/config.sub b/source/config.sub -index fb57947..07dc65e 100644 ---- a/source/config.sub -+++ b/source/config.sub -@@ -244,6 +244,7 @@ case $basic_machine in - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ -+ | sw_64 \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ -@@ -368,6 +369,7 @@ case $basic_machine in - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ -+ | sw_64-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ -diff --git a/source/config/mh-sw_64-linux-cc b/source/config/mh-sw_64-linux-cc -new file mode 100644 -index 0000000..f27259a ---- /dev/null -+++ b/source/config/mh-sw_64-linux-cc -@@ -0,0 +1,87 @@ -+## -*-makefile-*- -+## Copyright (C) 2016 and later: Unicode, Inc. and others. -+## License & terms of use: http://www.unicode.org/copyright.html -+## Sw-64-Linux-specific setup -+## Copyright (c) 1999-2006, International Business Machines Corporation and -+## others. All Rights Reserved. -+ -+## Commands to generate dependency files -+#GEN_DEPS.c= $(CC) $(DEFS) $(CPPFLAGS) -MD -c -msg_quiet -+#GEN_DEPS.cc= $(CXX) $(DEFS) $(CPPFLAGS) -D__USE_STD_IOSTREAM -c -MD -msg_quiet -+ -+## Flags for position independent code -+SHAREDLIBCFLAGS = -fPIC -+SHAREDLIBCXXFLAGS = -fPIC -+SHAREDLIBCPPFLAGS = -DPIC -+ -+## Additional flags when building libraries and with threads -+THREADSCPPFLAGS = -D_REENTRANT -+LIBCPPFLAGS = -+ -+# The tests need complete IEEE floating point support -+CFLAGS += -ieee -+CXXFLAGS += -ieee -+ -+## Commands to compile -+COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -signed -accept nogccinline -+COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c -signed -D__USE_STD_IOSTREAM -accept nogcc_inline -+ -+ -+## Commands to link -+LINK.c= $(CC) -call_shared $(CFLAGS) $(LDFLAGS) -+LINK.cc= $(CXX) -call_shared $(CXXFLAGS) $(LDFLAGS) -+ -+## Compiler switch to embed a runtime search path -+LD_RPATH= -+LD_RPATH_PRE= -Wl,-rpath, -+ -+## Compiler switch to embed a library name -+LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) -+ -+## Shared object suffix -+SO = so -+## Non-shared intermediate object suffix -+STATIC_O = ao -+ -+## Compilation rules -+%.$(STATIC_O): $(srcdir)/%.c -+ $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< -+%.o: $(srcdir)/%.c -+ $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< -+ -+%.$(STATIC_O): $(srcdir)/%.cpp -+ $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< -+%.o: $(srcdir)/%.cpp -+ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< -+ -+ -+## Dependency rules -+#%.d: $(srcdir)/%.c -+# @echo "generating dependency information for $<" -+# @$(SHELL) -ec '$(GEN_DEPS.c) $< \ -+# | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ -+# [ -s $@ ] || rm -f $@' -+ -+#%.d: $(srcdir)/%.cpp -+# @echo "generating dependency information for $<" -+# @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ -+# | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ -+# [ -s $@ ] || rm -f $@' -+# -+## Versioned libraries rules -+ -+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) -+ $(RM) $@ && ln -s ${ $@; \ -+ [ -s $@ ] || rm -f $@' -+ -+%.d: $(srcdir)/%.cpp -+ @echo "generating dependency information for $<" -+ @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ -+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ -+ [ -s $@ ] || rm -f $@' -+ -+## Versioned libraries rules -+ -+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) -+ $(RM) $@ && ln -s ${&5 - $as_echo "\"C compiler set to CCC ${CC}\" " >&6; } - case "${host}" in -- alpha*-*-*) U_HAVE_INTTYPES_H=0; -+ alpha*-*-* | sw_64*-*-*) U_HAVE_INTTYPES_H=0; - CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_INTTYPES_H=0" - esac - fi -diff --git a/source/configure.ac b/source/configure.ac -index 425fdc7..6acf133 100644 ---- a/source/configure.ac -+++ b/source/configure.ac -@@ -685,7 +685,7 @@ fi - if test "$CC" = ccc; then - AC_MSG_RESULT("C compiler set to CCC ${CC}" ) - case "${host}" in -- alpha*-*-*) U_HAVE_INTTYPES_H=0; -+ alpha*-*-* | sw_64*-*-*) U_HAVE_INTTYPES_H=0; - CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_INTTYPES_H=0" - esac - fi -diff --git a/source/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h -index c937463..7dcdbf8 100644 ---- a/source/i18n/double-conversion-utils.h -+++ b/source/i18n/double-conversion-utils.h -@@ -122,7 +122,7 @@ int main(int argc, char** argv) { - defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ - defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ -- defined(__SH4__) || defined(__alpha__) || \ -+ defined(__SH4__) || defined(__alpha__) || defined(__sw_64__) || \ - defined(_MIPS_ARCH_MIPS32R2) || defined(__ARMEB__) ||\ - defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ - defined(__riscv) || defined(__e2k__) || \ --- -2.33.0 - diff --git a/icu.spec b/icu.spec index 607d9c8866503b045373ae83ee553989e3d3bd92..dc37eae452f8b3d483d57bc07c5cc8d7ff94fdaf 100644 --- a/icu.spec +++ b/icu.spec @@ -1,7 +1,7 @@ %bcond_without build_compat %if %{with build_compat} -%define compat_version 74.1 +%define compat_version 76.1 %define compat_tarballver %(echo %compat_version|tr '.' '_') %define compat_dashver %(echo %compat_version|tr '.' '-') %endif @@ -10,7 +10,7 @@ %define dashver %(echo %version|tr '.' '-') Name: icu -Version: 76.1 +Version: 77.1 Release: 1 Summary: International Components for Unicode License: Unicode-DFS-2016 AND BSD-2-Clause AND BSD-3-Clause AND Public Domain @@ -27,13 +27,13 @@ BuildRequires: gcc-c++ BuildRequires: autoconf >= 2.72 BuildRequires: doxygen BuildRequires: python3 +BuildRequires: rpm-build >= 4.18 Requires: lib%{name} = %{version}-%{release} Patch1: gennorm2-man.patch Patch2: icuinfo-man.patch Patch3: backport-remove-TestJitterbug6175.patch Patch4: icu-Add-sw64-architecture.patch -Patch10: icu-Add-sw64-architecture-compat.patch %description Tools and utilities for developing with icu. @@ -58,8 +58,7 @@ header files for libicu # " this line just fixes syntax highlighting for vim that is confused by the above and continues literal %prep -%setup -qn %{name} -%autopatch -p1 -M9 +%autosetup -p1 -n %{name} pushd source rm -fr data @@ -70,7 +69,7 @@ popd %if %{with build_compat} %{__rpmuncompress} -x %{S:10} pushd icu -%autopatch -m10 -p1 +%autopatch -p1 popd %endif @@ -98,7 +97,6 @@ test -f uconfig.h.prepend && sed -e '/^#define __UCONFIG_H__/ r uconfig.h.prepen sed -i -r 's|(PKGDATA_OPTS = )|\1-v |' data/Makefile %make_build -%make_build doc popd %if %{with build_compat} @@ -123,6 +121,7 @@ rm -rf source/__docs rm -f %{buildroot}%{_datadir}/icu/%{version}/LICENSE make -C source install-doc docdir=__docs + chmod +x %{buildroot}%{_libdir}/*.so.* ( cd %{buildroot}%{_bindir} @@ -179,6 +178,9 @@ popd %changelog +* Tue Mar 18 2025 Funda Wang - 77.1-1 +- update to 77 + * Sun Oct 27 2024 Funda Wang - 76.1-1 - update to 76.1 - build compat lib within single package, instead of relying on built package diff --git a/icu4c-74_1-src.tgz b/icu4c-77_1-data.zip similarity index 32% rename from icu4c-74_1-src.tgz rename to icu4c-77_1-data.zip index 00761ebd48249f67c2e0d6ffe40020eaecfd52b2..dbe33553e339eec5e3b915fce22993b8162e727f 100644 --- a/icu4c-74_1-src.tgz +++ b/icu4c-77_1-data.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86ce8e60681972e60e4dcb2490c697463fcec60dd400a5f9bffba26d0b52b8d0 -size 26625850 +oid sha256:1e08bfafa442260ccabf9a872d4eab12de813d42b90769df056bab032b37e1d3 +size 19708389 diff --git a/icu4c-76_1-data.zip b/icu4c-77_1-src.tgz similarity index 32% rename from icu4c-76_1-data.zip rename to icu4c-77_1-src.tgz index 2492dda0aae26a09b5ea259b68041e26e19a7cfe..c9178e29f7c6ee8bfe811a82cd01abd87c2e05da 100644 --- a/icu4c-76_1-data.zip +++ b/icu4c-77_1-src.tgz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:133ae58a67d68b46f7296822904cd3c30126a0b4b2f65f0f905e7f47c0ef9e47 -size 19767028 +oid sha256:588e431f77327c39031ffbb8843c0e3bc122c211374485fa87dc5f3faff24061 +size 27384265