diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-10-28 21:16:21 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-10-28 21:16:21 +0000 |
| commit | 599876747d340642e4fd629217969f77aef1e3da (patch) | |
| tree | 46b43a375b232e769a29beacadc68dd417009bdf /dev-libs | |
| parent | Version bump. Clean up old revisions. (diff) | |
| download | gentoo-2-599876747d340642e4fd629217969f77aef1e3da.tar.gz gentoo-2-599876747d340642e4fd629217969f77aef1e3da.tar.bz2 gentoo-2-599876747d340642e4fd629217969f77aef1e3da.zip | |
Improve support for clang. Patch by Arfrever.
(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/icu/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/icu/icu-50_rc-r1.ebuild | 15 |
2 files changed, 15 insertions, 5 deletions
diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog index e3842aaadf1e..7d719d7ce5a9 100644 --- a/dev-libs/icu/ChangeLog +++ b/dev-libs/icu/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/icu # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.210 2012/10/27 14:58:57 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.211 2012/10/28 21:16:21 floppym Exp $ + + 28 Oct 2012; Mike Gilbert <floppym@gentoo.org> icu-50_rc-r1.ebuild: + Improve support for clang. Patch by Arfrever. *icu-50_rc-r1 (27 Oct 2012) diff --git a/dev-libs/icu/icu-50_rc-r1.ebuild b/dev-libs/icu/icu-50_rc-r1.ebuild index 5eb4c51f325e..c6a833f0eb51 100644 --- a/dev-libs/icu/icu-50_rc-r1.ebuild +++ b/dev-libs/icu/icu-50_rc-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-50_rc-r1.ebuild,v 1.1 2012/10/27 14:58:57 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-50_rc-r1.ebuild,v 1.2 2012/10/28 21:16:21 floppym Exp $ EAPI="5" @@ -56,9 +56,16 @@ src_prepare() { sed -e "/^${variable} =.*/s: *@${variable}@\( *$\)\?::" -i config/icu.pc.in config/Makefile.inc.in || die "sed failed" done - # Store -std=gnu++11 flag in CXXFLAGS in icu-config and icu-*.pc files for API consumers, if this flag is supported and required. - if $(tc-getCXX) -c -std=gnu++11 -x c++ - -o /dev/null <<< "char16_t string[] = u\"...\";" &> /dev/null && ! $(tc-getCXX) -c -x c++ - -o /dev/null <<< "char16_t string[] = u\"...\";" &> /dev/null; then - sed -e "/^CXXFLAGS =/s/ *$/ -std=gnu++11/" -i config/icu.pc.in config/Makefile.inc.in || die "sed failed" + if [[ "$(tc-getCXX)" == *clang* ]]; then + # Store -std=c++11 flag in CXXFLAGS in icu-config and icu-*.pc files for API consumers, if this flag is supported and required. + if $(tc-getCXX) -c -std=c++11 -x c++ - -o /dev/null <<< "char16_t string[] = u\"...\";" &> /dev/null && ! $(tc-getCXX) -c -x c++ - -o /dev/null <<< "char16_t string[] = u\"...\";" &> /dev/null; then + sed -e "/^CXXFLAGS =/s/ *$/ -std=c++11/" -i config/icu.pc.in config/Makefile.inc.in || die "sed failed" + fi + else + # Store -std=gnu++11 flag in CXXFLAGS in icu-config and icu-*.pc files for API consumers, if this flag is supported and required. + if $(tc-getCXX) -c -std=gnu++11 -x c++ - -o /dev/null <<< "char16_t string[] = u\"...\";" &> /dev/null && ! $(tc-getCXX) -c -x c++ - -o /dev/null <<< "char16_t string[] = u\"...\";" &> /dev/null; then + sed -e "/^CXXFLAGS =/s/ *$/ -std=gnu++11/" -i config/icu.pc.in config/Makefile.inc.in || die "sed failed" + fi fi sed -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" -i common/unicode/uconfig.h |