From: "Joerg Bornkessel (hd_brummy)" <hd_brummy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass
Date: Mon, 31 Dec 2012 09:27:00 +0000 (UTC) [thread overview]
Message-ID: <20121231092700.9F04F2171D@flycatcher.gentoo.org> (raw)
hd_brummy 12/12/31 09:27:00
Modified: ChangeLog vdr-plugin-2.eclass
Log:
vdr-plugin-2.eclass; better detection of new Makefile handling, fixed some mistakes in inherited append-*flags
Revision Changes Path
1.583 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.583&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.583&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.582&r2=1.583
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.582
retrieving revision 1.583
diff -u -r1.582 -r1.583
--- ChangeLog 31 Dec 2012 06:29:42 -0000 1.582
+++ ChangeLog 31 Dec 2012 09:27:00 -0000 1.583
@@ -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.582 2012/12/31 06:29:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.583 2012/12/31 09:27:00 hd_brummy Exp $
+
+ 31 Dec 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+ vdr-plugin-2.eclass; better detection of new Makefile handling, fixed some
+ mistakes in inherited append-*flags
31 Dec 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
Remove dead code.
1.15 eclass/vdr-plugin-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.14&r2=1.15
Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vdr-plugin-2.eclass 29 Dec 2012 17:47:53 -0000 1.14
+++ vdr-plugin-2.eclass 31 Dec 2012 09:27:00 -0000 1.15
@@ -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.14 2012/12/29 17:47:53 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.15 2012/12/31 09:27:00 hd_brummy Exp $
# @ECLASS: vdr-plugin-2.eclass
# @MAINTAINER:
@@ -226,7 +226,7 @@
# Begin new vdr-plugin-2.eclass content
dev_check() {
# A lot useful debug infos
- # set VDR_MAINTAINER_MODE="1" in /etc/make.conf
+ # set VDR_MAINTAINER_MODE="1" in make.conf
if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
eerror "\t Maintainer Info: $@"
fi
@@ -336,7 +336,7 @@
}
# end new vdr-plugin-2.eclass content
-# we don't support included plugins from vdr source for install in this way !!!
+# ToDo: we don't support included plugins from vdr source for install in this way !!!
# obsolet, remove it, later...
#vdr-plugin-2_copy_source_tree() {
# pushd . >/dev/null
@@ -385,18 +385,18 @@
## exported functions
vdr-plugin-2_pkg_setup() {
+ # missing ${chost}- tag
+ tc-export CC CXX
+
# -fPIC is needed for shared objects on some platforms (amd64 and others)
append-flags -fPIC
# 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-lfs-flags
+ append-cxxlags -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
if has_version ">=media-video/vdr-1.7.34"; then
VDR_PLUGIN_DIR=$(pkg-config --variable=libdir vdr)
@@ -445,7 +445,7 @@
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!"
@@ -523,8 +523,8 @@
while [ "$1" ]; do
case "$1" in
copy_source)
-# [[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_copy_source_tree
- eerror "obsoleted handling, vdr-plugin-2_copy_source_tree"
+ [[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_copy_source_tree
+ dev_check "ToDo: obsoleted handling, vdr-plugin-2_copy_source_tree"
;;
compile)
if [[ ! -f ${WORKDIR}/.vdr-plugin_makefile_patched ]]; then
@@ -537,8 +537,9 @@
fi
cd "${S}"
-
- if has_version ">=media-video/vdr-1.7.34"; then
+ local SOFILE_STRING=$(grep SOFILE Makefile)
+ if [[ -n ${SOFILE_STRING} ]]; then
+ dev_check "compiling with new Makefile handling"
BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-install }}
emake ${BUILD_PARAMS} \
${BUILD_TARGETS} \
@@ -547,6 +548,7 @@
TMPDIR="${T}" \
|| die "emake failed"
else
+ dev_check "compiling with old Makefile handling"
BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-all }}
emake ${BUILD_PARAMS} \
${BUILD_TARGETS} \
@@ -571,7 +573,7 @@
die "vdr-plugin-2_src_install not called!"
fi
-# obsolet, remove it, later...
+# ToDo: obsolet, remove it, later...
# [[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_install_source_tree
cd "${WORKDIR}"
next reply other threads:[~2012-12-31 9:27 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-31 9:27 Joerg Bornkessel (hd_brummy) [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-01-05 18:15 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass Joerg Bornkessel (hd_brummy)
2015-01-05 10:26 Joerg Bornkessel (hd_brummy)
2015-01-04 21:16 Joerg Bornkessel (hd_brummy)
2014-02-08 0:56 Joerg Bornkessel (hd_brummy)
2014-01-25 15:23 Joerg Bornkessel (hd_brummy)
2014-01-24 13:51 Joerg Bornkessel (hd_brummy)
2013-10-07 12:21 Joerg Bornkessel (hd_brummy)
2013-04-13 19:07 Joerg Bornkessel (hd_brummy)
2013-03-30 20:14 Joerg Bornkessel (hd_brummy)
2013-03-05 9:09 Joerg Bornkessel (hd_brummy)
2013-01-27 13:32 Joerg Bornkessel (hd_brummy)
2013-01-27 10:17 Joerg Bornkessel (hd_brummy)
2013-01-04 13:23 Joerg Bornkessel (hd_brummy)
2013-01-03 20:30 Joerg Bornkessel (hd_brummy)
2012-12-31 19:49 Joerg Bornkessel (hd_brummy)
2012-12-31 18:53 Joerg Bornkessel (hd_brummy)
2012-12-29 17:47 Joerg Bornkessel (hd_brummy)
2012-09-29 19:38 Joerg Bornkessel (hd_brummy)
2012-09-17 19:32 Joerg Bornkessel (hd_brummy)
2012-08-05 19:26 Joerg Bornkessel (hd_brummy)
2012-06-27 18:54 Joerg Bornkessel (hd_brummy)
2012-06-10 14:59 Joerg Bornkessel (hd_brummy)
2012-06-10 14:21 Joerg Bornkessel (hd_brummy)
2012-05-25 19:56 Joerg Bornkessel (hd_brummy)
2012-05-20 20:34 Joerg Bornkessel (hd_brummy)
2012-05-20 17:33 Joerg Bornkessel (hd_brummy)
2012-04-29 15:03 Joerg Bornkessel (hd_brummy)
2012-04-29 13:05 Joerg Bornkessel (hd_brummy)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121231092700.9F04F2171D@flycatcher.gentoo.org \
--to=hd_brummy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox