1 |
I guess we can remove the ChangeLog from eclass/ directory since only |
2 |
small portition of people seem to use it. |
3 |
|
4 |
(Note that this is not targetted specifically to the author of this |
5 |
particular commit, more of an general observation) |
6 |
|
7 |
|
8 |
On 12/14/2011 09:15 PM, Mike Frysinger (vapier) wrote: |
9 |
> vapier 11/12/14 19:15:14 |
10 |
> |
11 |
> Modified: autotools.eclass |
12 |
> Log: |
13 |
> push down AT_M4DIR handling into autotools_run_tool to keep the callers simpler, and change the ordering with AT_SYS_M4DIR so that it comes after the ebuild/package settings rather than in the middle |
14 |
> |
15 |
> Revision Changes Path |
16 |
> 1.115 eclass/autotools.eclass |
17 |
> |
18 |
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.115&view=markup |
19 |
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.115&content-type=text/plain |
20 |
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.114&r2=1.115 |
21 |
> |
22 |
> Index: autotools.eclass |
23 |
> =================================================================== |
24 |
> RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v |
25 |
> retrieving revision 1.114 |
26 |
> retrieving revision 1.115 |
27 |
> diff -u -r1.114 -r1.115 |
28 |
> --- autotools.eclass 14 Dec 2011 18:33:59 -0000 1.114 |
29 |
> +++ autotools.eclass 14 Dec 2011 19:15:13 -0000 1.115 |
30 |
> @@ -1,6 +1,6 @@ |
31 |
> # Copyright 1999-2011 Gentoo Foundation |
32 |
> # Distributed under the terms of the GNU General Public License v2 |
33 |
> -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.114 2011/12/14 18:33:59 vapier Exp $ |
34 |
> +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.115 2011/12/14 19:15:13 vapier Exp $ |
35 |
> |
36 |
> # @ECLASS: autotools.eclass |
37 |
> # @MAINTAINER: |
38 |
> @@ -201,7 +201,7 @@ |
39 |
> # Respects AT_M4DIR for additional directories to search for macro's. |
40 |
> eaclocal() { |
41 |
> [[ ! -f aclocal.m4 || -n $(grep -e 'generated.*by aclocal' aclocal.m4) ]]&& \ |
42 |
> - autotools_run_tool aclocal $(autotools_m4dir_include) "$@" $(eaclocal_amflags) |
43 |
> + autotools_run_tool --at-m4flags aclocal "$@" $(eaclocal_amflags) |
44 |
> } |
45 |
> |
46 |
> # @FUNCTION: _elibtoolize |
47 |
> @@ -230,7 +230,7 @@ |
48 |
> eautoheader() { |
49 |
> # Check if we should run autoheader |
50 |
> [[ -n $(autotools_check_macro "AC_CONFIG_HEADERS") ]] || return 0 |
51 |
> - NO_FAIL=1 autotools_run_tool autoheader $(autotools_m4dir_include) "$@" |
52 |
> + autotools_run_tool --at-no-fail --at-m4flags autoheader "$@" |
53 |
> } |
54 |
> |
55 |
> # @FUNCTION: eautoconf |
56 |
> @@ -244,7 +244,7 @@ |
57 |
> die "No configure.{ac,in} present!" |
58 |
> fi |
59 |
> |
60 |
> - autotools_run_tool autoconf $(autotools_m4dir_include) "$@" |
61 |
> + autotools_run_tool --at-m4flags autoconf "$@" |
62 |
> } |
63 |
> |
64 |
> # @FUNCTION: eautomake |
65 |
> @@ -320,6 +320,18 @@ |
66 |
> ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase" |
67 |
> fi |
68 |
> |
69 |
> + # Process our own internal flags first |
70 |
> + local autofail=true m4flags=false |
71 |
> + while [[ -n $1 ]] ; do |
72 |
> + case $1 in |
73 |
> + --at-no-fail) autofail=false;; |
74 |
> + --at-m4flags) m4flags=true;; |
75 |
> + # whatever is left goes to the actual tool |
76 |
> + *) break;; |
77 |
> + esac |
78 |
> + shift |
79 |
> + done |
80 |
> + |
81 |
> autotools_env_setup |
82 |
> |
83 |
> local STDERR_TARGET="${T}/$1.out" |
84 |
> @@ -334,13 +346,15 @@ |
85 |
> done |
86 |
> fi |
87 |
> |
88 |
> + if ${m4flags} ; then |
89 |
> + set -- $(autotools_m4dir_include) "$@" $(autotools_m4sysdir_include) |
90 |
> + fi |
91 |
> + |
92 |
> printf "***** $1 *****\n***** PWD: ${PWD}\n***** $*\n\n"> "${STDERR_TARGET}" |
93 |
> |
94 |
> ebegin "Running $@" |
95 |
> "$@">> "${STDERR_TARGET}" 2>&1 |
96 |
> - eend $? |
97 |
> - |
98 |
> - if [[ $? != 0&& ${NO_FAIL} != 1 ]] ; then |
99 |
> + if ! eend $?&& ${autofail} ; then |
100 |
> echo |
101 |
> eerror "Failed Running $1 !" |
102 |
> eerror |
103 |
> @@ -380,14 +394,13 @@ |
104 |
> autotools_get_subdirs() { autotools_check_macro_val AC_CONFIG_SUBDIRS ; } |
105 |
> autotools_get_auxdir() { autotools_check_macro_val AC_CONFIG_AUX_DIR ; } |
106 |
> |
107 |
> -autotools_m4dir_include() { |
108 |
> +_autotools_m4dir_include() { |
109 |
> local x include_opts |
110 |
> |
111 |
> - for x in ${AT_M4DIR} $(eval echo ${AT_SYS_M4DIR}) ; do |
112 |
> - case "${x}" in |
113 |
> - "-I") |
114 |
> - # We handle it below |
115 |
> - ;; |
116 |
> + for x in "$@" ; do |
117 |
> + case ${x} in |
118 |
> + # We handle it below |
119 |
> + -I) ;; |
120 |
> *) |
121 |
> [[ ! -d ${x} ]]&& ewarn "autotools.eclass: '${x}' does not exist" |
122 |
> include_opts+=" -I ${x}" |
123 |
> @@ -397,5 +410,7 @@ |
124 |
> |
125 |
> echo ${include_opts} |
126 |
> } |
127 |
> +autotools_m4dir_include() { _autotools_m4dir_include ${AT_M4DIR} ; } |
128 |
> +autotools_m4sysdir_include() { _autotools_m4dir_include $(eval echo ${AT_SYS_M4DIR}) ; } |
129 |
> |
130 |
> fi |
131 |
> |
132 |
> |
133 |
> |
134 |
> |