From dd02782def6b9c4e304b04a5160f2e93f733c46e Mon Sep 17 00:00:00 2001 From: Joerg Bornkessel Date: Mon, 31 Dec 2012 19:49:41 +0000 Subject: 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 --- eclass/ChangeLog | 6 +++++- eclass/vdr-plugin-2.eclass | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'eclass') diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 12635273ec63..15116722f6e4 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.587 2012/12/31 18:53:47 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.588 2012/12/31 19:49:40 hd_brummy Exp $ + + 31 Dec 2012; Joerg Bornkessel vdr-plugin-2.eclass: + 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 31 Dec 2012; Joerg Bornkessel vdr-plugin-2.eclass: vdr-plugin-2.eclass, typo 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!" -- cgit v1.2.3-65-gdbad