summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Bornkessel <hd_brummy@gentoo.org>2012-12-31 19:49:41 +0000
committerJörg Bornkessel <hd_brummy@gentoo.org>2012-12-31 19:49:41 +0000
commitc34a55c7b32afca9fceffe9cac1e1d9daded0589 (patch)
tree91e12bf7153e929e43a95fa5c2f21540356580a7 /eclass/vdr-plugin-2.eclass
parentStable for HPPA (bug #449426). (diff)
downloadgentoo-2-c34a55c7b32afca9fceffe9cac1e1d9daded0589.tar.gz
gentoo-2-c34a55c7b32afca9fceffe9cac1e1d9daded0589.tar.bz2
gentoo-2-c34a55c7b32afca9fceffe9cac1e1d9daded0589.zip
Do not use {C,CXX}FLAGS from pkg-config vdr.pc >=media-video/vdr-1.7.34;we do not have the chance to overwrite it with *.eclass
Diffstat (limited to 'eclass/vdr-plugin-2.eclass')
-rw-r--r--eclass/vdr-plugin-2.eclass10
1 files changed, 8 insertions, 2 deletions
diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass
index 680166551350..adac9cbe0ed9 100644
--- a/eclass/vdr-plugin-2.eclass
+++ b/eclass/vdr-plugin-2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.16 2012/12/31 18:53:47 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.17 2012/12/31 19:49:41 hd_brummy Exp $
# @ECLASS: vdr-plugin-2.eclass
# @MAINTAINER:
@@ -212,6 +212,12 @@ vdr_patchmakefile() {
-e '/^CXXFLAGS[[:space:]]*=/s/=/?=/' \
-e '/LDFLAGS/!s:-shared:$(LDFLAGS) -shared:'
+ # Do not use {C,CXX}FLAGS from pkg-config vdr.pc, >=media-video/vdr-1.7.34
+ # we do not have the chance to overwrite it with *.eclass
+ sed -e "/^export[[:space:]]*CFLAGS[[:space:]]*=/s/=/?=/" \
+ -e "/^export[[:space:]]*CXXFLAGS[[:space:]]*=/s/=/?=/" \
+ -i Makefile
+
# Disabling file stripping, the package manager takes care of it
sed -i Makefile \
-e '/@.*strip/d' \
@@ -445,7 +451,7 @@ vdr-plugin-2_pkg_setup() {
fi
einfo "Compiling against"
- einfo "\tvdr-${VDRVERSION}} [API version ${APIVERSION}]"
+ einfo "\tvdr-${VDRVERSION} [API version ${APIVERSION}]"
if [[ -n "${VDR_LOCAL_PATCHES_DIR}" ]]; then
eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"