[gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Samuli Suominen]

ChangeLog?

On 05/20/2012 01:26 PM, Mike Frysinger (vapier) wrote:
> vapier      12/05/20 10:26:05
>
>    Modified:             autotools.eclass
>    Log:
>    automatically create AC_CONFIG_MACRO_DIR dir too
>
> Revision  Changes    Path
> 1.131                eclass/autotools.eclass
>
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.131&view=markup
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.131&content-type=text/plain
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.130&r2=1.131
>
> Index: autotools.eclass
> ===================================================================
> RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
> retrieving revision 1.130
> retrieving revision 1.131
> diff -u -r1.130 -r1.131
> --- autotools.eclass	22 Mar 2012 19:16:22 -0000	1.130
> +++ autotools.eclass	20 May 2012 10:26:05 -0000	1.131
> @@ -1,6 +1,6 @@
>   # Copyright 1999-2012 Gentoo Foundation
>   # Distributed under the terms of the GNU General Public License v2
> -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.130 2012/03/22 19:16:22 vapier Exp $
> +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.131 2012/05/20 10:26:05 vapier Exp $
>
>   # @ECLASS: autotools.eclass
>   # @MAINTAINER:
> @@ -143,7 +143,7 @@
>   # Should do a full autoreconf - normally what most people will be interested in.
>   # Also should handle additional directories specified by AC_CONFIG_SUBDIRS.
>   eautoreconf() {
> -	local x auxdir g
> +	local x g
>
>   	if [[ -z ${AT_NO_RECURSIVE} ]]; then
>   		# Take care of subdirs
> @@ -156,10 +156,11 @@
>   		done
>   	fi
>
> -	auxdir=$(autotools_get_auxdir)
> +	local auxdir=$(autotools_get_auxdir)
> +	local macdir=$(autotools_get_macrodir)
>
>   	einfo "Running eautoreconf in '${PWD}' ..."
> -	[[ -n ${auxdir} ]]&&  mkdir -p ${auxdir}
> +	[[ -n ${auxdir}${macdir} ]]&&  mkdir -p ${auxdir} ${macdir}
>   	eaclocal
>   	[[ ${CHOST} == *-darwin* ]]&&  g=g
>   	if ${LIBTOOLIZE:-${g}libtoolize} -n --install>&  /dev/null ; then
> @@ -428,6 +429,7 @@
>   # Internal function to get additional subdirs to configure
>   autotools_get_subdirs() { autotools_check_macro_val AC_CONFIG_SUBDIRS ; }
>   autotools_get_auxdir() { autotools_check_macro_val AC_CONFIG_AUX_DIR ; }
> +autotools_get_macrodir() { autotools_check_macro_val AC_CONFIG_MACRO_DIR ; }
>
>   _autotools_m4dir_include() {
>   	local x include_opts
>
>
>
>

[gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Samuli Suominen]

ChangeLog again.

On 05/20/2012 01:39 PM, Mike Frysinger (vapier) wrote:
> vapier      12/05/20 10:39:45
>
>    Modified:             autotools.eclass
>    Log:
>    always depend on automake even when WANT_AUTOMAKE=none #401605
>
> Revision  Changes    Path
> 1.133                eclass/autotools.eclass
>
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.133&view=markup
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.133&content-type=text/plain
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.132&r2=1.133
>
> Index: autotools.eclass
> ===================================================================
> RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
> retrieving revision 1.132
> retrieving revision 1.133
> diff -u -r1.132 -r1.133
> --- autotools.eclass	20 May 2012 10:32:05 -0000	1.132
> +++ autotools.eclass	20 May 2012 10:39:45 -0000	1.133
> @@ -1,6 +1,6 @@
>   # Copyright 1999-2012 Gentoo Foundation
>   # Distributed under the terms of the GNU General Public License v2
> -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.132 2012/05/20 10:32:05 vapier Exp $
> +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.133 2012/05/20 10:39:45 vapier Exp $
>
>   # @ECLASS: autotools.eclass
>   # @MAINTAINER:
> @@ -49,9 +49,10 @@
>   _autoconf_atom="sys-devel/autoconf"
>   if [[ -n ${WANT_AUTOMAKE} ]]; then
>   	case ${WANT_AUTOMAKE} in
> -		none)   _automake_atom="" ;; # some packages don't require automake at all
> -		# if you change the "latest" version here, change also autotools_run_tool
> -		# this MUST reflect the latest stable major version for each arch!
> +		# Even if the package doesn't use automake, we still need to depend
> +		# on it because we run aclocal to process m4 macros.  This matches
> +		# the autoreconf tool, so this requirement is correct.  #401605
> +		none) ;;
>   		latest)
>   			# Use SLOT deps if we can.  For EAPI=0, we get pretty close.
>   			if [[ ${EAPI:-0} != 0 ]] ; then
>
>
>
>