9 Commits

3 changed files with 43 additions and 57 deletions

View File

@@ -1,31 +0,0 @@
--- icu/source/tools/ctestfw/Makefile.in
+++ icu/source/tools/ctestfw/Makefile.in
@@ -79,6 +79,28 @@
install-local: install-library
install-library: all-local
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ifneq ($(ENABLE_STATIC),)
+ $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+endif
+ifneq ($(ENABLE_SHARED),)
+ $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
+ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
+ cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
+ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
+ cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
+endif
+endif
+ifneq ($(IMPORT_LIB_EXT),)
+ $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
+ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
+ cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
+endif
+ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
+ cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
+endif
+endif
+endif
dist-local:

View File

@@ -1,16 +0,0 @@
diff -Nru icu.orig//source/tools/toolutil/pkg_genc.c icu/source/tools/toolutil/pkg_genc.c
--- icu.orig//source/tools/toolutil/pkg_genc.c 2010-04-28 15:27:46.000000000 +0000
+++ icu/source/tools/toolutil/pkg_genc.c 2010-07-13 11:57:46.000000000 +0000
@@ -118,10 +118,10 @@
} assemblyHeader[] = {
{"gcc",
".globl %s\n"
- "\t.section .note.GNU-stack,\"\",@progbits\n"
+ "\t.section .note.GNU-stack,\"\",%%progbits\n"
"\t.section .rodata\n"
"\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */
- "\t.type %s,@object\n"
+ "\t.type %s,%%object\n"
"%s:\n\n",
".long ","",HEX_0X

View File

@@ -2,7 +2,7 @@
%define pkgver %(echo %version | tr '.' '_')
Name: icu
Version: 53.1
Version: 63.1
Release: 1mamba
Summary: Set of C/C++ and Java libraries for Unicode support
Group: System/Libraries
@@ -11,10 +11,13 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://www.icu-project.org
Source: http://download.icu-project.org/files/icu4c/%{version}/icu4c-%{pkgver}-src.tgz
Patch0: %{name}-4.4-ctestfw-makefilein.patch
Patch1: %{name}-4.4.1-arm_assembly.patch
License: MIT
Requires: %{libname} = %{version}
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libgcc
BuildRequires: libstdc++6-devel
## AUTOBUILDREQ-END
Requires: %{libname} = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
@@ -36,7 +39,7 @@ This package contains the runtime libraries for ICU.
%package -n %{libname}-devel
Group: Development/Libraries
Summary: Static libraries and headers for ICU
Requires: %{libname} = %{version}
Requires: %{libname} = %{version}-%{release}
%description -n %{libname}-devel
ICU is a set of C/C++ and Java libraries that provides robust and full-featured Unicode support, software internationalization and globalization (i18n/g11n).
@@ -45,9 +48,7 @@ ICU is widely portable and gives applications the same results on all platforms
This package contains static libraries and header files need for development.
%prep
%setup -q -n %{name}
#%patch0 -p1
#%patch1 -p1
%setup -q -n icu
%build
cd source
@@ -82,6 +83,7 @@ rm -f %{buildroot}%{_datadir}/icu/%{version}/license.html
%{_bindir}/makeconv
%{_bindir}/pkgdata
%{_bindir}/uconv
%{_sbindir}/escapesrc
%{_sbindir}/gen*
%{_sbindir}/icupkg
%{_mandir}/man?/*
@@ -97,12 +99,13 @@ rm -f %{buildroot}%{_datadir}/icu/%{version}/license.html
%dir %{_datadir}/icu
%dir %{_datadir}/icu/%{version}
%dir %{_datadir}/icu/%{version}/config
%{_datadir}/icu/%{version}/LICENSE
%{_datadir}/icu/%{version}/mkinstalldirs
%{_datadir}/icu/%{version}/config/mh-linux
%{_datadir}/icu/%{version}/install-sh
%dir %{_includedir}/layout
%dir %{_includedir}/unicode
%{_includedir}/layout/*.h
#%dir %{_includedir}/layout
#%{_includedir}/layout/*.h
%{_includedir}/unicode/*.h
%{_libdir}/*.a
%{_libdir}/*.so
@@ -116,6 +119,36 @@ rm -f %{buildroot}%{_datadir}/icu/%{version}/license.html
%{_libdir}/pkgconfig/icu-*.pc
%changelog
* Tue Oct 30 2018 Automatic Build System <autodist@mambasoft.it> 63.1-1mamba
- automatic version update by autodist
* Thu Aug 09 2018 Automatic Build System <autodist@mambasoft.it> 62.1-1mamba
- automatic version update by autodist
* Fri Mar 30 2018 Automatic Build System <autodist@mambasoft.it> 61.1-1mamba
- automatic version update by autodist
* Wed Dec 20 2017 Automatic Build System <autodist@mambasoft.it> 60.2-1mamba
- automatic version update by autodist
* Fri Jul 21 2017 Automatic Build System <autodist@mambasoft.it> 59.1-1mamba
- automatic version update by autodist
* Thu Dec 15 2016 Automatic Build System <autodist@mambasoft.it> 58.2-1mamba
- automatic version update by autodist
* Tue Apr 19 2016 Automatic Build System <autodist@mambasoft.it> 57.1-1mamba
- automatic version update by autodist
* Tue Nov 03 2015 Automatic Build System <autodist@mambasoft.it> 56.1-1mamba
- automatic version update by autodist
* Thu Apr 09 2015 Automatic Build System <autodist@mambasoft.it> 55.1-1mamba
- automatic version update by autodist
* Tue Oct 21 2014 Automatic Build System <autodist@mambasoft.it> 54.1-1mamba
- automatic version update by autodist
* Fri Apr 18 2014 Automatic Build System <autodist@mambasoft.it> 53.1-1mamba
- automatic version update by autodist