diff options
| author |   Joerg Bornkessel <hd_brummy@gentoo.org> | 2012-06-10 14:21:20 +0000 |
|---|---|---|
| committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2012-06-10 14:21:20 +0000 |
| commit | 11a81f86d3eee563d5c0b7c2cded9b2a1e5f8784 (patch) | |
| tree | 106ae569e7ec3aaaccbc46d9fa36d4a8996ba447 /eclass | |
| parent | Add pypy1_9. (diff) | |
| download | historical-11a81f86d3eee563d5c0b7c2cded9b2a1e5f8784.tar.gz historical-11a81f86d3eee563d5c0b7c2cded9b2a1e5f8784.tar.bz2 historical-11a81f86d3eee563d5c0b7c2cded9b2a1e5f8784.zip | |
fixed missing chost tag; fixed append-cppflags warning; added Variable to keep the i18n.o object
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/vdr-plugin-2.eclass | 21 |
2 files changed, 20 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 2e75daaee6b3..e30a1cdbd705 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.303 2012/06/10 11:31:12 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.304 2012/06/10 14:21:20 hd_brummy Exp $ + + 10 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass: + fixed missing chost tag; fixed append-cppflags warning; added Variable to + keep the i18n.o object 10 Jun 2012; Akinori Hattori <hattya@gentoo.org> subversion.eclass: reorder public functions diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass index 86f388616848..bc49061fa08e 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.5 2012/05/25 19:56:13 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.6 2012/06/10 14:21:20 hd_brummy Exp $ # @ECLASS: vdr-plugin-2.eclass # @MAINTAINER: @@ -43,7 +43,7 @@ # # For more details about it please take a look at the eutils.class. -inherit base multilib eutils flag-o-matic +inherit base eutils flag-o-matic multilib toolchain-funcs if ! has "${EAPI:-4}" 4; then die "API of vdr-plugin-2.eclass in EAPI=\"${EAPI}\" not established" @@ -291,9 +291,15 @@ vdr_i18n() { local I18N_OBJECT=$( grep i18n.o Makefile ) if [[ -n ${I18N_OBJECT} ]]; then - sed -i "s:i18n.o::g" Makefile - dev_check "OBJECT i18n.o found" - dev_check "removed per sed \n" + + if [[ "${KEEP_I18NOBJECT:-no}" = "yes" ]]; then + dev_check "Forced to keep i18n.o" + else + sed -i "s:i18n.o::g" Makefile + dev_check "OBJECT i18n.o found" + dev_check "removed per sed \n" + fi + else dev_check "OBJECT i18n.o not found in Makefile" dev_check "all fine or manual review needed? \n" @@ -364,9 +370,12 @@ vdr-plugin-2_pkg_setup() { # Plugins need to be compiled with position independent code, otherwise linking # VDR against it will fail if has_version ">=media-video/vdr-1.7.13"; then - append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE + append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE fi + # missing ${chost}- tag + tc-export CC CXX + # Where should the plugins live in the filesystem VDR_PLUGIN_DIR="/usr/$(get_libdir)/vdr/plugins" VDR_CHECKSUM_DIR="${VDR_PLUGIN_DIR%/plugins}/checksums" |