diff options
| -rw-r--r-- | sys-devel/autoconf-wrapper/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-devel/autoconf-wrapper/autoconf-wrapper-9.ebuild | 27 | ||||
| -rwxr-xr-x | sys-devel/autoconf-wrapper/files/ac-wrapper-9.sh | 159 |
3 files changed, 193 insertions, 1 deletions
diff --git a/sys-devel/autoconf-wrapper/ChangeLog b/sys-devel/autoconf-wrapper/ChangeLog index 8f580a9b99f4..2cbc032f2257 100644 --- a/sys-devel/autoconf-wrapper/ChangeLog +++ b/sys-devel/autoconf-wrapper/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-devel/autoconf-wrapper # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.73 2010/06/04 05:33:07 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.74 2010/07/03 17:58:12 vapier Exp $ + +*autoconf-wrapper-9 (03 Jul 2010) + + 03 Jul 2010; Mike Frysinger <vapier@gentoo.org> + +autoconf-wrapper-9.ebuild, +files/ac-wrapper-9.sh: + Support autoconf-2.66. 04 Jun 2010; Jeroen Roovers <jer@gentoo.org> autoconf-wrapper-8.ebuild: Stable for HPPA (bug #311967). diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-9.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-9.ebuild new file mode 100644 index 000000000000..2cff9747994a --- /dev/null +++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-9.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/autoconf-wrapper-9.ebuild,v 1.1 2010/07/03 17:58:12 vapier Exp $ + +inherit multilib + +DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +S=${WORKDIR} + +src_install() { + exeinto /usr/$(get_libdir)/misc + newexe "${FILESDIR}"/ac-wrapper-${PV}.sh ac-wrapper.sh || die + + dodir /usr/bin + local x= + for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do + dosym ../$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x} || die + done +} diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-9.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-9.sh new file mode 100755 index 000000000000..8d876534e484 --- /dev/null +++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-9.sh @@ -0,0 +1,159 @@ +#!/bin/sh +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-9.sh,v 1.1 2010/07/03 17:58:12 vapier Exp $ + +# Based on the ac-wrapper.pl script provided by MandrakeSoft +# Rewritten in bash by Gregorio Guidi +# +# Executes the correct autoconf version. +# +# - defaults to newest version available (hopefully autoconf-2.60) +# - runs autoconf 2.13 if: +# - envvar WANT_AUTOCONF is set to `2.1' +# -or- +# - `ac{local,include}.m4' or `configure.{in,ac}' have AC_PREREQ(2.1) (not higher) +# -or- +# - `configure' is already present and was generated by autoconf 2.13 + +warn() { printf "ac-wrapper: $*\n" 1>&2; } +err() { warn "$@"; exit 1; } + +if [ "${0##*/}" = "ac-wrapper.sh" ] ; then + err "Don't call this script directly" +fi + +if [ "${WANT_AUTOCONF}" = "2.1" ] && [ "${0##*/}" = "autom4te" ] ; then + err "Autoconf 2.13 doesn't contain autom4te.\n" \ + " Either unset WANT_AUTOCONF or don't execute anything\n" \ + " that would use autom4te." +fi + +# +# Set up bindings between actual version and WANT_AUTOCONF +# +vers="2.66:2.5 2.65:2.5 2.64:2.5 2.63:2.5 2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1" + +binary="" +for v in ${vers} ; do + auto_ver=${v%:*} + if [ -z "${binary}" ] && [ -x "${0}-${auto_ver}" ] ; then + binary="${0}-${auto_ver}" + fi +done +if [ -z "${binary}" ] ; then + err "Unable to locate any usuable version of autoconf.\n" \ + "\tI tried these versions: ${vers}\n" \ + "\tWith a base name of '${0}'." +fi + +# +# Check the WANT_AUTOCONF setting. We accept a whitespace delimited +# list of autoconf versions. +# +if [ -n "${WANT_AUTOCONF}" ] ; then + for v in ${vers} x ; do + if [ "${v}" = "x" ] ; then + warn "warning: invalid WANT_AUTOCONF '${WANT_AUTOCONF}'; ignoring." + unset WANT_AUTOCONF + break + fi + + auto_ver=${v%:*} + want_ver=${v#*:} + for wx in ${WANT_AUTOCONF} ; do + if [ "${wx}" = "${want_ver}" ] && [ -x "${0}-${auto_ver}" ] ; then + binary="${0}-${auto_ver}" + v="x" + fi + done + [ "${v}" = "x" ] && break + done +fi + +# +# autodetect helpers +# +acprereq_version() { + gawk \ + '($0 !~ /^[[:space:]]*(#|dnl)/) { + if (match($0, "AC_PREREQ\\(\\[?([0-9]\\.[0-9])", res)) + VERSIONS[COUNT++] = res[1] + } + + END { + asort(VERSIONS) + print VERSIONS[COUNT] + }' "$@" +} + +generated_version() { + gawk \ + '{ + if (match($0, + "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])", + res)) { + print res[3] + exit + } + }' "$@" +} + +# +# autodetect routine +# +if [ "${WANT_AUTOCONF}" = "2.1" ] && [ -f "configure.ac" ] ; then + err "Since configure.ac is present, aclocal always use\n" \ + "\tautoconf 2.59+, which conflicts with your choice and\n" \ + "\tcauses error. You have two options:\n" \ + "\t1. Try execute command again after removing configure.ac\n" \ + "\t2. Don't set WANT_AUTOCONF" +fi + +if [ "${WANT_AUTOCONF}" != "2.5" ] && [ -n "${WANT_AUTOMAKE}" ] ; then + # Automake-1.7 and better require autoconf-2.5x so if WANT_AUTOMAKE + # is set to an older version, let's do some sanity checks. + case "${WANT_AUTOMAKE}" in + 1.[456]) + acfiles=$(ls ac{local,include}.m4 configure.{in,ac} 2>/dev/null) + [ -n "${acfiles}" ] && confversion=$(acprereq_version ${acfiles}) + + [ -z "${confversion}" ] && [ -r "configure" ] \ + && confversion=$(generated_version configure) + + if [ "${confversion}" = "2.1" ] && [ ! -f "configure.ac" ] ; then + binary="${0}-2.13" + fi + esac +fi + +if [ -n "${WANT_ACWRAPPER_DEBUG}" ] ; then + if [ -n "${WANT_AUTOCONF}" ] ; then + warn "DEBUG: WANT_AUTOCONF is set to ${WANT_AUTOCONF}" + fi + warn "DEBUG: will execute <${binary}>" +fi + +# +# for further consistency +# +for v in ${vers} ; do + auto_ver=${v%:*} + want_ver=${v#*:} + if [ "${binary}" = "${0}-${auto_ver}" ] ; then + export WANT_AUTOCONF="${want_ver}" + fi +done + +# +# Now try to run the binary +# +if [ ! -x "${binary}" ] ; then + # this shouldn't happen + err "${binary} is missing or not executable.\n" \ + "\tPlease try emerging the correct version of autoconf." +fi + +exec "${binary}" "$@" + +err "was unable to exec ${binary} !?" |