| 1 | # Copyright 1999-2005 Gentoo Foundation |
1 | # Copyright 1999-2007 Gentoo Foundation |
| 2 | # Distributed under the terms of the GNU General Public License v2 |
2 | # Distributed under the terms of the GNU General Public License v2 |
| 3 | # $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.42 2005/01/31 03:02:13 vapier Exp $ |
3 | # $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.86 2010/04/14 02:13:54 vapier Exp $ |
| 4 | # |
4 | # |
| 5 | # Author: Martin Schlemmer <azarah@gentoo.org> |
5 | # Maintainer: base-system@gentoo.org |
| 6 | # |
6 | # |
| 7 | # This eclass patches ltmain.sh distributed with libtoolized packages with the |
7 | # This eclass patches ltmain.sh distributed with libtoolized packages with the |
| 8 | # relink and portage patch among others |
8 | # relink and portage patch among others |
| 9 | |
9 | # |
| 10 | ECLASS="libtool" |
10 | # Note, this eclass does not require libtool as it only applies patches to |
| 11 | INHERITED="${INHERITED} ${ECLASS}" |
11 | # generated libtool files. We do not run the libtoolize program because that |
| 12 | |
12 | # requires a regeneration of the main autotool files in order to work properly. |
| 13 | # 2004.09.25 rac |
|
|
| 14 | # i have verified that at least one package can use this eclass and |
|
|
| 15 | # build properly even without libtool installed yet, probably using |
|
|
| 16 | # the files in the distribution. eliminating this dependency fixes |
|
|
| 17 | # bug 65209, which is a showstopper for people doing installs using |
|
|
| 18 | # stageballs <3. if anybody decides to revert this, please attempt |
|
|
| 19 | # to find an alternate way of resolving that bug at the same time. |
|
|
| 20 | |
13 | |
| 21 | DESCRIPTION="Based on the ${ECLASS} eclass" |
14 | DESCRIPTION="Based on the ${ECLASS} eclass" |
| 22 | |
15 | |
| 23 | ELIBTOOL_VERSION="2.0.1" |
16 | ELIBTOOL_VERSION="2.0.2" |
| 24 | |
17 | |
|
|
18 | inherit toolchain-funcs |
|
|
19 | |
| 25 | ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches" |
20 | ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches" |
| 26 | ELT_APPLIED_PATCHES= |
21 | ELT_APPLIED_PATCHES= |
|
|
22 | ELT_LTMAIN_SH= |
| 27 | |
23 | |
| 28 | # |
24 | # |
| 29 | # Returns all the directories containing ltmain.sh |
25 | # Returns all the directories containing ltmain.sh |
| 30 | # |
26 | # |
| 31 | ELT_find_ltmain_sh() { |
27 | ELT_find_ltmain_sh() { |
| … | |
… | |
| 42 | # |
38 | # |
| 43 | # See if we can apply $2 on $1, and if so, do it |
39 | # See if we can apply $2 on $1, and if so, do it |
| 44 | # |
40 | # |
| 45 | ELT_try_and_apply_patch() { |
41 | ELT_try_and_apply_patch() { |
| 46 | local ret=0 |
42 | local ret=0 |
|
|
43 | local file=$1 |
| 47 | local patch="$2" |
44 | local patch=$2 |
| 48 | |
45 | |
| 49 | # We only support patchlevel of 0 - why worry if its static patches? |
46 | # We only support patchlevel of 0 - why worry if its static patches? |
| 50 | if patch -p0 --dry-run $1 < ${patch} &> ${T}/elibtool.log ; then |
47 | if patch -p0 --dry-run "${file}" "${patch}" &> "${T}/elibtool.log" ; then |
| 51 | einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..." |
48 | einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..." |
| 52 | patch -p0 $1 < ${patch} &>${T}/elibtool.log |
49 | patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \ |
|
|
50 | &> "${T}/elibtool.log" |
| 53 | ret=$? |
51 | ret=$? |
| 54 | export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}" |
52 | export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}" |
| 55 | else |
53 | else |
| 56 | ret=1 |
54 | ret=1 |
| 57 | fi |
55 | fi |
| 58 | |
56 | |
| 59 | return ${ret} |
57 | return "${ret}" |
|
|
58 | } |
|
|
59 | |
|
|
60 | # |
|
|
61 | # Get string version of ltmain.sh or ltconfig (passed as $1) |
|
|
62 | # |
|
|
63 | ELT_libtool_version() { |
|
|
64 | local ltmain_sh=$1 |
|
|
65 | local version= |
|
|
66 | |
|
|
67 | version=$(eval $(grep -e '^[[:space:]]*VERSION=' "${ltmain_sh}"); \ |
|
|
68 | echo "${VERSION}") |
|
|
69 | [[ -z ${version} ]] && version="0" |
|
|
70 | |
|
|
71 | echo "${version}" |
| 60 | } |
72 | } |
| 61 | |
73 | |
| 62 | # |
74 | # |
| 63 | # Run through the patches in $2 and see if any |
75 | # Run through the patches in $2 and see if any |
| 64 | # apply to $1 ... |
76 | # apply to $1 ... |
| 65 | # |
77 | # |
| 66 | ELT_walk_patches() { |
78 | ELT_walk_patches() { |
| 67 | local x= |
79 | local patch |
| 68 | local y= |
|
|
| 69 | local ret=1 |
80 | local ret=1 |
|
|
81 | local file=$1 |
| 70 | local patch_dir= |
82 | local patch_set=$2 |
| 71 | |
|
|
| 72 | if [[ -n $2 ]] ; then |
|
|
| 73 | if [[ -d ${ELT_PATCH_DIR}/$2 ]] ; then |
|
|
| 74 | patch_dir="${ELT_PATCH_DIR}/$2" |
83 | local patch_dir="${ELT_PATCH_DIR}/${patch_set}" |
| 75 | else |
84 | local rem_int_dep=$3 |
| 76 | return ${ret} |
85 | |
|
|
86 | [[ -z ${patch_set} ]] && return 1 |
|
|
87 | [[ ! -d ${patch_dir} ]] && return 1 |
|
|
88 | |
|
|
89 | pushd "${ELT_PATCH_DIR}" >/dev/null |
|
|
90 | |
|
|
91 | # Go through the patches in reverse order (newer version to older) |
|
|
92 | for patch in $(find "${patch_set}" -maxdepth 1 -type f | LC_ALL=C sort -r) ; do |
|
|
93 | # For --remove-internal-dep ... |
|
|
94 | if [[ -n ${rem_int_dep} ]] ; then |
|
|
95 | # For replace @REM_INT_DEP@ with what was passed |
|
|
96 | # to --remove-internal-dep |
|
|
97 | local tmp="${T}/$$.rem_int_deps.patch" |
|
|
98 | sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" "${patch}" > "${tmp}" |
|
|
99 | patch=${tmp} |
| 77 | fi |
100 | fi |
| 78 | |
101 | |
| 79 | for x in $(ls -d "${patch_dir}"/* 2> /dev/null) ; do |
|
|
| 80 | if [[ -n ${x} && -f ${x} ]] ; then |
|
|
| 81 | # For --remove-internal-dep ... |
|
|
| 82 | if [[ -n $3 ]] ; then |
|
|
| 83 | # For replace @REM_INT_DEP@ with what was passed |
|
|
| 84 | # to --remove-internal-dep |
|
|
| 85 | sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \ |
|
|
| 86 | ${T}/$$.rem_int_deps.patch |
|
|
| 87 | |
|
|
| 88 | x="${T}/$$.rem_int_deps.patch" |
|
|
| 89 | fi |
|
|
| 90 | |
|
|
| 91 | if ELT_try_and_apply_patch "$1" "${x}" ; then |
102 | if ELT_try_and_apply_patch "${file}" "${patch}" ; then |
|
|
103 | # Break to unwind w/popd rather than return directly |
| 92 | ret=0 |
104 | ret=0 |
| 93 | break |
105 | break |
| 94 | fi |
|
|
| 95 | fi |
106 | fi |
| 96 | done |
107 | done |
| 97 | fi |
|
|
| 98 | |
108 | |
|
|
109 | popd "${patch_dir}" >/dev/null |
| 99 | return ${ret} |
110 | return ${ret} |
| 100 | } |
111 | } |
| 101 | |
112 | |
| 102 | elibtoolize() { |
113 | elibtoolize() { |
| 103 | local x= |
114 | local x= |
| 104 | local y= |
115 | local y= |
| 105 | local do_portage="no" |
116 | local do_portage="no" |
| 106 | local do_reversedeps="no" |
117 | local do_reversedeps="no" |
| 107 | local do_only_patches="no" |
118 | local do_only_patches="no" |
|
|
119 | local do_uclibc="yes" |
| 108 | local deptoremove= |
120 | local deptoremove= |
| 109 | local my_dirlist= |
121 | local my_dirlist= |
| 110 | local elt_patches="portage relink max_cmd_len sed test tmp" |
122 | local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed" |
| 111 | local start_dir="${PWD}" |
123 | local start_dir=${PWD} |
| 112 | |
124 | |
| 113 | my_dirlist="$(ELT_find_ltmain_sh)" |
125 | my_dirlist=$(ELT_find_ltmain_sh) |
| 114 | |
126 | |
| 115 | for x in "$@" ; do |
127 | for x in "$@" ; do |
| 116 | case "${x}" in |
128 | case "${x}" in |
| 117 | "--portage") |
129 | "--portage") |
| 118 | # Only apply portage patch, and don't |
130 | # Only apply portage patch, and don't |
| … | |
… | |
| 130 | do_only_patches="yes" |
142 | do_only_patches="yes" |
| 131 | ;; |
143 | ;; |
| 132 | "^--remove-internal-dep="*) |
144 | "^--remove-internal-dep="*) |
| 133 | # We will replace @REM_INT_DEP@ with what is needed |
145 | # We will replace @REM_INT_DEP@ with what is needed |
| 134 | # in ELT_walk_patches() ... |
146 | # in ELT_walk_patches() ... |
| 135 | deptoremove="$(echo "${x}" | sed -e 's|--remove-internal-dep=||')" |
147 | deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||') |
| 136 | |
148 | |
| 137 | # Add the patch for this ... |
149 | # Add the patch for this ... |
| 138 | [ -n "${deptoremove}" ] && elt_patches="${elt_patches} rem-int-dep" |
150 | [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep" |
| 139 | ;; |
151 | ;; |
| 140 | "--shallow") |
152 | "--shallow") |
| 141 | # Only patch the ltmain.sh in ${S} |
153 | # Only patch the ltmain.sh in ${S} |
| 142 | if [ -f "${S}/ltmain.sh" ] |
154 | if [[ -f ${S}/ltmain.sh ]] ; then |
| 143 | then |
|
|
| 144 | my_dirlist="${S}" |
155 | my_dirlist=${S} |
| 145 | else |
156 | else |
| 146 | my_dirlist= |
157 | my_dirlist= |
| 147 | fi |
158 | fi |
| 148 | ;; |
159 | ;; |
| 149 | "--no-uclibc") |
160 | "--no-uclibc") |
| 150 | NO_UCLIBCTOOLIZE=1 |
161 | do_uclibc="no" |
| 151 | ;; |
162 | ;; |
| 152 | *) |
163 | *) |
| 153 | eerror "Invalid elibtoolize option: $x" |
164 | eerror "Invalid elibtoolize option: ${x}" |
| 154 | die "elibtoolize called with $x ??" |
165 | die "elibtoolize called with ${x} ??" |
| 155 | esac |
166 | esac |
| 156 | done |
167 | done |
| 157 | |
168 | |
| 158 | if use ppc-macos ; then |
169 | [[ ${do_uclibc} == "yes" ]] && \ |
| 159 | glibtoolize --copy --force |
170 | elt_patches="${elt_patches} uclibc-conf uclibc-ltconf" |
| 160 | darwintoolize |
171 | |
| 161 | fi |
172 | case "${CHOST}" in |
|
|
173 | *-aix*) |
|
|
174 | elt_patches="${elt_patches} hardcode aixrtl" |
|
|
175 | ;; |
|
|
176 | *-darwin*) |
|
|
177 | elt_patches="${elt_patches} darwin-ltconf darwin-ltmain darwin-conf" |
|
|
178 | ;; |
|
|
179 | *-freebsd*) |
|
|
180 | elt_patches="${elt_patches} fbsd-conf fbsd-ltconf" |
|
|
181 | ;; |
|
|
182 | *-hpux*) |
|
|
183 | elt_patches="${elt_patches} hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc" |
|
|
184 | ;; |
|
|
185 | *-irix*) |
|
|
186 | elt_patches="${elt_patches} irix-ltmain" |
|
|
187 | ;; |
|
|
188 | *-mint*) |
|
|
189 | elt_patches="${elt_patches} mint-conf" |
|
|
190 | ;; |
|
|
191 | esac |
| 162 | |
192 | |
| 163 | for x in ${my_dirlist} ; do |
193 | for x in ${my_dirlist} ; do |
| 164 | local tmp=$(echo "${x}" | sed -e "s|${S}||") |
194 | local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||") |
| 165 | export ELT_APPLIED_PATCHES= |
195 | export ELT_APPLIED_PATCHES= |
|
|
196 | export ELT_LTMAIN_SH="${x}/ltmain.sh" |
|
|
197 | |
|
|
198 | [[ -f ${x}/.elibtoolized ]] && continue |
| 166 | |
199 | |
| 167 | cd ${x} |
200 | cd ${x} |
| 168 | einfo "Patching \${S}$(echo "/${tmp}/ltmain.sh" | sed -e 's|//|/|g') ..." |
201 | einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')" |
| 169 | |
202 | |
| 170 | for y in ${elt_patches} ; do |
203 | for y in ${elt_patches} ; do |
| 171 | local ret=0 |
204 | local ret=0 |
| 172 | |
205 | |
| 173 | case "${y}" in |
206 | case "${y}" in |
|
|
207 | "portage") |
|
|
208 | # Stupid test to see if its already applied ... |
|
|
209 | if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then |
|
|
210 | ELT_walk_patches "${x}/ltmain.sh" "${y}" |
|
|
211 | ret=$? |
|
|
212 | fi |
|
|
213 | ;; |
| 174 | "rem-int-dep") |
214 | "rem-int-dep") |
| 175 | ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" |
215 | ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" |
| 176 | ret=$? |
216 | ret=$? |
| 177 | ;; |
217 | ;; |
| 178 | "fix-relink") |
218 | "fix-relink") |
| … | |
… | |
| 187 | if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then |
227 | if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then |
| 188 | ELT_walk_patches "${x}/ltmain.sh" "${y}" |
228 | ELT_walk_patches "${x}/ltmain.sh" "${y}" |
| 189 | ret=$? |
229 | ret=$? |
| 190 | fi |
230 | fi |
| 191 | ;; |
231 | ;; |
|
|
232 | "as-needed") |
|
|
233 | ELT_walk_patches "${x}/ltmain.sh" "${y}" |
|
|
234 | ret=$? |
|
|
235 | ;; |
|
|
236 | "uclibc-conf") |
|
|
237 | if [[ -e ${x}/configure && \ |
|
|
238 | -n $(grep 'Transform linux' "${x}/configure") ]] ; then |
|
|
239 | ELT_walk_patches "${x}/configure" "${y}" |
|
|
240 | ret=$? |
|
|
241 | # ltmain.sh and co might be in a subdirectory ... |
|
|
242 | elif [[ ! -e ${x}/configure && -e ${x}/../configure && \ |
|
|
243 | -n $(grep 'Transform linux' "${x}/../configure") ]] ; then |
|
|
244 | ELT_walk_patches "${x}/../configure" "${y}" |
|
|
245 | ret=$? |
|
|
246 | fi |
|
|
247 | ;; |
|
|
248 | "uclibc-ltconf") |
|
|
249 | # Newer libtoolize clears ltconfig, as not used anymore |
|
|
250 | if [[ -s ${x}/ltconfig ]] ; then |
|
|
251 | ELT_walk_patches "${x}/ltconfig" "${y}" |
|
|
252 | ret=$? |
|
|
253 | fi |
|
|
254 | ;; |
|
|
255 | "fbsd-conf") |
|
|
256 | if [[ -e ${x}/configure && \ |
|
|
257 | -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then |
|
|
258 | ELT_walk_patches "${x}/configure" "${y}" |
|
|
259 | ret=$? |
|
|
260 | # ltmain.sh and co might be in a subdirectory ... |
|
|
261 | elif [[ ! -e ${x}/configure && -e ${x}/../configure && \ |
|
|
262 | -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then |
|
|
263 | ELT_walk_patches "${x}/../configure" "${y}" |
|
|
264 | ret=$? |
|
|
265 | fi |
|
|
266 | ;; |
|
|
267 | "fbsd-ltconf") |
|
|
268 | if [[ -s ${x}/ltconfig ]] ; then |
|
|
269 | ELT_walk_patches "${x}/ltconfig" "${y}" |
|
|
270 | ret=$? |
|
|
271 | fi |
|
|
272 | ;; |
|
|
273 | "darwin-conf") |
|
|
274 | if [[ -e ${x}/configure && \ |
|
|
275 | -n $(grep '&& echo \.so ||' "${x}/configure") ]] ; then |
|
|
276 | ELT_walk_patches "${x}/configure" "${y}" |
|
|
277 | ret=$? |
|
|
278 | # ltmain.sh and co might be in a subdirectory ... |
|
|
279 | elif [[ ! -e ${x}/configure && -e ${x}/../configure && \ |
|
|
280 | -n $(grep '&& echo \.so ||' "${x}/../configure") ]] ; then |
|
|
281 | ELT_walk_patches "${x}/../configure" "${y}" |
|
|
282 | ret=$? |
|
|
283 | fi |
|
|
284 | ;; |
|
|
285 | "darwin-ltconf") |
|
|
286 | # Newer libtoolize clears ltconfig, as not used anymore |
|
|
287 | if [[ -s ${x}/ltconfig ]] ; then |
|
|
288 | ELT_walk_patches "${x}/ltconfig" "${y}" |
|
|
289 | ret=$? |
|
|
290 | fi |
|
|
291 | ;; |
|
|
292 | "darwin-ltmain") |
|
|
293 | # special case to avoid false positives (failing to apply |
|
|
294 | # ltmain.sh path message), newer libtools have this patch |
|
|
295 | # built in, so not much to patch around then |
|
|
296 | if [[ -e ${x}/ltmain.sh && \ |
|
|
297 | -z $(grep 'verstring="-compatibility_version' "${x}/ltmain.sh") ]] ; then |
|
|
298 | ELT_walk_patches "${x}/ltmain.sh" "${y}" |
|
|
299 | ret=$? |
|
|
300 | fi |
|
|
301 | ;; |
|
|
302 | "aixrtl" | "hpux-conf") |
|
|
303 | ret=1 |
|
|
304 | local subret=0 |
|
|
305 | # apply multiple patches as often as they match |
|
|
306 | while [[ $subret -eq 0 ]]; do |
|
|
307 | subret=1 |
|
|
308 | if [[ -e ${x}/configure ]]; then |
|
|
309 | ELT_walk_patches "${x}/configure" "${y}" |
|
|
310 | subret=$? |
|
|
311 | # ltmain.sh and co might be in a subdirectory ... |
|
|
312 | elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] ; then |
|
|
313 | ELT_walk_patches "${x}/../configure" "${y}" |
|
|
314 | subret=$? |
|
|
315 | fi |
|
|
316 | if [[ $subret -eq 0 ]]; then |
|
|
317 | # have at least one patch succeeded. |
|
|
318 | ret=0 |
|
|
319 | fi |
|
|
320 | done |
|
|
321 | ;; |
|
|
322 | "mint-conf") |
|
|
323 | ret=1 |
|
|
324 | local subret=1 |
|
|
325 | if [[ -e ${x}/configure ]]; then |
|
|
326 | ELT_walk_patches "${x}/configure" "${y}" |
|
|
327 | subret=$? |
|
|
328 | # ltmain.sh and co might be in a subdirectory ... |
|
|
329 | elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] ; then |
|
|
330 | ELT_walk_patches "${x}/../configure" "${y}" |
|
|
331 | subret=$? |
|
|
332 | fi |
|
|
333 | if [[ $subret -eq 0 ]]; then |
|
|
334 | # have at least one patch succeeded. |
|
|
335 | ret=0 |
|
|
336 | fi |
|
|
337 | ;; |
|
|
338 | "install-sh") |
|
|
339 | ELT_walk_patches "${x}/install-sh" "${y}" |
|
|
340 | ret=$? |
|
|
341 | ;; |
|
|
342 | "cross") |
|
|
343 | if tc-is-cross-compiler ; then |
|
|
344 | ELT_walk_patches "${x}/ltmain.sh" "${y}" |
|
|
345 | ret=$? |
|
|
346 | fi |
|
|
347 | ;; |
| 192 | *) |
348 | *) |
| 193 | ELT_walk_patches "${x}/ltmain.sh" "${y}" |
349 | ELT_walk_patches "${x}/ltmain.sh" "${y}" |
| 194 | ret=$? |
350 | ret=$? |
| 195 | ;; |
351 | ;; |
| 196 | esac |
352 | esac |
| 197 | |
353 | |
| 198 | if [[ ${ret} -ne 0 ]] ; then |
354 | if [[ ${ret} -ne 0 ]] ; then |
| 199 | case ${y} in |
355 | case ${y} in |
| 200 | "relink") |
356 | "relink") |
|
|
357 | local version=$(ELT_libtool_version "${x}/ltmain.sh") |
| 201 | # Critical patch, but could be applied ... |
358 | # Critical patch, but could be applied ... |
|
|
359 | # FIXME: Still need a patch for ltmain.sh > 1.4.0 |
| 202 | if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then |
360 | if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \ |
|
|
361 | $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then |
| 203 | ewarn " Could not apply relink.patch!" |
362 | ewarn " Could not apply relink.patch!" |
| 204 | fi |
363 | fi |
| 205 | ;; |
364 | ;; |
| 206 | "portage") |
365 | "portage") |
| 207 | # Critical patch - for this one we abort, as it can really |
366 | # Critical patch - for this one we abort, as it can really |
| … | |
… | |
| 209 | if [[ ${do_portage} == "yes" ]] ; then |
368 | if [[ ${do_portage} == "yes" ]] ; then |
| 210 | # Stupid test to see if its already applied ... |
369 | # Stupid test to see if its already applied ... |
| 211 | if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then |
370 | if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then |
| 212 | echo |
371 | echo |
| 213 | eerror "Portage patch requested, but failed to apply!" |
372 | eerror "Portage patch requested, but failed to apply!" |
|
|
373 | eerror "Please bug azarah or vapier to add proper patch." |
| 214 | die "Portage patch requested, but failed to apply!" |
374 | die "Portage patch requested, but failed to apply!" |
| 215 | fi |
375 | fi |
| 216 | else |
376 | else |
| 217 | ewarn " Could not apply portage.patch!" |
377 | if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then |
|
|
378 | # ewarn " Portage patch seems to be already applied." |
| 218 | ewarn " Please verify that it is not needed." |
379 | # ewarn " Please verify that it is not needed." |
|
|
380 | : |
|
|
381 | else |
|
|
382 | local version=$( \ |
|
|
383 | eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \ |
|
|
384 | echo "${VERSION}") |
|
|
385 | |
|
|
386 | echo |
|
|
387 | eerror "Portage patch failed to apply (ltmain.sh version ${version})!" |
|
|
388 | eerror "Please bug azarah or vapier to add proper patch." |
|
|
389 | die "Portage patch failed to apply!" |
|
|
390 | fi |
|
|
391 | # We do not want to run libtoolize ... |
|
|
392 | ELT_APPLIED_PATCHES="portage" |
| 219 | fi |
393 | fi |
|
|
394 | ;; |
|
|
395 | "uclibc-"*) |
|
|
396 | [[ ${CHOST} == *"-uclibc" ]] && \ |
|
|
397 | ewarn " uClibc patch set '${y}' failed to apply!" |
|
|
398 | ;; |
|
|
399 | "fbsd-"*) |
|
|
400 | if [[ ${CHOST} == *"-freebsd"* ]] ; then |
|
|
401 | if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \ |
|
|
402 | "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then |
|
|
403 | eerror " FreeBSD patch set '${y}' failed to apply!" |
|
|
404 | die "FreeBSD patch set '${y}' failed to apply!" |
|
|
405 | fi |
|
|
406 | fi |
|
|
407 | ;; |
|
|
408 | "darwin-"*) |
|
|
409 | [[ ${CHOST} == *"-darwin"* ]] && \ |
|
|
410 | ewarn " Darwin patch set '${y}' failed to apply!" |
| 220 | ;; |
411 | ;; |
| 221 | esac |
412 | esac |
| 222 | fi |
413 | fi |
|
|
414 | done |
| 223 | |
415 | |
| 224 | if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then |
416 | if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then |
| 225 | if [[ ${do_portage} == "no" && \ |
417 | if [[ ${do_portage} == "no" && \ |
| 226 | ${do_reversedeps} == "no" && \ |
418 | ${do_reversedeps} == "no" && \ |
| 227 | ${do_only_patches} == "no" && \ |
419 | ${do_only_patches} == "no" && \ |
| 228 | ${deptoremove} == "" ]] |
420 | ${deptoremove} == "" ]] |
| 229 | then |
421 | then |
| 230 | # Sometimes ltmain.sh is in a subdirectory ... |
422 | ewarn "Cannot apply any patches, please file a bug about this" |
| 231 | if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then |
|
|
| 232 | if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then |
|
|
| 233 | cd "${x}"/../ |
|
|
| 234 | fi |
|
|
| 235 | fi |
|
|
| 236 | |
|
|
| 237 | if type -p libtoolize &> /dev/null ; then |
|
|
| 238 | ewarn "Cannot apply any patch, running libtoolize..." |
|
|
| 239 | libtoolize --copy --force |
|
|
| 240 | fi |
|
|
| 241 | cd "${x}" |
|
|
| 242 | break |
|
|
| 243 | fi |
423 | die |
| 244 | fi |
424 | fi |
| 245 | done |
425 | fi |
|
|
426 | |
|
|
427 | [[ -f ${x}/libtool ]] && rm -f "${x}/libtool" |
|
|
428 | |
|
|
429 | >> "${x}/.elibtoolized" |
| 246 | done |
430 | done |
| 247 | |
431 | |
| 248 | if [[ -f libtool ]] ; then |
432 | cd "${start_dir}" |
| 249 | rm -f libtool |
433 | } |
|
|
434 | |
|
|
435 | uclibctoolize() { |
|
|
436 | ewarn "uclibctoolize() is deprecated, please just use elibtoolize()!" |
|
|
437 | elibtoolize |
|
|
438 | } |
|
|
439 | |
|
|
440 | darwintoolize() { |
|
|
441 | ewarn "darwintoolize() is deprecated, please just use elibtoolize()!" |
|
|
442 | elibtoolize |
|
|
443 | } |
|
|
444 | |
|
|
445 | # char *VER_major(string) |
|
|
446 | # |
|
|
447 | # Return the Major (X of X.Y.Z) version |
|
|
448 | # |
|
|
449 | VER_major() { |
|
|
450 | [[ -z $1 ]] && return 1 |
|
|
451 | |
|
|
452 | local VER=$@ |
|
|
453 | echo "${VER%%[^[:digit:]]*}" |
|
|
454 | } |
|
|
455 | |
|
|
456 | # char *VER_minor(string) |
|
|
457 | # |
|
|
458 | # Return the Minor (Y of X.Y.Z) version |
|
|
459 | # |
|
|
460 | VER_minor() { |
|
|
461 | [[ -z $1 ]] && return 1 |
|
|
462 | |
|
|
463 | local VER=$@ |
|
|
464 | VER=${VER#*.} |
|
|
465 | echo "${VER%%[^[:digit:]]*}" |
|
|
466 | } |
|
|
467 | |
|
|
468 | # char *VER_micro(string) |
|
|
469 | # |
|
|
470 | # Return the Micro (Z of X.Y.Z) version. |
|
|
471 | # |
|
|
472 | VER_micro() { |
|
|
473 | [[ -z $1 ]] && return 1 |
|
|
474 | |
|
|
475 | local VER=$@ |
|
|
476 | VER=${VER#*.*.} |
|
|
477 | echo "${VER%%[^[:digit:]]*}" |
|
|
478 | } |
|
|
479 | |
|
|
480 | # int VER_to_int(string) |
|
|
481 | # |
|
|
482 | # Convert a string type version (2.4.0) to an int (132096) |
|
|
483 | # for easy compairing or versions ... |
|
|
484 | # |
|
|
485 | VER_to_int() { |
|
|
486 | [[ -z $1 ]] && return 1 |
|
|
487 | |
|
|
488 | local VER_MAJOR=$(VER_major "$1") |
|
|
489 | local VER_MINOR=$(VER_minor "$1") |
|
|
490 | local VER_MICRO=$(VER_micro "$1") |
|
|
491 | local VER_int=$(( VER_MAJOR * 65536 + VER_MINOR * 256 + VER_MICRO )) |
|
|
492 | |
|
|
493 | # We make version 1.0.0 the minimum version we will handle as |
|
|
494 | # a sanity check ... if its less, we fail ... |
|
|
495 | if [[ ${VER_int} -ge 65536 ]] ; then |
|
|
496 | echo "${VER_int}" |
|
|
497 | return 0 |
| 250 | fi |
498 | fi |
| 251 | |
499 | |
| 252 | cd "${start_dir}" |
500 | echo 1 |
| 253 | |
501 | return 1 |
| 254 | uclibctoolize |
|
|
| 255 | } |
502 | } |
| 256 | |
|
|
| 257 | uclibctoolize() { |
|
|
| 258 | [[ -n ${NO_UCLIBCTOOLIZE} ]] && return 0 |
|
|
| 259 | |
|
|
| 260 | local errmsg="" |
|
|
| 261 | [[ ${CTARGET:-${CHOST}} == *-uclibc ]] \ |
|
|
| 262 | && errmsg="PLEASE CHECK" \ |
|
|
| 263 | || errmsg="Already patched" |
|
|
| 264 | local targets="" |
|
|
| 265 | local x |
|
|
| 266 | |
|
|
| 267 | if [[ -z $* ]] ; then |
|
|
| 268 | targets=$(find ${S} -name configure -o -name ltconfig) |
|
|
| 269 | fi |
|
|
| 270 | |
|
|
| 271 | einfo "Applying uClibc/libtool patches ..." |
|
|
| 272 | for x in ${targets} ; do |
|
|
| 273 | [[ ! -s ${x} ]] && continue |
|
|
| 274 | case ${x##*/} in |
|
|
| 275 | configure) |
|
|
| 276 | if grep 'Transform linux' "${x}" > /dev/null ; then |
|
|
| 277 | ebegin " Fixing \${S}${x/${S}}" |
|
|
| 278 | patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/configure.patch" > /dev/null |
|
|
| 279 | eend $? "${errmsg} ${x}" |
|
|
| 280 | fi |
|
|
| 281 | ;; |
|
|
| 282 | |
|
|
| 283 | ltconfig) |
|
|
| 284 | local ver=$(grep '^VERSION=' ${x}) |
|
|
| 285 | ver=${ver/VERSION=} |
|
|
| 286 | [[ ${ver:0:3} == "1.4" ]] && ver="1.3" # 1.4 and 1.3 are compat |
|
|
| 287 | ebegin " Fixing \${S}${x/${S}}" |
|
|
| 288 | patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/ltconfig-${ver:0:3}.patch" > /dev/null |
|
|
| 289 | eend $? "${errmsg} ${x}" |
|
|
| 290 | ;; |
|
|
| 291 | esac |
|
|
| 292 | done |
|
|
| 293 | } |
|
|
| 294 | |
|
|
| 295 | darwintoolize() { |
|
|
| 296 | local targets="" |
|
|
| 297 | local x |
|
|
| 298 | |
|
|
| 299 | if [[ -z $* ]] ; then |
|
|
| 300 | targets=$(find ${S} -name ltmain.sh -o -name ltconfig) |
|
|
| 301 | fi |
|
|
| 302 | |
|
|
| 303 | einfo "Applying Darwin/libtool patches ..." |
|
|
| 304 | for x in ${targets} ; do |
|
|
| 305 | [[ ! -s ${x} ]] && continue |
|
|
| 306 | case ${x##*/} in |
|
|
| 307 | ltmain.sh|ltconfig) |
|
|
| 308 | local ver=$(grep '^VERSION=' ${x}) |
|
|
| 309 | ver=${ver/VERSION=} |
|
|
| 310 | if [[ ${ver:0:3} == "1.4" || ${ver:0:3} == "1.5" ]] ; then |
|
|
| 311 | ver="1.3" # 1.4, 1.5 and 1.3 are compat |
|
|
| 312 | fi |
|
|
| 313 | |
|
|
| 314 | ebegin " Fixing \${S}${x/${S}}" |
|
|
| 315 | patch -p0 "${x}" "${ELT_PATCH_DIR}/darwin/${x##*/}-${ver:0:3}.patch" > /dev/null |
|
|
| 316 | eend $? "PLEASE CHECK ${x}" |
|
|
| 317 | ;; |
|
|
| 318 | esac |
|
|
| 319 | done |
|
|
| 320 | } |
|
|