diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-11-13 00:23:51 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-11-13 00:23:51 +0000 |
| commit | afcb3a29382f135ae581ebd4a596a9d9a99bb40e (patch) | |
| tree | 2df448554badd2b9c84706aa86efdc3872e55ada /kde-base/arts | |
| parent | Version bump. (diff) | |
| download | gentoo-2-afcb3a29382f135ae581ebd4a596a9d9a99bb40e.tar.gz gentoo-2-afcb3a29382f135ae581ebd4a596a9d9a99bb40e.tar.bz2 gentoo-2-afcb3a29382f135ae581ebd4a596a9d9a99bb40e.zip | |
Use an alternative to alsa-1.4-mcopidl, testing the flags supported for disabling stack protector. This allows to build arts with vanilla GCC and GCC 4.1 (and non-GCC too, probably).
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'kde-base/arts')
| -rw-r--r-- | kde-base/arts/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/arts/arts-3.5.0_rc1.ebuild | 21 |
2 files changed, 24 insertions, 4 deletions
diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog index 0e1bf161f637..681691b85876 100644 --- a/kde-base/arts/ChangeLog +++ b/kde-base/arts/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/arts # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.186 2005/11/12 15:49:22 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.187 2005/11/13 00:23:51 flameeyes Exp $ + + 13 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> arts-3.5.0_rc1.ebuild: + Use an alternative to alsa-1.4-mcopidl, testing the flags supported for + disabling stack protector. This allows to build arts with vanilla GCC and + GCC 4.1 (and non-GCC too, probably). *arts-3.5.0_rc1 (12 Nov 2005) diff --git a/kde-base/arts/arts-3.5.0_rc1.ebuild b/kde-base/arts/arts-3.5.0_rc1.ebuild index 35ab2c0ea3b7..b5ec4b9f8357 100644 --- a/kde-base/arts/arts-3.5.0_rc1.ebuild +++ b/kde-base/arts/arts-3.5.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:22 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.0_rc1.ebuild,v 1.2 2005/11/13 00:23:51 flameeyes Exp $ inherit kde flag-o-matic eutils set-kdedir 3.5 @@ -32,8 +32,23 @@ RDEPEND="$(qt_min_version 3.3) DEPEND="${RDEPEND} dev-util/pkgconfig" -PATCHES="${FILESDIR}/arts-1.3.2-alsa-bigendian.patch - ${FILESDIR}/arts-1.4-mcopidl.patch" +PATCHES="${FILESDIR}/arts-1.3.2-alsa-bigendian.patch" + +src_unpack() { + kde_src_unpack + + # Alternative to arts-1.4-mcopidl.patch, make sure that flags are supported + # before trying to use them, for non-GCC, vanilla GCC or GCC 4.1 compilers + local nosspflags + + [[ -n $(test_flag -fno-stack-protector) ]] && \ + nosspflags="${nosspflags} -fno-stack-protector" + [[ -n $(test_flag -fno-stack-protector-all) ]] && \ + nosspflags="${nosspflags} -fno-stack-protector-all" + + sed -i -e "s:KDE_CXXFLAGS =\(.*\):KDE_CXXFLAGS = \1 ${nosspflags}:" \ + ${S}/mcopidl/Makefile.am +} src_compile() { myconf="$(use_enable alsa) $(use_enable vorbis) |