multiarch devel

This commit is contained in:
Caolan McNamara 2006-05-02 15:58:15 +00:00
parent c452ce5a76
commit 053048cf17
2 changed files with 83 additions and 2 deletions

View File

@ -0,0 +1,70 @@
--- icu/source/configure.in.orig 2006-05-02 12:10:31.000000000 +0100
+++ icu/source/configure.in 2006-05-02 15:06:07.000000000 +0100
@@ -1011,6 +1011,7 @@
Makefile \
data/icupkg.inc \
config/Makefile.inc \
+ config/icu.pc \
data/Makefile \
stubdata/Makefile \
common/Makefile \
--- /dev/null 2006-04-29 13:38:37.035974750 +0100
+++ icu/source/config/icu.pc.in 2006-05-02 15:03:14.000000000 +0100
@@ -0,0 +1,46 @@
+prefix = @prefix@
+bindir = @bindir@
+exec_prefix = @exec_prefix@
+libdir = @libdir@
+includedir = @includedir@
+datadir = @datadir@
+sbindir = @sbindir@
+mandir = @mandir@
+sysconfdir = @sysconfdir@
+CFLAGS = @CFLAGS@
+CXXFLAGS = @CXXFLAGS@
+DEFS = @DEFS@
+UNICODE_VERSION=@UNICODE_VERSION@
+ICUPREFIX=icu
+ICULIBSUFFIX=@ICULIBSUFFIX@
+LIBICU=lib${ICUPREFIX}
+LIBCPPFLAGS=-D_REENTRANT
+CPPFLAGS=@CPPFLAGS@ ${LIBCPPFLAGS} -I${prefix}/include
+SHAREDLIBCPPFLAGS=-DPIC
+SHAREDLIBCXXFLAGS=-fPIC
+SHAREDLIBCFLAGS=-fPIC
+pkglibdir=${libdir}/@PACKAGE@${ICULIBSUFFIX}/@VERSION@
+pkgdatadir=${datadir}/@PACKAGE@${ICULIBSUFFIX}/@VERSION@
+ICUDATA_NAME = icudt@LIB_VERSION_MAJOR@@ICUDATA_CHAR@
+ICUPKGDATA_DIR=@libdir@
+ICUDATA_DIR=${pkgdatadir}
+SO=so
+ICULIBS_COMMON_LIB_NAME=${LIBICU}uc${ICULIBSUFFIX}.${SO}
+SHLIB_cc=cxx ${DEFS} ${CPPFLAGS} ${CXXFLAGS} @LDFLAGS@ -shared
+SHLIB_c=cc ${DEFS} ${CPPFLAGS} ${CFLAGS} @LDFLAGS@ -shared
+ICULIBS_LAYOUT = -l${ICUPREFIX}le${ICULIBSUFFIX} -l${ICUPREFIX}lx${ICULIBSUFFIX}
+ICULIBS_TOOLUTIL = -l${ICUPREFIX}tu${ICULIBSUFFIX}
+ICULIBS_OBSOLETE = -l${ICUPREFIX}obsolete${ICULIBSUFFIX}
+ICULIBS_ICUIO = -l${ICUPREFIX}io${ICULIBSUFFIX}
+ICULIBS_I18N = -l${ICUPREFIX}i18n${ICULIBSUFFIX}
+ICULIBS_COMMON = -l${ICUPREFIX}uc${ICULIBSUFFIX}
+ICULIBS_DATA = -l${ICUPREFIX}data${ICULIBSUFFIX}
+ICULIBS_LIBSONLY = ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA}
+ICULIBS_SYSTEMLIBS = @LIBS@
+ICULIBS_BASE = @LIBS@ -L${libdir}
+ICULIBS = ${ICULIBS_BASE} ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA}
+
+Name: @PACKAGE@
+Description: International Components for Unicode
+Version: @VERSION@
+Libs: @LDFLAGS@ ${ICULIBS} @LIBS@
--- icu/source/Makefile.in.orig 2006-05-02 12:10:31.000000000 +0100
+++ icu/source/Makefile.in 2006-05-02 15:18:15.000000000 +0100
@@ -125,6 +125,8 @@
@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
$(INSTALL_DATA) @platform_make_fragment@ $(DESTDIR)$(pkgdatadir)/config/@platform_make_fragment_name@
$(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/mkinstalldirs
+ @$(MKINSTALLDIRS) $(DESTDIR)$(libdir)/pkgconfig
+ $(INSTALL_DATA) $(top_srcdir)/config/icu.pc $(DESTDIR)$(libdir)/pkgconfig/icu.pc
$(INSTALL_DATA) $(top_srcdir)/../license.html $(DESTDIR)$(pkgdatadir)/license.html
$(INSTALL_SCRIPT) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config
$(INSTALL_DATA) $(top_builddir)/config/Makefile.inc $(DESTDIR)$(pkglibdir)/Makefile.inc

View File

@ -1,6 +1,6 @@
Name: icu
Version: 3.4
Release: 6.2
Release: 7
Summary: International Components for Unicode
Group: System Environment/Libraries
@ -12,6 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: doxygen
Patch0: icu-3.4-gnustack.patch
Patch1: icu-gcc41.patch
Patch2: icu-config
Patch3: icu-3.4-multiarchdevel.patch
%description
The International Components for Unicode (ICU) libraries provide
@ -52,20 +54,25 @@ Group: Documentation
%setup -q -n %{name}
%patch0 -p1 -b .gnustack
%patch1 -p1 -b .gcc41
%patch3 -p1 -b .multiarchdevel
%build
cd source
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
autoconf
%configure --with-data-packaging=library --disable-samples
make # %{?_smp_mflags} # -j(X>1) may "break" man pages as of 3.2, b.f.u #2357
make doc
%install
rm -rf $RPM_BUILD_ROOT source/__docs
make -C source install DESTDIR=$RPM_BUILD_ROOT
make -C source install-doc docdir=__docs
chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.*
cp %{PATCH2} $RPM_BUILD_ROOT%{_bindir}/%{name}-config
chmod a+x $RPM_BUILD_ROOT%{_bindir}/%{name}-config
sed -i s/\\\$\(THREADSCXXFLAGS\)// $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc
sed -i s/\\\$\(THREADSCPPFLAGS\)/-D_REENTRANT/ $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc
%check || :
make -C source check
@ -111,6 +118,7 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/unicode
%{_libdir}/*.so
%{_libdir}/%{name}
%{_libdir}/pkgconfig/icu.pc
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/%{version}
%{_datadir}/%{name}/%{version}/mkinstalldirs
@ -123,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue May 02 2006 Caolan McNamara <caolanm@redhat.com> - 3.4-7
- add a pkgconfig.pc, make icu-config use it
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 3.4-6.2
- bump again for double-long bug on ppc(64)