Attachment #676372 for bug #757996

View | Details | Raw Unified | Return to bug 757996
Collapse All | Expand All




		eqawarn "when it finds this file.  See https://bugs.gentoo.org/426262 for details."
	fi

	# Install config.guess and config.sub which are required by many macros in Autoconf >=2.70.
	case ${EAPI:-0} in
		0|1|2|3|4|5|6)
			cp "${EPREFIX}/usr/share/gnuconfig/config.guess" . || die
			cp "${EPREFIX}/usr/share/gnuconfig/config.sub" . || die
			;;
		*)
			cp "${BROOT}/usr/share/gnuconfig/config.guess" . || die
			cp "${BROOT}/usr/share/gnuconfig/config.sub" . || die
			;;
	esac

	autotools_run_tool --at-m4flags autoconf "$@"
}

- 
sys-devel/gnuconfig.
--
sys-devel/autoconf/autoconf-2.70_beta4.ebuild | 14 ++++++++++++--
sys-devel/autoconf/autoconf-9999.ebuild       | 14 ++++++++++++--
2 files changed, 24 insertions(+), 4 deletions(-)




BDEPEND=">=sys-devel/m4-1.4.16
	>=dev-lang/perl-5.6"
RDEPEND="${BDEPEND}
	~sys-devel/autoconf-wrapper-14_pre3
	sys-devel/gnuconfig
	!~sys-devel/${P}:2.5"
[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
PDEPEND="emacs? ( app-emacs/autoconf-mode )"


	# We already have an up to date autoconf.info page at this point.
	touch -r doc/{old_,}autoconf.texi || die
}

src_install() {
	default

	local f
	for f in config.guess config.sub; do
		ln -fs ../../gnuconfig/${f} "${ED}"/usr/share/autoconf-*/build-aux/${f} || die
	done
}




BDEPEND=">=sys-devel/m4-1.4.16
	>=dev-lang/perl-5.6"
RDEPEND="${BDEPEND}
	~sys-devel/autoconf-wrapper-14_pre3
	sys-devel/gnuconfig
	!~sys-devel/${P}:2.5"
[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
PDEPEND="emacs? ( app-emacs/autoconf-mode )"



	toolchain-autoconf_src_prepare
}

src_install() {
	default

	local f
	for f in config.guess config.sub; do
		ln -fs ../../gnuconfig/${f} "${ED}"/usr/share/autoconf-*/build-aux/${f} || die
	done
}

Return to bug 757996

Lines 357-362 eautoconf() { Link Here

(-)a/eclass/autotools.eclass (-2 / +12 lines)
357	eqawarn "when it finds this file. See https://bugs.gentoo.org/426262 for details."	357	eqawarn "when it finds this file. See https://bugs.gentoo.org/426262 for details."
358	fi	358	fi
359		359
		360	# Install config.guess and config.sub which are required by many macros in Autoconf >=2.70.
		361	case ${EAPI:-0} in
		362	0\|1\|2\|3\|4\|5\|6)
		363	cp "${EPREFIX}/usr/share/gnuconfig/config.guess" . \|\| die
		364	cp "${EPREFIX}/usr/share/gnuconfig/config.sub" . \|\| die
		365	;;
		366	*)
		367	cp "${BROOT}/usr/share/gnuconfig/config.guess" . \|\| die
		368	cp "${BROOT}/usr/share/gnuconfig/config.sub" . \|\| die
		369	;;
		370	esac
		371
360	autotools_run_tool --at-m4flags autoconf "$@"	372	autotools_run_tool --at-m4flags autoconf "$@"
361	}	373	}
362		374
363	-
364	sys-devel/gnuconfig.	375	sys-devel/gnuconfig.
365	--
366	sys-devel/autoconf/autoconf-2.70_beta4.ebuild \| 14 ++++++++++++--	376	sys-devel/autoconf/autoconf-2.70_beta4.ebuild \| 14 ++++++++++++--
367	sys-devel/autoconf/autoconf-9999.ebuild \| 14 ++++++++++++--	377	sys-devel/autoconf/autoconf-9999.ebuild \| 14 ++++++++++++--
368	2 files changed, 24 insertions(+), 4 deletions(-)	378	2 files changed, 24 insertions(+), 4 deletions(-)

Lines 28-35 IUSE="emacs" Link Here

(-)a/sys-devel/autoconf/autoconf-2.70_beta4.ebuild (-2 / +12 lines)
28	BDEPEND=">=sys-devel/m4-1.4.16	28	BDEPEND=">=sys-devel/m4-1.4.16
29	>=dev-lang/perl-5.6"	29	>=dev-lang/perl-5.6"
30	RDEPEND="${BDEPEND}	30	RDEPEND="${BDEPEND}
31	!~sys-devel/${P}:2.5	31	~sys-devel/autoconf-wrapper-14_pre3
32	~sys-devel/autoconf-wrapper-14_pre3"	32	sys-devel/gnuconfig
		33	!~sys-devel/${P}:2.5"
33	[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"	34	[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
34	PDEPEND="emacs? ( app-emacs/autoconf-mode )"	35	PDEPEND="emacs? ( app-emacs/autoconf-mode )"
35		36
Lines 48-50 src_prepare() { Link Here
48	# We already have an up to date autoconf.info page at this point.	49	# We already have an up to date autoconf.info page at this point.
49	touch -r doc/{old_,}autoconf.texi \|\| die	50	touch -r doc/{old_,}autoconf.texi \|\| die
50	}	51	}
		52
		53	src_install() {
		54	default
		55
		56	local f
		57	for f in config.guess config.sub; do
		58	ln -fs ../../gnuconfig/${f} "${ED}"/usr/share/autoconf-*/build-aux/${f} \|\| die
		59	done
		60	}

Lines 24-31 IUSE="emacs" Link Here

(-)a/sys-devel/autoconf/autoconf-9999.ebuild (-3 / +12 lines)
24	BDEPEND=">=sys-devel/m4-1.4.16	24	BDEPEND=">=sys-devel/m4-1.4.16
25	>=dev-lang/perl-5.6"	25	>=dev-lang/perl-5.6"
26	RDEPEND="${BDEPEND}	26	RDEPEND="${BDEPEND}
27	!~sys-devel/${P}:2.5	27	~sys-devel/autoconf-wrapper-14_pre3
28	>=sys-devel/autoconf-wrapper-13"	28	sys-devel/gnuconfig
		29	!~sys-devel/${P}:2.5"
29	[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"	30	[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
30	PDEPEND="emacs? ( app-emacs/autoconf-mode )"	31	PDEPEND="emacs? ( app-emacs/autoconf-mode )"
31		32
Lines 41-43 src_prepare() { Link Here
41		42
42	toolchain-autoconf_src_prepare	43	toolchain-autoconf_src_prepare
43	}	44	}
44	-	45
		46	src_install() {
		47	default
		48
		49	local f
		50	for f in config.guess config.sub; do
		51	ln -fs ../../gnuconfig/${f} "${ED}"/usr/share/autoconf-*/build-aux/${f} \|\| die
		52	done
		53	}