Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-tcltk/tclpython: ChangeLog tclpython-4.1-r2.ebuild tclpython-3.1-r1.ebuild
Date: Mon, 05 Apr 2010 20:16:20
Message-Id: 20100405201617.EC34B2C04A@corvid.gentoo.org
1 jlec 10/04/05 20:16:17
2
3 Modified: ChangeLog tclpython-4.1-r2.ebuild
4 tclpython-3.1-r1.ebuild
5 Log:
6 Underlinking fixed, all src files get compiled, #313255
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.11 dev-tcltk/tclpython/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/tclpython/ChangeLog?rev=1.11&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/tclpython/ChangeLog?rev=1.11&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/tclpython/ChangeLog?r1=1.10&r2=1.11
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/ChangeLog,v
19 retrieving revision 1.10
20 retrieving revision 1.11
21 diff -u -r1.10 -r1.11
22 --- ChangeLog 31 Mar 2010 21:03:25 -0000 1.10
23 +++ ChangeLog 5 Apr 2010 20:16:17 -0000 1.11
24 @@ -1,6 +1,10 @@
25 # ChangeLog for dev-tcltk/tclpython
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/ChangeLog,v 1.10 2010/03/31 21:03:25 jlec Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/ChangeLog,v 1.11 2010/04/05 20:16:17 jlec Exp $
29 +
30 + 05 Apr 2010; Justin Lecher <jlec@g.o> tclpython-3.1-r1.ebuild,
31 + tclpython-4.1-r2.ebuild:
32 + Underlinking fixed, all src files get compiled, #313255
33
34 *tclpython-4.1-r2 (31 Mar 2010)
35 *tclpython-3.1-r1 (31 Mar 2010)
36
37
38
39 1.2 dev-tcltk/tclpython/tclpython-4.1-r2.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild?rev=1.2&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild?rev=1.2&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild?r1=1.1&r2=1.2
44
45 Index: tclpython-4.1-r2.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild,v
48 retrieving revision 1.1
49 retrieving revision 1.2
50 diff -u -r1.1 -r1.2
51 --- tclpython-4.1-r2.ebuild 31 Mar 2010 21:03:25 -0000 1.1
52 +++ tclpython-4.1-r2.ebuild 5 Apr 2010 20:16:17 -0000 1.2
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2010 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild,v 1.1 2010/03/31 21:03:25 jlec Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild,v 1.2 2010/04/05 20:16:17 jlec Exp $
58
59 PYTHON_DEPEND="2"
60
61 @@ -18,13 +18,16 @@
62 DEPEND=">=dev-lang/tcl-8.4"
63
64 src_compile() {
65 - einfo \
66 - "$(tc-getCC) -shared ${LDFLAGS} -fPIC ${CFLAGS} -o tclpython.so.${PV} \
67 - -I$(python_get_includedir) tclpython.c -lpthread -lutil"
68 -
69 - $(tc-getCC) -shared ${LDFLAGS} -fPIC ${CFLAGS} -o tclpython.so.${PV} \
70 - -I$(python_get_includedir) tclpython.c -lpthread -lutil \
71 - || die
72 + cfile="tclpython tclthread"
73 + for src in ${cfile}; do
74 + compile="$(tc-getCC) -shared -fPIC ${CFLAGS} -I$(python_get_includedir) -c ${src}.c"
75 + einfo "${compile}"
76 + eval "${compile}" || die
77 + done
78 +
79 + link="$(tc-getCC) -fPIC -shared ${LDFLAGS} -o tclpython.so.${PV} tclpython.o tclthread.o -lpthread -lutil $(python_get_library -l) -ltcl"
80 + einfo "${link}"
81 + eval "${link}" || die
82 }
83
84 src_install() {
85
86
87
88 1.2 dev-tcltk/tclpython/tclpython-3.1-r1.ebuild
89
90 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild?rev=1.2&view=markup
91 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild?rev=1.2&content-type=text/plain
92 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild?r1=1.1&r2=1.2
93
94 Index: tclpython-3.1-r1.ebuild
95 ===================================================================
96 RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild,v
97 retrieving revision 1.1
98 retrieving revision 1.2
99 diff -u -r1.1 -r1.2
100 --- tclpython-3.1-r1.ebuild 31 Mar 2010 21:03:25 -0000 1.1
101 +++ tclpython-3.1-r1.ebuild 5 Apr 2010 20:16:17 -0000 1.2
102 @@ -1,6 +1,6 @@
103 # Copyright 1999-2010 Gentoo Foundation
104 # Distributed under the terms of the GNU General Public License v2
105 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild,v 1.1 2010/03/31 21:03:25 jlec Exp $
106 +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild,v 1.2 2010/04/05 20:16:17 jlec Exp $
107
108 PYTHON_DEPEND="2"
109
110 @@ -18,13 +18,18 @@
111 DEPEND=">=dev-lang/tcl-8.4"
112
113 src_compile() {
114 - einfo \
115 - "$(tc-getCC) -shared ${LDFLAGS} -fPIC ${CFLAGS} -o tclpython.so.${PV} \
116 - -I$(python_get_includedir) tclpython.c -lpthread -lutil"
117 -
118 - $(tc-getCC) -shared ${LDFLAGS} -fPIC ${CFLAGS} -o tclpython.so.${PV} \
119 - -I$(python_get_includedir) tclpython.c -lpthread -lutil \
120 - || die
121 + cfile="tclpython"
122 + for src in ${cfile}; do
123 + compile="$(tc-getCC) -shared -fPIC ${CFLAGS} -I$(python_get_includedir) -c ${src}.c"
124 + einfo "${compile}"
125 + eval "${compile}" || die
126 + done
127 +
128 + link="$(tc-getCC) -fPIC -shared ${LDFLAGS} -o tclpython.so.${PV} tclpython.o -lpthread -lutil $(python_get_library -l) -ltcl"
129 +
130 + einfo "${link}"
131 +
132 + eval "${link}" || die
133 }
134
135 src_install() {