diff options
| author |   Yixun Lan <dlan@gentoo.org> | 2015-01-26 13:45:35 +0000 |
|---|---|---|
| committer | Yixun Lan <dlan@gentoo.org> | 2015-01-26 13:45:35 +0000 |
| commit | e65a7a5dfb65b6dbc9fa09731f9a6f861fa846ef (patch) | |
| tree | 0877ed10a20074519f7ae41435756475bc9c1cb5 /media-video/vlc/vlc-2.1.9999.ebuild | |
| parent | Version bump (diff) | |
| download | gentoo-2-e65a7a5dfb65b6dbc9fa09731f9a6f861fa846ef.tar.gz gentoo-2-e65a7a5dfb65b6dbc9fa09731f9a6f861fa846ef.tar.bz2 gentoo-2-e65a7a5dfb65b6dbc9fa09731f9a6f861fa846ef.zip | |
Fix possible lack of _FORTIFY_SOURCE definition, bug 523144. proxy for maintainer
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)
Diffstat (limited to 'media-video/vlc/vlc-2.1.9999.ebuild')
| -rw-r--r-- | media-video/vlc/vlc-2.1.9999.ebuild | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/media-video/vlc/vlc-2.1.9999.ebuild b/media-video/vlc/vlc-2.1.9999.ebuild index 486c2f8d6b01..509a93b2040e 100644 --- a/media-video/vlc/vlc-2.1.9999.ebuild +++ b/media-video/vlc/vlc-2.1.9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.28 2014/12/18 13:41:39 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.29 2015/01/26 13:45:35 dlan Exp $ EAPI="5" @@ -212,9 +212,6 @@ src_prepare() { sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die fi - # _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings. - sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die - # Bootstrap when we are on a git checkout. if [[ "${PV%9999}" != "${PV}" ]] ; then ./bootstrap @@ -424,6 +421,11 @@ src_configure() { --disable-wasapi # ^ We don't have these disabled libraries in the Portage tree yet. + + # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. + # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. + # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file + sed -i '1i#undef _FORTIFY_SOURCE' ${S}/config.h || die } src_test() { |