From 4a91e834fa1d76e5861352de7470a50399ba62e9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 12 Feb 2014 15:27:25 +0100 Subject: [PATCH] icu: repair cross build and misc tweaks. --- srcpkgs/icu/template | 42 +++++++++--------------------------------- 1 file changed, 9 insertions(+), 33 deletions(-) diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template index a9a5db6c96..1eda1a2939 100644 --- a/srcpkgs/icu/template +++ b/srcpkgs/icu/template @@ -2,32 +2,20 @@ pkgname=icu version=49.1.2 _distver="49_1_2" -revision=3 +revision=4 wrksrc=icu build_wrksrc=source +build_style=gnu-configure short_desc="Robust and full-featured Unicode services" maintainer="Juan RP " homepage="http://www.icu-project.org/" license="ICU License /usr/share/licenses/icu/license.html" distfiles="http://download.icu-project.org/files/icu4c/${version}/icu4c-${_distver}-src.tgz" checksum=cce83cc88a2ff79d65c05426facbf30530bbe13a1cfda04b3ab81b55414cf5a3 -long_desc=" - The International Components for Unicode(ICU) is a C and C++ library that - provides robust and full-featured Unicode support on a wide variety of - platforms. The library provides: - - Calendar support - - Character set conversions - - Collation (language-sensitive) - - Date and time formatting - - Locales (140+ supported) - - Message catalogs (resources) - - Message formatting - - Normalization - - Number and currency formatting - - Time zones - - Transliteration - - Word, line and sentence breaks" +if [ "$CROSS_BUILD" ]; then + configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu" +fi pre_configure() { if [ "$CROSS_BUILD" ]; then @@ -45,25 +33,12 @@ pre_configure() { fi } -do_configure() { - if [ "$CROSS_BUILD" ]; then - _cross_args="--with-cross-build=${wrksrc}/host-icu" - fi - ./configure ${configure_args} ${_cross_args} -} - -do_build() { - make ${makejobs} -} - -do_install() { - make DESTDIR=${DESTDIR} install - +post_install() { vinstall $wrksrc/license.html 644 usr/share/licenses/icu } icu-devel_package() { - depends="libstdc++-devel icu>=$version" + depends="libstdc++-devel icu-libs>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -72,12 +47,13 @@ icu-devel_package() { vmove usr/share/icu vmove usr/bin/icu-config vmove "usr/share/man/man1/icu-config*" + vmove "usr/lib/*.so" } } icu-libs_package() { short_desc+=" - shared libs" pkg_install() { - vmove "usr/lib/*.so*" + vmove "usr/lib/*.so.*" } }