diff options
author | Mike Frysinger <vapier@gentoo.org> | 2010-03-07 15:45:40 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-03-07 15:45:40 +0000 |
commit | 355e4d842ff6923ac3fc319cb9067299cf62f9de (patch) | |
tree | ed524f2e64f5277dad6203d0dcf25b9cb6dc97bf /sys-devel | |
parent | Depend on Python 2. (diff) | |
download | historical-355e4d842ff6923ac3fc319cb9067299cf62f9de.tar.gz historical-355e4d842ff6923ac3fc319cb9067299cf62f9de.tar.bz2 historical-355e4d842ff6923ac3fc319cb9067299cf62f9de.zip |
Merge updates from autoconf-wrapper to get POSIX-only code.
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64
Diffstat (limited to 'sys-devel')
-rw-r--r-- | sys-devel/automake-wrapper/ChangeLog | 8 | ||||
-rw-r--r-- | sys-devel/automake-wrapper/Manifest | 14 | ||||
-rw-r--r-- | sys-devel/automake-wrapper/automake-wrapper-5.ebuild | 29 | ||||
-rwxr-xr-x | sys-devel/automake-wrapper/files/am-wrapper-5.sh | 154 |
4 files changed, 203 insertions, 2 deletions
diff --git a/sys-devel/automake-wrapper/ChangeLog b/sys-devel/automake-wrapper/ChangeLog index d6ff1213b528..76fee76cbe96 100644 --- a/sys-devel/automake-wrapper/ChangeLog +++ b/sys-devel/automake-wrapper/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-devel/automake-wrapper # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.38 2010/02/24 08:08:27 mduft Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.39 2010/03/07 15:45:39 vapier Exp $ + +*automake-wrapper-5 (07 Mar 2010) + + 07 Mar 2010; Mike Frysinger <vapier@gentoo.org> + +automake-wrapper-5.ebuild, +files/am-wrapper-5.sh: + Merge updates from autoconf-wrapper to get POSIX-only code. 24 Feb 2010; Markus Duft <mduft@gentoo.org> files/am-wrapper-4.sh: use /usr/bin/env bash instead of /bin/bash to support prefix diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest index eacbd383670d..a39d5573e7ce 100644 --- a/sys-devel/automake-wrapper/Manifest +++ b/sys-devel/automake-wrapper/Manifest @@ -1,6 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX am-wrapper-3.sh 4342 RMD160 fcd76fcca6209c6705a5398d99ae9011bc01e579 SHA1 3af0a2f00e09463aa3d7604ebefd0141aa693799 SHA256 b18f4938a53c8c86100f41aedb88ff43568e5a4a4329b87ffa118b66e2983e25 AUX am-wrapper-4.sh 4354 RMD160 0dc2880dc64e639500a38ac04c0f0345eb9175ac SHA1 2da9888c74a68bb5ba6d4a2b189e04693bf4bfca SHA256 882eb17bd3b8d195143eecfbc533ddaf8bef77f719ff070de855ae337e4b7504 +AUX am-wrapper-5.sh 4130 RMD160 eab77be481f142c3d7918bd8c53162c1a1d95d23 SHA1 a66b2d390546da297b68ae8a4385e43a8554dba7 SHA256 0546150d48e71d25ed3c909982fe30bdaccc6c79382ad1989538c2b0ce7a0d77 EBUILD automake-wrapper-3-r1.ebuild 786 RMD160 1d2e30563262ded5b30f703b868e425b1ae02c05 SHA1 d6af8b8f1348247efa569bae5134195758b2f556 SHA256 5f97f5291690397f90b3149d683eb04240bd6ca3da2833f63993e4a76ece366d EBUILD automake-wrapper-4.ebuild 1001 RMD160 1c2522b07d57ecafc8ea774c3f49fcf9e644d8a8 SHA1 74169a8c0df8496c7ae8ceb6990701d1e7f3e476 SHA256 7e9b6a84add0cc78bef491aa3ad837038d304905f35733a907a85d3a2f2352af -MISC ChangeLog 4417 RMD160 2b8bf7930a9f8c7740f8c51989319df2442181bd SHA1 4625d41dff809e5ff7014b818dc93514aaa6a3c8 SHA256 00986bc524190ce4364d604708e7609228fa2568e3562c2327eeecb05ef7603d +EBUILD automake-wrapper-5.ebuild 1003 RMD160 23a1e2eb800067ee67ee2dd9a5d324c1d718767e SHA1 8a608fea05226dfd7697d4b39ad43516cf7d477f SHA256 52d561399cb37b8980fa12f7c4d0e51185e3e34947600cb666b1b2a2885896c2 +MISC ChangeLog 4620 RMD160 663dda8d0a321e314ea3cc002249a6e759430f25 SHA1 86089daf97dba1d0569885001c68d2069ac53f64 SHA256 cdde8497e81dd720f1fa456fda626ac6ef0dd02b339d3857a8b2e5557449263e MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iF4EAREIAAYFAkuTyikACgkQTwhj9JtAlp7imwD/YSxvpiwycRUdcpfVLIjbnN8x +7aMjMddAc57EjZcL4i4BAJ7UkKKhMuHHGjqDJuZBA8rZ0QnSAiDOJG6GlXC7QtPx +=pQBz +-----END PGP SIGNATURE----- diff --git a/sys-devel/automake-wrapper/automake-wrapper-5.ebuild b/sys-devel/automake-wrapper/automake-wrapper-5.ebuild new file mode 100644 index 000000000000..ac1221fd2c98 --- /dev/null +++ b/sys-devel/automake-wrapper/automake-wrapper-5.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/automake-wrapper-5.ebuild,v 1.1 2010/03/07 15:45:39 vapier Exp $ + +inherit multilib + +DESCRIPTION="wrapper for automake to manage multiple automake 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}"/am-wrapper-${PV}.sh am-wrapper.sh || die + + keepdir /usr/share/aclocal + + dodir /usr/bin + local x= + for x in aclocal automake ; do + dosym ../$(get_libdir)/misc/am-wrapper.sh /usr/bin/${x} + done +} diff --git a/sys-devel/automake-wrapper/files/am-wrapper-5.sh b/sys-devel/automake-wrapper/files/am-wrapper-5.sh new file mode 100755 index 000000000000..dbf6df6b9e26 --- /dev/null +++ b/sys-devel/automake-wrapper/files/am-wrapper-5.sh @@ -0,0 +1,154 @@ +#!/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/automake-wrapper/files/am-wrapper-5.sh,v 1.1 2010/03/07 15:45:40 vapier Exp $ + +# Based on the am-wrapper.pl script provided by MandrakeSoft +# Rewritten in bash by Gregorio Guidi +# +# Executes the correct automake version. +# +# - defaults to newest version available (hopefully automake-1.10) +# - runs automake-1.9 if: +# - envvar WANT_AUTOMAKE is set to `1.9' +# -or- +# - `Makefile.in' was generated by automake-1.9 +# -or- +# - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.9 +# - runs automake-1.8 if: +# - envvar WANT_AUTOMAKE is set to `1.8' +# -or- +# - `Makefile.in' was generated by automake-1.8 +# -or- +# - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.8 +# - runs automake-1.7 if: +# - envvar WANT_AUTOMAKE is set to `1.7' +# -or- +# - `Makefile.in' was generated by automake-1.7 +# -or- +# - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.7 +# - runs automake-1.6 if: +# - envvar WANT_AUTOMAKE is set to `1.6' +# -or- +# - `Makefile.in' +# -or- +# - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.6 +# - runs automake-1.5 if: +# - envvar WANT_AUTOMAKE is set to `1.5' +# -or- +# - `Makefile.in' was generated by automake-1.5 +# -or- +# - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.5 +# - runs automake-1.4 if: +# - envvar WANT_AUTOMAKE is set to `1.4' +# -or- +# - `Makefile.in' was generated by automake-1.4 +# -or- +# - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.4 + +warn() { printf "am-wrapper: $*\n" 1>&2; } +err() { warn "$@"; exit 1; } + +if [ "${0##*/}" = "am-wrapper.sh" ] ; then + err "Don't call this script directly" +fi + +vers="1.11 1.10 1.9 1.8 1.7 1.6 1.5 1.4" + +# +# Export the proper variable/versions and try to locate a usuable +# default (newer versions are preferred) +# +binary="" +for v in ${vers} ; do + if [ -z "${binary}" ] && [ -x "${0}-${v}" ] ; then + binary="${0}-${v}" + fi +done +if [ -z "${binary}" ] ; then + err "Unable to locate any usuable version of automake.\n" \ + "\tI tried these versions: ${vers}\n" \ + "\tWith a base name of '${0}'." +fi + +# +# Check the WANT_AUTOMAKE setting. We accept a whitespace delimited +# list of automake versions. +# +if [ -n "${WANT_AUTOMAKE}" ] ; then + for v in ${vers} x ; do + if [ "${v}" = "x" ] ; then + warn "warning: invalid WANT_AUTOMAKE '${WANT_AUTOMAKE}'; ignoring." + unset WANT_AUTOMAKE + break + fi + + for wx in ${WANT_AUTOMAKE} ; do + if [ "${wx}" = "${v}" ] ; then + binary="${0}-${v}" + v="x" + fi + done + [ "${v}" = "x" ] && break + done +fi + +# +# autodetect helpers +# +do_awk() { + local file=$1 ; shift + local arg=$1 ; shift + echo $(gawk "{ if (match(\$0, \"$*\", res)) { print res[${arg}]; exit } }" ${file}) +} + +# +# autodetect routine +# +if [ -z "${WANT_AUTOMAKE}" ] ; then + if [ -r "Makefile.in" ] ; then + confversion_mf=$(do_awk Makefile.in 2 "^# Makefile.in generated (automatically )?by automake ([0-9].[0-9]+)") + fi + if [ -r "aclocal.m4" ] ; then + confversion_ac=$(do_awk aclocal.m4 1 'generated automatically by aclocal ([0-9].[0-9]+)') + confversion_am=$(do_awk aclocal.m4 1 '[[:space:]]*\\[?AM_AUTOMAKE_VERSION\\(\\[?([0-9].[0-9]+)[^)]*\\]?\\)') + fi + + for v in ${vers} ; do + if [ "${confversion_mf}" = "${v}" ] || \ + [ "${confversion_ac}" = "${v}" ] || \ + [ "${confversion_am}" = "${v}" ] + then + binary="${0}-${v}" + break + fi + done +fi + +if [ "${WANT_AMWRAPPER_DEBUG}" ] ; then + if [ "${WANT_AUTOMAKE}" ] ; then + warn "DEBUG: WANT_AUTOMAKE is set to ${WANT_AUTOMAKE}" + fi + warn "DEBUG: will execute <$binary>" +fi + +# +# for further consistency +# +for v in ${vers} ; do + if [ "${binary}" = "${0}-${v}" ] ; then + export WANT_AUTOMAKE="${v}" + fi +done + +# +# Now try to run the binary +# +if [ ! -x "${binary}" ] ; then + err "$binary is missing or not executable.\n" \ + "\tPlease try emerging the correct version of automake." +fi + +exec "$binary" "$@" + +err "was unable to exec $binary !?" |