diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-11-21 19:08:54 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-11-21 19:08:54 +0000 |
commit | df324ca1c63c5507ef82b084e3607eeacdf2f825 (patch) | |
tree | a275fb5ced38acc8bfce6fdc93c15d19f4512cd1 /sys-devel/autoconf-wrapper | |
parent | old (diff) | |
download | historical-df324ca1c63c5507ef82b084e3607eeacdf2f825.tar.gz historical-df324ca1c63c5507ef82b084e3607eeacdf2f825.tar.bz2 historical-df324ca1c63c5507ef82b084e3607eeacdf2f825.zip |
Support autoconf-2.65 and switch to POSIX sh.
Package-Manager: portage-2.2_rc49/cvs/Linux x86_64
Diffstat (limited to 'sys-devel/autoconf-wrapper')
-rw-r--r-- | sys-devel/autoconf-wrapper/ChangeLog | 8 | ||||
-rw-r--r-- | sys-devel/autoconf-wrapper/Manifest | 12 | ||||
-rw-r--r-- | sys-devel/autoconf-wrapper/autoconf-wrapper-8.ebuild | 27 | ||||
-rwxr-xr-x | sys-devel/autoconf-wrapper/files/ac-wrapper-8.sh | 159 |
4 files changed, 199 insertions, 7 deletions
diff --git a/sys-devel/autoconf-wrapper/ChangeLog b/sys-devel/autoconf-wrapper/ChangeLog index 3327e9bbb77c..b9f1a0db1b8b 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-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.66 2009/11/05 16:39:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.67 2009/11/21 19:08:54 vapier Exp $ + +*autoconf-wrapper-8 (21 Nov 2009) + + 21 Nov 2009; Mike Frysinger <vapier@gentoo.org> + +autoconf-wrapper-8.ebuild, +files/ac-wrapper-8.sh: + Support autoconf-2.65 and switch to POSIX sh. 05 Nov 2009; Mike Frysinger <vapier@gentoo.org> autoconf-wrapper-7.ebuild: Stabilize for everyone. diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest index 459018490678..b8a47f2fcbb9 100644 --- a/sys-devel/autoconf-wrapper/Manifest +++ b/sys-devel/autoconf-wrapper/Manifest @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX ac-wrapper-6.sh 4316 RMD160 57aa77455852fe10b4f41eb29c7679b98efdb9d3 SHA1 b42bc805ea57d6ec31932c1bbfefd352a308eaac SHA256 ed6869552cb5f12f0b5c48cbdae1652644fb63e48c96269e88acec6c1c05d426 AUX ac-wrapper-7.sh 4325 RMD160 e52f8df68baa9503f6e18ea4048cae5704d5a6bd SHA1 4d581cd816b7c3bef77b54e3990f91ba11ff3767 SHA256 1f126a3fcd45fec152b6fcc77f71a682bd12586ee9c457a4c5c27d184f4c29b6 -EBUILD autoconf-wrapper-6.ebuild 794 RMD160 48c7c27ed1463dd8c34b71f0a558aa08d301c63d SHA1 1798ebe6b631f3e1c4166e8299025ef673dc0285 SHA256 d47a6aaa4dc093f4398dbe3e938cd3dad603d9fbea958121c62969567d4358e9 +AUX ac-wrapper-8.sh 4144 RMD160 6fecd289597fa23b38f6e7d3f3d2b04f8c771544 SHA1 cc9df3ebbba5b05483716b1e3c8e40a842a573ad SHA256 4a9f899b95334033b7fbc56d8f14c18fdc46c60c5d323cbd289a0af358e5d3aa EBUILD autoconf-wrapper-7.ebuild 794 RMD160 f0a96dbfa8447595cffafa305be80a1dd960a88b SHA1 9796574b6b8b7e6448fd5c4cba28fd9c6fae972a SHA256 13dc42cb33f3296f33b6b12470dc9b35da57272c890026852187da84a13beb41 -MISC ChangeLog 8726 RMD160 66b39649a816cc962180154cf0fc3df321eb044c SHA1 834c7d11d22a488c43995c127104dad0c776ee49 SHA256 1120b208e7e877d884b0a2d2a9ce9e95d334889514e2e54f057d698bf0ffa5ed +EBUILD autoconf-wrapper-8.ebuild 806 RMD160 b22b256612bc5a66961c9b77d337770ae47120cd SHA1 4b4c2953db2df27847b72d4c8fc4bead51979ee0 SHA256 1fccce81490d730f4b155f0daf2b2f7f6935c912dd7224c353b45ad96747756e +MISC ChangeLog 8914 RMD160 229ddcb651b48d544a8cec6bd363650743f46484 SHA1 97090ea25a539314a6b95d94db2772c45a9a4ba8 SHA256 83343fb6347e203838587762e0742dacee75333ec249df9301537b66894bb200 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.13 (GNU/Linux) -iEYEARECAAYFAkrzACUACgkQlPl3HsVfCDrTpwCfXFcw3S2LhN3R5xnegrTnkPI3 -f4QAn2PQfqDFGrBSVC7CScTwqdjIXk6W -=bZDr +iEYEARECAAYFAksIO58ACgkQlPl3HsVfCDqfYgCePkASwpokA3ulcOOC8WTzBRXK +qsQAn3575nH16jXWLBhVjUd8Nqs/k7Of +=z/fC -----END PGP SIGNATURE----- diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-8.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-8.ebuild new file mode 100644 index 000000000000..d102536d39f5 --- /dev/null +++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-8.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/autoconf-wrapper-8.ebuild,v 1.1 2009/11/21 19:08:54 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 ~sparc-fbsd ~x86-fbsd" +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-8.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-8.sh new file mode 100755 index 000000000000..b39f02eb31df --- /dev/null +++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-8.sh @@ -0,0 +1,159 @@ +#!/bin/sh +# Copyright 1999-2009 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-8.sh,v 1.1 2009/11/21 19:08:54 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.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 "ac-wrapper: was unable to exec ${binary} !?" |