summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-05-06 11:16:06 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-05-06 11:16:06 +0000
commita71fa3d4e1b14c52dcd30892014cd347a73bc384 (patch)
tree5ae93820b1793866178d0c99d2b0aee7890d7e93 /media-video/flvstreamer
parentUse gentoo mirrors (diff)
downloadgentoo-2-a71fa3d4e1b14c52dcd30892014cd347a73bc384.tar.gz
gentoo-2-a71fa3d4e1b14c52dcd30892014cd347a73bc384.tar.bz2
gentoo-2-a71fa3d4e1b14c52dcd30892014cd347a73bc384.zip
More Makefile fixes wrt bug #318353
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-video/flvstreamer')
-rw-r--r--media-video/flvstreamer/ChangeLog7
-rw-r--r--media-video/flvstreamer/flvstreamer-2.1a.ebuild8
2 files changed, 10 insertions, 5 deletions
diff --git a/media-video/flvstreamer/ChangeLog b/media-video/flvstreamer/ChangeLog
index 4aeb306e0ade..3e2c6bda6a25 100644
--- a/media-video/flvstreamer/ChangeLog
+++ b/media-video/flvstreamer/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/flvstreamer
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/flvstreamer/ChangeLog,v 1.7 2010/01/10 18:37:25 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/flvstreamer/ChangeLog,v 1.8 2010/05/06 11:16:06 hwoarang Exp $
+
+ 06 May 2010; Markos Chandras <hwoarang@gentoo.org>
+ flvstreamer-2.1a.ebuild:
+ More Makefile fixes wrt bug #318353. Thanks to Nathan Phillip Brink
+ (ohnobinki) <ohnobinki@ohnopublishing.net>
*flvstreamer-2.1a (10 Jan 2010)
diff --git a/media-video/flvstreamer/flvstreamer-2.1a.ebuild b/media-video/flvstreamer/flvstreamer-2.1a.ebuild
index 0e27e3231c91..3e2ed7d6b188 100644
--- a/media-video/flvstreamer/flvstreamer-2.1a.ebuild
+++ b/media-video/flvstreamer/flvstreamer-2.1a.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/flvstreamer/flvstreamer-2.1a.ebuild,v 1.1 2010/01/10 18:37:25 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/flvstreamer/flvstreamer-2.1a.ebuild,v 1.2 2010/05/06 11:16:06 hwoarang Exp $
EAPI="2"
@@ -17,13 +17,13 @@ IUSE=""
S="${WORKDIR}/${PN}"
src_prepare() {
- #fix Makefile ( bug #298535 )
- sed -i "s/\$(MAKEFLAGS)/-\$(MAKEFLAGS)/" Makefile \
+ #fix Makefile ( bug #298535 and bug #318353)
+ sed -i 's/\$(MAKEFLAGS)//g' Makefile \
|| die "failed to fixe Makefile"
}
src_compile() {
- emake CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}" linux
}