1 |
hwoarang 13/05/27 20:31:30 |
2 |
|
3 |
Modified: openocd-0.7.0.ebuild ChangeLog |
4 |
Log: |
5 |
Sync ebuild with 9999. Fixes bug 471382 |
6 |
|
7 |
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 dev-embedded/openocd/openocd-0.7.0.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-0.7.0.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-0.7.0.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-0.7.0.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: openocd-0.7.0.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.7.0.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- openocd-0.7.0.ebuild 25 May 2013 09:14:03 -0000 1.1 |
23 |
+++ openocd-0.7.0.ebuild 27 May 2013 20:31:30 -0000 1.2 |
24 |
@@ -1,14 +1,16 @@ |
25 |
# Copyright 1999-2013 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.7.0.ebuild,v 1.1 2013/05/25 09:14:03 hwoarang Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.7.0.ebuild,v 1.2 2013/05/27 20:31:30 hwoarang Exp $ |
29 |
|
30 |
-EAPI="4" |
31 |
+EAPI="5" |
32 |
|
33 |
inherit eutils multilib flag-o-matic toolchain-funcs |
34 |
+ |
35 |
+# One ebuild to rule them all |
36 |
if [[ ${PV} == "9999" ]] ; then |
37 |
inherit autotools git-2 |
38 |
KEYWORDS="" |
39 |
- EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}" |
40 |
+ EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" |
41 |
else |
42 |
KEYWORDS="~amd64 ~x86" |
43 |
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2" |
44 |
@@ -19,7 +21,7 @@ |
45 |
|
46 |
LICENSE="GPL-2" |
47 |
SLOT="0" |
48 |
-IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger usb versaloon" |
49 |
+IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger stlink usb versaloon verbose-io" |
50 |
RESTRICT="strip" # includes non-native binaries |
51 |
|
52 |
# libftd2xx is the default because it is reported to work better. |
53 |
@@ -33,6 +35,8 @@ |
54 |
REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )" |
55 |
|
56 |
src_prepare() { |
57 |
+ epatch_user |
58 |
+ |
59 |
if [[ ${PV} == "9999" ]] ; then |
60 |
sed -i -e "/@include version.texi/d" doc/${PN}.texi || die |
61 |
AT_NO_RECURSIVE=yes eautoreconf |
62 |
@@ -66,6 +70,11 @@ |
63 |
--enable-at91rm9200 |
64 |
--enable-gw16012 |
65 |
--enable-oocd_trace |
66 |
+ --enable-ulink |
67 |
+ --enable-arm-jtag-ew |
68 |
+ --enable-ti-icdi |
69 |
+ --enable-osbdm |
70 |
+ --enable-opendous |
71 |
) |
72 |
|
73 |
if use usb; then |
74 |
@@ -75,6 +84,8 @@ |
75 |
--enable-rlink |
76 |
--enable-vsllink |
77 |
--enable-arm-jtag-ew |
78 |
+ $(use_enable verbose-io verbose-usb-io) |
79 |
+ $(use_enable verbose-io verbose_usb_comms) |
80 |
) |
81 |
fi |
82 |
|
83 |
@@ -91,9 +102,13 @@ |
84 |
$(use_enable ftd2xx ft2232_ftd2xx) \ |
85 |
$(use_enable minidriver minidriver-dummy) \ |
86 |
$(use_enable parport) \ |
87 |
+ $(use_enable parport parport_ppdev) \ |
88 |
+ $(use_enable parport parport_giveio) \ |
89 |
$(use_enable presto presto_ftd2xx) \ |
90 |
$(use_enable segger jlink) \ |
91 |
+ $(use_enable stlink) \ |
92 |
$(use_enable versaloon vsllink) \ |
93 |
+ $(use_enable verbose-io verbose-jtag-io) \ |
94 |
"${myconf[@]}" |
95 |
} |
96 |
|
97 |
|
98 |
|
99 |
|
100 |
1.42 dev-embedded/openocd/ChangeLog |
101 |
|
102 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/ChangeLog?rev=1.42&view=markup |
103 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/ChangeLog?rev=1.42&content-type=text/plain |
104 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/ChangeLog?r1=1.41&r2=1.42 |
105 |
|
106 |
Index: ChangeLog |
107 |
=================================================================== |
108 |
RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v |
109 |
retrieving revision 1.41 |
110 |
retrieving revision 1.42 |
111 |
diff -u -r1.41 -r1.42 |
112 |
--- ChangeLog 25 May 2013 09:14:03 -0000 1.41 |
113 |
+++ ChangeLog 27 May 2013 20:31:30 -0000 1.42 |
114 |
@@ -1,6 +1,9 @@ |
115 |
# ChangeLog for dev-embedded/openocd |
116 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
117 |
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.41 2013/05/25 09:14:03 hwoarang Exp $ |
118 |
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.42 2013/05/27 20:31:30 hwoarang Exp $ |
119 |
+ |
120 |
+ 27 May 2013; Markos Chandras <hwoarang@g.o> openocd-0.7.0.ebuild: |
121 |
+ Sync ebuild with 9999. Fixes bug 471382 |
122 |
|
123 |
*openocd-0.7.0 (25 May 2013) |