summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-08-14 20:25:17 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-08-14 20:25:17 +0000
commitfa053a006a88a9c3de8e98db67fd805bd05d27c3 (patch)
tree28aef27ed7338a55a93901a8f4ebfabe56b0a17f /media-video
parentVersion bump KDE SC 4.11.0 (diff)
downloadgentoo-2-fa053a006a88a9c3de8e98db67fd805bd05d27c3.tar.gz
gentoo-2-fa053a006a88a9c3de8e98db67fd805bd05d27c3.tar.bz2
gentoo-2-fa053a006a88a9c3de8e98db67fd805bd05d27c3.zip
Pass extra-cflags to configure instead, bug #449238 by Stef Simoens. Simplifies the ebuild.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/gpac/ChangeLog6
-rw-r--r--media-video/gpac/gpac-0.5.0.ebuild24
2 files changed, 9 insertions, 21 deletions
diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index 9275be9eb9dd..f081e4b426aa 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/gpac
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.108 2013/08/14 20:08:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.109 2013/08/14 20:25:17 aballier Exp $
+
+ 14 Aug 2013; Alexis Ballier <aballier@gentoo.org> gpac-0.5.0.ebuild:
+ Pass extra-cflags to configure instead, bug #449238 by Stef Simoens.
+ Simplifies the ebuild.
14 Aug 2013; Alexis Ballier <aballier@gentoo.org> gpac-0.5.0.ebuild:
factorize some code and sort alphabetically econf args
diff --git a/media-video/gpac/gpac-0.5.0.ebuild b/media-video/gpac/gpac-0.5.0.ebuild
index 3198be8d6df5..3dba2c23b382 100644
--- a/media-video/gpac/gpac-0.5.0.ebuild
+++ b/media-video/gpac/gpac-0.5.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.0.ebuild,v 1.7 2013/08/14 20:08:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.0.ebuild,v 1.8 2013/08/14 20:25:17 aballier Exp $
EAPI=4
@@ -79,14 +79,6 @@ src_prepare() {
else
sed -i -e "s:wx-config:wx-config-doesnotexist:g" configure || die
fi
-
- # remove default rule for building objects from code, so that
- # default make rules apply (fixes -fPIC issues)
- sed -i -e '/^\%\.o: \%\.c/{N;d;}' \
- src/Makefile modules/*/Makefile ||die
-
- # use this to cut down on the warnings noise
- #append-flags -fno-strict-aliasing
}
src_configure() {
@@ -121,22 +113,14 @@ src_configure() {
$(my_use truetype ft) \
$(my_use vorbis) \
$(my_use xvid) \
+ --extra-cflags="${CFLAGS}" \
--cc="$(tc-getCC)" \
--libdir="/$(get_libdir)"
-
- #temporary build fix
- cp config.h include/gpac/
-}
-
-src_compile() {
-# #emake OPTFLAGS="${CFLAGS} -fPIC"
-# LD="$(tc-getCC)" \
- emake OPTFLAGS="${CFLAGS}"
}
src_install() {
- emake STRIP="true" OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install
- emake STRIP="true" OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install-lib
+ emake STRIP="true" DESTDIR="${D}" install
+ emake STRIP="true" DESTDIR="${D}" install-lib
dodoc AUTHORS BUGS Changelog README TODO INSTALLME
dodoc doc/*.txt
dohtml doc/*.html