1 |
hwoarang 10/05/06 11:16:06 |
2 |
|
3 |
Modified: ChangeLog flvstreamer-2.1a.ebuild |
4 |
Log: |
5 |
More Makefile fixes wrt bug #318353 |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.8 media-video/flvstreamer/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/flvstreamer/ChangeLog?rev=1.8&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/flvstreamer/ChangeLog?rev=1.8&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/flvstreamer/ChangeLog?r1=1.7&r2=1.8 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-video/flvstreamer/ChangeLog,v |
18 |
retrieving revision 1.7 |
19 |
retrieving revision 1.8 |
20 |
diff -u -r1.7 -r1.8 |
21 |
--- ChangeLog 10 Jan 2010 18:37:25 -0000 1.7 |
22 |
+++ ChangeLog 6 May 2010 11:16:06 -0000 1.8 |
23 |
@@ -1,6 +1,11 @@ |
24 |
# ChangeLog for media-video/flvstreamer |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/flvstreamer/ChangeLog,v 1.7 2010/01/10 18:37:25 hanno Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/flvstreamer/ChangeLog,v 1.8 2010/05/06 11:16:06 hwoarang Exp $ |
28 |
+ |
29 |
+ 06 May 2010; Markos Chandras <hwoarang@g.o> |
30 |
+ flvstreamer-2.1a.ebuild: |
31 |
+ More Makefile fixes wrt bug #318353. Thanks to Nathan Phillip Brink |
32 |
+ (ohnobinki) <ohnobinki@××××××××××××××.net> |
33 |
|
34 |
*flvstreamer-2.1a (10 Jan 2010) |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.2 media-video/flvstreamer/flvstreamer-2.1a.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/flvstreamer/flvstreamer-2.1a.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/flvstreamer/flvstreamer-2.1a.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/flvstreamer/flvstreamer-2.1a.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: flvstreamer-2.1a.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/media-video/flvstreamer/flvstreamer-2.1a.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- flvstreamer-2.1a.ebuild 10 Jan 2010 18:37:25 -0000 1.1 |
52 |
+++ flvstreamer-2.1a.ebuild 6 May 2010 11:16:06 -0000 1.2 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2010 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/flvstreamer/flvstreamer-2.1a.ebuild,v 1.1 2010/01/10 18:37:25 hanno Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/flvstreamer/flvstreamer-2.1a.ebuild,v 1.2 2010/05/06 11:16:06 hwoarang Exp $ |
58 |
|
59 |
EAPI="2" |
60 |
|
61 |
@@ -17,13 +17,13 @@ |
62 |
S="${WORKDIR}/${PN}" |
63 |
|
64 |
src_prepare() { |
65 |
- #fix Makefile ( bug #298535 ) |
66 |
- sed -i "s/\$(MAKEFLAGS)/-\$(MAKEFLAGS)/" Makefile \ |
67 |
+ #fix Makefile ( bug #298535 and bug #318353) |
68 |
+ sed -i 's/\$(MAKEFLAGS)//g' Makefile \ |
69 |
|| die "failed to fixe Makefile" |
70 |
} |
71 |
|
72 |
src_compile() { |
73 |
- emake CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ |
74 |
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ |
75 |
LDFLAGS="${LDFLAGS}" linux |
76 |
} |