1 |
vapier 09/06/17 10:04:17 |
2 |
|
3 |
Modified: ChangeLog metadata.xml openocd-9999.ebuild |
4 |
openocd-0.1.0.ebuild |
5 |
Log: |
6 |
Now that libftd2xx supports amd64, split the ftdi/ftd2xx USE flags #255309 by Andrej Gelenberg. |
7 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.7 dev-embedded/openocd/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/ChangeLog?rev=1.7&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/ChangeLog?rev=1.7&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/ChangeLog?r1=1.6&r2=1.7 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v |
19 |
retrieving revision 1.6 |
20 |
retrieving revision 1.7 |
21 |
diff -u -r1.6 -r1.7 |
22 |
--- ChangeLog 23 Feb 2009 22:47:08 -0000 1.6 |
23 |
+++ ChangeLog 17 Jun 2009 10:04:16 -0000 1.7 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for dev-embedded/openocd |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.6 2009/02/23 22:47:08 maekke Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.7 2009/06/17 10:04:16 vapier Exp $ |
29 |
+ |
30 |
+ 17 Jun 2009; Mike Frysinger <vapier@g.o> openocd-0.1.0.ebuild, |
31 |
+ openocd-9999.ebuild, metadata.xml: |
32 |
+ Now that libftd2xx supports amd64, split the ftdi/ftd2xx USE flags #255309 |
33 |
+ by Andrej Gelenberg. |
34 |
|
35 |
*openocd-0.1.0 (23 Feb 2009) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.3 dev-embedded/openocd/metadata.xml |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/metadata.xml?rev=1.3&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/metadata.xml?rev=1.3&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/metadata.xml?r1=1.2&r2=1.3 |
45 |
|
46 |
Index: metadata.xml |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/metadata.xml,v |
49 |
retrieving revision 1.2 |
50 |
retrieving revision 1.3 |
51 |
diff -u -r1.2 -r1.3 |
52 |
--- metadata.xml 5 Aug 2008 19:04:10 -0000 1.2 |
53 |
+++ metadata.xml 17 Jun 2009 10:04:16 -0000 1.3 |
54 |
@@ -3,10 +3,8 @@ |
55 |
<pkgmetadata> |
56 |
<herd>dev-embedded</herd> |
57 |
<use> |
58 |
- <flag name='ft2232'>Enable support for USB chips via |
59 |
- <pkg>dev-embedded/libftd2xx</pkg></flag> |
60 |
- <flag name='ftdi'>Enable support for USB FTDI chips |
61 |
- (<pkg>dev-embedded/libftdi</pkg>)</flag> |
62 |
+ <flag name='ftd2xx'>Enable support for USB FTDI chips via <pkg>dev-embedded/libftd2xx</pkg></flag> |
63 |
+ <flag name='ftdi'>Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag> |
64 |
<flag name='parport'>Enable support for parport JTAG devices</flag> |
65 |
<flag name='presto'>Enable support for AXIS PRESTO devices</flag> |
66 |
</use> |
67 |
|
68 |
|
69 |
|
70 |
1.6 dev-embedded/openocd/openocd-9999.ebuild |
71 |
|
72 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?rev=1.6&view=markup |
73 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?rev=1.6&content-type=text/plain |
74 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?r1=1.5&r2=1.6 |
75 |
|
76 |
Index: openocd-9999.ebuild |
77 |
=================================================================== |
78 |
RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v |
79 |
retrieving revision 1.5 |
80 |
retrieving revision 1.6 |
81 |
diff -u -r1.5 -r1.6 |
82 |
--- openocd-9999.ebuild 23 Feb 2009 22:47:08 -0000 1.5 |
83 |
+++ openocd-9999.ebuild 17 Jun 2009 10:04:16 -0000 1.6 |
84 |
@@ -1,15 +1,15 @@ |
85 |
# Copyright 1999-2009 Gentoo Foundation |
86 |
# Distributed under the terms of the GNU General Public License v2 |
87 |
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.5 2009/02/23 22:47:08 maekke Exp $ |
88 |
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.6 2009/06/17 10:04:16 vapier Exp $ |
89 |
|
90 |
ESVN_REPO_URI="http://svn.berlios.de/svnroot/repos/openocd/trunk" |
91 |
-inherit eutils multilib |
92 |
+inherit eutils |
93 |
if [[ ${PV} == "9999" ]] ; then |
94 |
inherit subversion autotools |
95 |
KEYWORDS="" |
96 |
SRC_URI="" |
97 |
else |
98 |
- KEYWORDS="" |
99 |
+ KEYWORDS="~x86" |
100 |
SRC_URI="mirror://berlios/${PN}/${P}.tar.gz" |
101 |
fi |
102 |
|
103 |
@@ -18,28 +18,20 @@ |
104 |
|
105 |
LICENSE="GPL-2" |
106 |
SLOT="0" |
107 |
-IUSE="ft2232 ftdi parport presto usb" |
108 |
+IUSE="ftd2xx ftdi parport presto usb" |
109 |
RESTRICT="strip" # includes non-native binaries |
110 |
|
111 |
# libftd2xx is the default because it is reported to work better. |
112 |
DEPEND="usb? ( dev-libs/libusb ) |
113 |
presto? ( dev-embedded/libftd2xx ) |
114 |
- ft2232? ( || ( ftdi? ( dev-embedded/libftdi ) dev-embedded/libftd2xx ) )" |
115 |
+ ftd2xx? ( dev-embedded/libftd2xx ) |
116 |
+ ftdi? ( dev-embedded/libftdi )" |
117 |
RDEPEND="${DEPEND}" |
118 |
|
119 |
pkg_setup() { |
120 |
- if use ftdi && ! use ft2232 ; then |
121 |
- ewarn "You enabled libftdi but not ft2232!" |
122 |
- ewarn "libftdi is only used for ft2232, so this is meaningless!" |
123 |
- fi |
124 |
- |
125 |
- # stupid ft2232 is binary only, so we have to force |
126 |
- # a 32bit build of openocd if people want to use it |
127 |
- if use ft2232 && has_multilib_profile ; then |
128 |
- ABI="x86" |
129 |
- if use ftdi ; then |
130 |
- die "ft2232 is x86 and ftdi is amd64, choose one or the other!" |
131 |
- fi |
132 |
+ if use ftdi && use ftd2xx ; then |
133 |
+ ewarn "You can only use one FTDI library at a time, so picking" |
134 |
+ ewarn "USE=ftdi (open source) over USE=ftd2xx (closed source)" |
135 |
fi |
136 |
} |
137 |
|
138 |
@@ -65,8 +57,8 @@ |
139 |
$(use_enable usb usbprog) \ |
140 |
$(use_enable parport parport_giveio) \ |
141 |
$(use_enable presto presto_ftd2xx) \ |
142 |
- $(use ft2232 && use_enable ftdi ft2232_libftdi) \ |
143 |
- $(use ft2232 && use_enable !ftdi ft2232_ftd2xx) |
144 |
+ $(use_enable ftdi ft2232_libftdi) \ |
145 |
+ $(use ftdi || use_enable ftd2xx ft2232_ftd2xx) |
146 |
emake || die "Error in emake!" |
147 |
} |
148 |
|
149 |
|
150 |
|
151 |
|
152 |
1.2 dev-embedded/openocd/openocd-0.1.0.ebuild |
153 |
|
154 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/openocd-0.1.0.ebuild?rev=1.2&view=markup |
155 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/openocd-0.1.0.ebuild?rev=1.2&content-type=text/plain |
156 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/openocd-0.1.0.ebuild?r1=1.1&r2=1.2 |
157 |
|
158 |
Index: openocd-0.1.0.ebuild |
159 |
=================================================================== |
160 |
RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.1.0.ebuild,v |
161 |
retrieving revision 1.1 |
162 |
retrieving revision 1.2 |
163 |
diff -u -r1.1 -r1.2 |
164 |
--- openocd-0.1.0.ebuild 23 Feb 2009 22:47:08 -0000 1.1 |
165 |
+++ openocd-0.1.0.ebuild 17 Jun 2009 10:04:17 -0000 1.2 |
166 |
@@ -1,9 +1,9 @@ |
167 |
# Copyright 1999-2009 Gentoo Foundation |
168 |
# Distributed under the terms of the GNU General Public License v2 |
169 |
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.1.0.ebuild,v 1.1 2009/02/23 22:47:08 maekke Exp $ |
170 |
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.1.0.ebuild,v 1.2 2009/06/17 10:04:17 vapier Exp $ |
171 |
|
172 |
ESVN_REPO_URI="http://svn.berlios.de/svnroot/repos/openocd/trunk" |
173 |
-inherit eutils multilib |
174 |
+inherit eutils |
175 |
if [[ ${PV} == "9999" ]] ; then |
176 |
inherit subversion autotools |
177 |
KEYWORDS="" |
178 |
@@ -18,28 +18,20 @@ |
179 |
|
180 |
LICENSE="GPL-2" |
181 |
SLOT="0" |
182 |
-IUSE="ft2232 ftdi parport presto usb" |
183 |
+IUSE="ftd2xx ftdi parport presto usb" |
184 |
RESTRICT="strip" # includes non-native binaries |
185 |
|
186 |
# libftd2xx is the default because it is reported to work better. |
187 |
DEPEND="usb? ( dev-libs/libusb ) |
188 |
presto? ( dev-embedded/libftd2xx ) |
189 |
- ft2232? ( || ( ftdi? ( dev-embedded/libftdi ) dev-embedded/libftd2xx ) )" |
190 |
+ ftd2xx? ( dev-embedded/libftd2xx ) |
191 |
+ ftdi? ( dev-embedded/libftdi )" |
192 |
RDEPEND="${DEPEND}" |
193 |
|
194 |
pkg_setup() { |
195 |
- if use ftdi && ! use ft2232 ; then |
196 |
- ewarn "You enabled libftdi but not ft2232!" |
197 |
- ewarn "libftdi is only used for ft2232, so this is meaningless!" |
198 |
- fi |
199 |
- |
200 |
- # stupid ft2232 is binary only, so we have to force |
201 |
- # a 32bit build of openocd if people want to use it |
202 |
- if use ft2232 && has_multilib_profile ; then |
203 |
- ABI="x86" |
204 |
- if use ftdi ; then |
205 |
- die "ft2232 is x86 and ftdi is amd64, choose one or the other!" |
206 |
- fi |
207 |
+ if use ftdi && use ftd2xx ; then |
208 |
+ ewarn "You can only use one FTDI library at a time, so picking" |
209 |
+ ewarn "USE=ftdi (open source) over USE=ftd2xx (closed source)" |
210 |
fi |
211 |
} |
212 |
|
213 |
@@ -65,8 +57,8 @@ |
214 |
$(use_enable usb usbprog) \ |
215 |
$(use_enable parport parport_giveio) \ |
216 |
$(use_enable presto presto_ftd2xx) \ |
217 |
- $(use ft2232 && use_enable ftdi ft2232_libftdi) \ |
218 |
- $(use ft2232 && use_enable !ftdi ft2232_ftd2xx) |
219 |
+ $(use_enable ftdi ft2232_libftdi) \ |
220 |
+ $(use ftdi || use_enable ftd2xx ft2232_ftd2xx) |
221 |
emake || die "Error in emake!" |
222 |
} |