1 |
commit: cb60b5c5b84a6eb770cee3e0c67ab23530ba5096 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 2 14:33:22 2018 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 2 14:33:53 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb60b5c5 |
7 |
|
8 |
dev-embedded/sdcc: Fix and run eautoreconf |
9 |
|
10 |
Patch support/sdbinutils/config/override.m4 to not fix on autoconf 2.64 |
11 |
Run eautoreconf |
12 |
Remove docs_compile() but instead check PV in src_install() |
13 |
Do not compile documentation in live ebuild as getting lyx to behave is |
14 |
more trouble than it's worth |
15 |
|
16 |
Fixes: https://bugs.gentoo.org/670126 |
17 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
18 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
19 |
|
20 |
.../sdcc/files/sdcc-3.8.0-override-override.patch | 30 +++++++++++++++++++ |
21 |
dev-embedded/sdcc/sdcc-3.8.0.ebuild | 35 ++++++++++------------ |
22 |
dev-embedded/sdcc/sdcc-9999.ebuild | 35 ++++++++++------------ |
23 |
3 files changed, 60 insertions(+), 40 deletions(-) |
24 |
|
25 |
diff --git a/dev-embedded/sdcc/files/sdcc-3.8.0-override-override.patch b/dev-embedded/sdcc/files/sdcc-3.8.0-override-override.patch |
26 |
new file mode 100644 |
27 |
index 00000000000..f6bb4b8b972 |
28 |
--- /dev/null |
29 |
+++ b/dev-embedded/sdcc/files/sdcc-3.8.0-override-override.patch |
30 |
@@ -0,0 +1,30 @@ |
31 |
+--- a/support/sdbinutils/config/override.m4 |
32 |
++++ b/support/sdbinutils/config/override.m4 |
33 |
+@@ -27,27 +27,6 @@ |
34 |
+ m4_copy_force([_AC_PREREQ], [AC_PREREQ]) |
35 |
+ |
36 |
+ |
37 |
+-dnl Ensure exactly this Autoconf version is used |
38 |
+-m4_ifndef([_GCC_AUTOCONF_VERSION], |
39 |
+- [m4_define([_GCC_AUTOCONF_VERSION], [2.64])]) |
40 |
+- |
41 |
+-dnl Test for the exact version when AC_INIT is expanded. |
42 |
+-dnl This allows to update the tree in steps (for testing) |
43 |
+-dnl by putting |
44 |
+-dnl m4_define([_GCC_AUTOCONF_VERSION], [X.Y]) |
45 |
+-dnl in configure.ac before AC_INIT, |
46 |
+-dnl without rewriting this file. |
47 |
+-dnl Or for updating the whole tree at once with the definition above. |
48 |
+-AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK], |
49 |
+-[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]), |
50 |
+- m4_defn([m4_PACKAGE_VERSION]), [], |
51 |
+- [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])]) |
52 |
+-]) |
53 |
+-m4_define([AC_INIT], m4_defn([AC_INIT])[ |
54 |
+-_GCC_AUTOCONF_VERSION_CHECK |
55 |
+-]) |
56 |
+- |
57 |
+- |
58 |
+ dnl Ensure we do not use a buggy M4. |
59 |
+ m4_if(m4_index([..wi.d.], [.d.]), [-1], |
60 |
+ [m4_fatal(m4_do([m4 with buggy strstr detected. Please install |
61 |
|
62 |
diff --git a/dev-embedded/sdcc/sdcc-3.8.0.ebuild b/dev-embedded/sdcc/sdcc-3.8.0.ebuild |
63 |
index 8db064b0f82..b2e7a0f0e7b 100644 |
64 |
--- a/dev-embedded/sdcc/sdcc-3.8.0.ebuild |
65 |
+++ b/dev-embedded/sdcc/sdcc-3.8.0.ebuild |
66 |
@@ -2,17 +2,17 @@ |
67 |
# Distributed under the terms of the GNU General Public License v2 |
68 |
|
69 |
EAPI=6 |
70 |
-inherit toolchain-funcs |
71 |
+inherit autotools toolchain-funcs |
72 |
|
73 |
if [[ ${PV} == "9999" ]] ; then |
74 |
ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc" |
75 |
inherit subversion |
76 |
- docs_compile() { return 0; } |
77 |
else |
78 |
- SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2 |
79 |
- doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )" |
80 |
+ SRC_URI=" |
81 |
+ mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2 |
82 |
+ doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 ) |
83 |
+ " |
84 |
KEYWORDS="~amd64 ~x86" |
85 |
- docs_compile() { return 1; } |
86 |
fi |
87 |
|
88 |
DESCRIPTION="Small device C compiler (for various microprocessors)" |
89 |
@@ -56,14 +56,9 @@ DEPEND=" |
90 |
${RDEPEND} |
91 |
dev-util/gperf |
92 |
" |
93 |
-if docs_compile ; then |
94 |
-DEPEND+=" |
95 |
- doc? ( |
96 |
- >=app-office/lyx-1.3.4 |
97 |
- dev-tex/latex2html |
98 |
- ) |
99 |
-" |
100 |
-fi |
101 |
+PATCHES=( |
102 |
+ "${FILESDIR}"/${PN}-3.8.0-override-override.patch |
103 |
+) |
104 |
|
105 |
src_prepare() { |
106 |
# Fix conflicting variable names between Gentoo and sdcc |
107 |
@@ -83,16 +78,16 @@ src_prepare() { |
108 |
[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} + |
109 |
|
110 |
default |
111 |
+ eautoreconf |
112 |
} |
113 |
|
114 |
src_configure() { |
115 |
# sdbinutils subdir doesn't pass down --docdir properly, so need to |
116 |
# expand $(datarootdir) ourselves. |
117 |
econf \ |
118 |
- ac_cv_prog_STRIP=true \ |
119 |
- ac_cv_prog_AS="$(tc-getAS)" \ |
120 |
ac_cv_prog_AR="$(tc-getAR)" \ |
121 |
- $(docs_compile && use_enable doc || echo --disable-doc) \ |
122 |
+ ac_cv_prog_AS="$(tc-getAS)" \ |
123 |
+ ac_cv_prog_STRIP=true \ |
124 |
$(use_enable avr avr-port) \ |
125 |
$(use_enable boehm-gc libgc) \ |
126 |
$(use_enable device-lib) \ |
127 |
@@ -116,6 +111,7 @@ src_configure() { |
128 |
$(use_enable ucsim) \ |
129 |
$(use_enable z180 z180-port) \ |
130 |
$(use_enable z80 z80-port) \ |
131 |
+ --disable-doc \ |
132 |
--docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
133 |
--without-ccache |
134 |
} |
135 |
@@ -125,10 +121,9 @@ src_install() { |
136 |
dodoc doc/*.txt |
137 |
find "${D}" -name .deps -exec rm -rf {} + || die |
138 |
|
139 |
- if use doc ; then |
140 |
- docs_compile || cd "${WORKDIR}"/doc |
141 |
- docinto html |
142 |
- doins -r * |
143 |
+ if use doc && [[ ${PV} != "9999" ]]; then |
144 |
+ cd "${WORKDIR}"/doc |
145 |
+ dodoc -r * |
146 |
fi |
147 |
|
148 |
# a bunch of archives (*.a) are built & installed by gputils |
149 |
|
150 |
diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild |
151 |
index 8db064b0f82..b2e7a0f0e7b 100644 |
152 |
--- a/dev-embedded/sdcc/sdcc-9999.ebuild |
153 |
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild |
154 |
@@ -2,17 +2,17 @@ |
155 |
# Distributed under the terms of the GNU General Public License v2 |
156 |
|
157 |
EAPI=6 |
158 |
-inherit toolchain-funcs |
159 |
+inherit autotools toolchain-funcs |
160 |
|
161 |
if [[ ${PV} == "9999" ]] ; then |
162 |
ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc" |
163 |
inherit subversion |
164 |
- docs_compile() { return 0; } |
165 |
else |
166 |
- SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2 |
167 |
- doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )" |
168 |
+ SRC_URI=" |
169 |
+ mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2 |
170 |
+ doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 ) |
171 |
+ " |
172 |
KEYWORDS="~amd64 ~x86" |
173 |
- docs_compile() { return 1; } |
174 |
fi |
175 |
|
176 |
DESCRIPTION="Small device C compiler (for various microprocessors)" |
177 |
@@ -56,14 +56,9 @@ DEPEND=" |
178 |
${RDEPEND} |
179 |
dev-util/gperf |
180 |
" |
181 |
-if docs_compile ; then |
182 |
-DEPEND+=" |
183 |
- doc? ( |
184 |
- >=app-office/lyx-1.3.4 |
185 |
- dev-tex/latex2html |
186 |
- ) |
187 |
-" |
188 |
-fi |
189 |
+PATCHES=( |
190 |
+ "${FILESDIR}"/${PN}-3.8.0-override-override.patch |
191 |
+) |
192 |
|
193 |
src_prepare() { |
194 |
# Fix conflicting variable names between Gentoo and sdcc |
195 |
@@ -83,16 +78,16 @@ src_prepare() { |
196 |
[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} + |
197 |
|
198 |
default |
199 |
+ eautoreconf |
200 |
} |
201 |
|
202 |
src_configure() { |
203 |
# sdbinutils subdir doesn't pass down --docdir properly, so need to |
204 |
# expand $(datarootdir) ourselves. |
205 |
econf \ |
206 |
- ac_cv_prog_STRIP=true \ |
207 |
- ac_cv_prog_AS="$(tc-getAS)" \ |
208 |
ac_cv_prog_AR="$(tc-getAR)" \ |
209 |
- $(docs_compile && use_enable doc || echo --disable-doc) \ |
210 |
+ ac_cv_prog_AS="$(tc-getAS)" \ |
211 |
+ ac_cv_prog_STRIP=true \ |
212 |
$(use_enable avr avr-port) \ |
213 |
$(use_enable boehm-gc libgc) \ |
214 |
$(use_enable device-lib) \ |
215 |
@@ -116,6 +111,7 @@ src_configure() { |
216 |
$(use_enable ucsim) \ |
217 |
$(use_enable z180 z180-port) \ |
218 |
$(use_enable z80 z80-port) \ |
219 |
+ --disable-doc \ |
220 |
--docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
221 |
--without-ccache |
222 |
} |
223 |
@@ -125,10 +121,9 @@ src_install() { |
224 |
dodoc doc/*.txt |
225 |
find "${D}" -name .deps -exec rm -rf {} + || die |
226 |
|
227 |
- if use doc ; then |
228 |
- docs_compile || cd "${WORKDIR}"/doc |
229 |
- docinto html |
230 |
- doins -r * |
231 |
+ if use doc && [[ ${PV} != "9999" ]]; then |
232 |
+ cd "${WORKDIR}"/doc |
233 |
+ dodoc -r * |
234 |
fi |
235 |
|
236 |
# a bunch of archives (*.a) are built & installed by gputils |