1 |
hd_brummy 12/12/31 09:27:00 |
2 |
|
3 |
Modified: ChangeLog vdr-plugin-2.eclass |
4 |
Log: |
5 |
vdr-plugin-2.eclass; better detection of new Makefile handling, fixed some mistakes in inherited append-*flags |
6 |
|
7 |
Revision Changes Path |
8 |
1.583 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.583&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.583&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.582&r2=1.583 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.582 |
18 |
retrieving revision 1.583 |
19 |
diff -u -r1.582 -r1.583 |
20 |
--- ChangeLog 31 Dec 2012 06:29:42 -0000 1.582 |
21 |
+++ ChangeLog 31 Dec 2012 09:27:00 -0000 1.583 |
22 |
@@ -1,6 +1,10 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.582 2012/12/31 06:29:42 pesa Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.583 2012/12/31 09:27:00 hd_brummy Exp $ |
27 |
+ |
28 |
+ 31 Dec 2012; Joerg Bornkessel <hd_brummy@g.o> vdr-plugin-2.eclass: |
29 |
+ vdr-plugin-2.eclass; better detection of new Makefile handling, fixed some |
30 |
+ mistakes in inherited append-*flags |
31 |
|
32 |
31 Dec 2012; Davide Pesavento <pesa@g.o> qt4-build.eclass: |
33 |
Remove dead code. |
34 |
|
35 |
|
36 |
|
37 |
1.15 eclass/vdr-plugin-2.eclass |
38 |
|
39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.15&view=markup |
40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.15&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.14&r2=1.15 |
42 |
|
43 |
Index: vdr-plugin-2.eclass |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v |
46 |
retrieving revision 1.14 |
47 |
retrieving revision 1.15 |
48 |
diff -u -r1.14 -r1.15 |
49 |
--- vdr-plugin-2.eclass 29 Dec 2012 17:47:53 -0000 1.14 |
50 |
+++ vdr-plugin-2.eclass 31 Dec 2012 09:27:00 -0000 1.15 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2012 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.14 2012/12/29 17:47:53 hd_brummy Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.15 2012/12/31 09:27:00 hd_brummy Exp $ |
56 |
|
57 |
# @ECLASS: vdr-plugin-2.eclass |
58 |
# @MAINTAINER: |
59 |
@@ -226,7 +226,7 @@ |
60 |
# Begin new vdr-plugin-2.eclass content |
61 |
dev_check() { |
62 |
# A lot useful debug infos |
63 |
- # set VDR_MAINTAINER_MODE="1" in /etc/make.conf |
64 |
+ # set VDR_MAINTAINER_MODE="1" in make.conf |
65 |
if [[ -n ${VDR_MAINTAINER_MODE} ]]; then |
66 |
eerror "\t Maintainer Info: $@" |
67 |
fi |
68 |
@@ -336,7 +336,7 @@ |
69 |
} |
70 |
# end new vdr-plugin-2.eclass content |
71 |
|
72 |
-# we don't support included plugins from vdr source for install in this way !!! |
73 |
+# ToDo: we don't support included plugins from vdr source for install in this way !!! |
74 |
# obsolet, remove it, later... |
75 |
#vdr-plugin-2_copy_source_tree() { |
76 |
# pushd . >/dev/null |
77 |
@@ -385,18 +385,18 @@ |
78 |
## exported functions |
79 |
|
80 |
vdr-plugin-2_pkg_setup() { |
81 |
+ # missing ${chost}- tag |
82 |
+ tc-export CC CXX |
83 |
+ |
84 |
# -fPIC is needed for shared objects on some platforms (amd64 and others) |
85 |
append-flags -fPIC |
86 |
|
87 |
# Plugins need to be compiled with position independent code, otherwise linking |
88 |
# VDR against it will fail |
89 |
if has_version ">=media-video/vdr-1.7.13"; then |
90 |
- append-lfs-flags |
91 |
+ append-cxxlags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE |
92 |
fi |
93 |
|
94 |
- # missing ${chost}- tag |
95 |
- tc-export CC CXX |
96 |
- |
97 |
# Where should the plugins live in the filesystem |
98 |
if has_version ">=media-video/vdr-1.7.34"; then |
99 |
VDR_PLUGIN_DIR=$(pkg-config --variable=libdir vdr) |
100 |
@@ -445,7 +445,7 @@ |
101 |
fi |
102 |
|
103 |
einfo "Compiling against" |
104 |
- einfo "\tvdr-${VDRVERSION} [API version ${APIVERSION}]" |
105 |
+ einfo "\tvdr-${VDRVERSION}} [API version ${APIVERSION}]" |
106 |
|
107 |
if [[ -n "${VDR_LOCAL_PATCHES_DIR}" ]]; then |
108 |
eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!" |
109 |
@@ -523,8 +523,8 @@ |
110 |
while [ "$1" ]; do |
111 |
case "$1" in |
112 |
copy_source) |
113 |
-# [[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_copy_source_tree |
114 |
- eerror "obsoleted handling, vdr-plugin-2_copy_source_tree" |
115 |
+ [[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_copy_source_tree |
116 |
+ dev_check "ToDo: obsoleted handling, vdr-plugin-2_copy_source_tree" |
117 |
;; |
118 |
compile) |
119 |
if [[ ! -f ${WORKDIR}/.vdr-plugin_makefile_patched ]]; then |
120 |
@@ -537,8 +537,9 @@ |
121 |
fi |
122 |
cd "${S}" |
123 |
|
124 |
- |
125 |
- if has_version ">=media-video/vdr-1.7.34"; then |
126 |
+ local SOFILE_STRING=$(grep SOFILE Makefile) |
127 |
+ if [[ -n ${SOFILE_STRING} ]]; then |
128 |
+ dev_check "compiling with new Makefile handling" |
129 |
BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-install }} |
130 |
emake ${BUILD_PARAMS} \ |
131 |
${BUILD_TARGETS} \ |
132 |
@@ -547,6 +548,7 @@ |
133 |
TMPDIR="${T}" \ |
134 |
|| die "emake failed" |
135 |
else |
136 |
+ dev_check "compiling with old Makefile handling" |
137 |
BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-all }} |
138 |
emake ${BUILD_PARAMS} \ |
139 |
${BUILD_TARGETS} \ |
140 |
@@ -571,7 +573,7 @@ |
141 |
die "vdr-plugin-2_src_install not called!" |
142 |
fi |
143 |
|
144 |
-# obsolet, remove it, later... |
145 |
+# ToDo: obsolet, remove it, later... |
146 |
# [[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_install_source_tree |
147 |
cd "${WORKDIR}" |