diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-02-08 00:42:05 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-02-08 00:42:05 +0000 |
commit | 33087481b99d5ff9a51d154eafc347077dbf479e (patch) | |
tree | 024785581c930448744a2993e1858096b58e0bfa /sys-devel/automake/files | |
parent | version bump to force re-emerges (diff) | |
download | gentoo-2-33087481b99d5ff9a51d154eafc347077dbf479e.tar.gz gentoo-2-33087481b99d5ff9a51d154eafc347077dbf479e.tar.bz2 gentoo-2-33087481b99d5ff9a51d154eafc347077dbf479e.zip |
old
(Portage version: 2.0.51-r15)
Diffstat (limited to 'sys-devel/automake/files')
-rw-r--r-- | sys-devel/automake/files/am-wrapper.pl | 150 | ||||
-rw-r--r-- | sys-devel/automake/files/automake-1.8.5-config-guess-uclibc.patch | 144 | ||||
-rw-r--r-- | sys-devel/automake/files/digest-automake-1.8.5-r1 | 5 |
3 files changed, 0 insertions, 299 deletions
diff --git a/sys-devel/automake/files/am-wrapper.pl b/sys-devel/automake/files/am-wrapper.pl deleted file mode 100644 index 06df18861346..000000000000 --- a/sys-devel/automake/files/am-wrapper.pl +++ /dev/null @@ -1,150 +0,0 @@ -#!/usr/bin/perl -# -# -# Author: Guillaume Cottenceau (gc@mandrakesoft.com) -# Modified by: Martin Schlemmer (azarah@gentoo.org) -# -# Copyright 2001 MandrakeSoft -# -# This software may be freely redistributed under the terms of the GNU -# public license. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# -# Executes the correct autoconf version. -# -# - defaults to automake-1.4 -# - runs automake-1.8 if it exists and... -# - envvar WANT_AUTOMAKE is set to `1.8' -# -or- -# - `Makefile.in' was generated by automake-1.8 or superior, which -# specifically needs automake-1.8 -# -or_ -# - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.8 -# - runs automake-1.7 if it exists and... -# - envvar WANT_AUTOMAKE is set to `1.7' -# -or- -# - `Makefile.in' was generated by automake-1.7 or superior, which -# specifically needs automake-1.7 -# -or- -# - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifyint the use of 1.7 -# -or- -# - runs automake-1.6 if it exists and... -# - envvar WANT_AUTOMAKE is set to `1.6' -# -or- -# - `Makefile.in' was generated by automake-1.6 or superior, which -# specifically needs automake-1.6 -# -or- -# - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifyint the use of 1.6 -# -or- -# - `configure.in' contains AC_PREREQ and the value's 3 first letters -# are stringwise greater than '2.53c' -# -or- -# - `configure' is already present and was generated by autoconf greater than -# '2.53c' -# - runs automake-1.5 if it exists and... -# - envvar WANT_AUTOMAKE is set to `1.5' -# -or- -# - configure.ac is present -# -or- -# - `configure.in' contains AC_PREREQ and the value's 3 first letters -# are stringwise greater than '2.13' -# -or- -# - `configure' is already present and was generated by autoconf greater than -# '2.13' -# -or- -# - `Makefile.in' was generated by automake-1.5 or superior, which -# specifically needs automake-1.5 -# -#use MDK::Common; - -sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l } -sub am_version { - my $file = cat_(shift); - return (@versions = $file =~ /^\s*\[?AM_AUTOMAKE_VERSION\(\[?([^\)]{3}[0-9]?)[^\)]*\]?\)/mg) ? ((sort @versions)[-1]) : ''; -} -sub ac_version { - my $file = cat_(shift); - return (@versions = $file =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3}[0-9]?)[^\)]*\]?\)/mg) ? ((sort @versions)[-1]) : ''; -} - - - -my $binary = "$0-1.4"; -my $binary_1_5 = "$0-1.5x"; -my $binary_1_6 = "$0-1.6x"; -my $binary_1_7 = "$0-1.7x"; -my $binary_1_8 = "$0-1.8x"; - -# Automake is really getting out of hand, so rather start supporting -# WANT_AUTOMAKE = "1.7" the like. Unfortunately it override the old -# variables, so if not set, just convert the old variables .... -if ($ENV{WANT_AUTOMAKE} eq "") { - if ($ENV{WANT_AUTOMAKE_1_4}) { - $ENV{WANT_AUTOMAKE} = '1.4'; - } elsif ($ENV{WANT_AUTOMAKE_1_6}) { - $ENV{WANT_AUTOMAKE} = '1.6'; - } elsif ($ENV{WANT_AUTOMAKE_1_5}) { - $ENV{WANT_AUTOMAKE} = '1.5'; - } -} - -# question here is do we really want 1.5 or 1.6? Out of a KDE outlook, it -# should rather be 1.5, and since most people would rather have migrated to -# 1.5, and then stay with it for a bit (those 1.4 die hards ..), only have -# the 'configure.ac' test for 1.5 ... -if ($ENV{WANT_AUTOMAKE} ne '1.4') { - if (-x $binary_1_8 # user may not have _1_8 ... - && (($ENV{WANT_AUTOMAKE} eq '1.8') - || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.8' - || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.8' - || am_version('aclocal.m4') ge '1.8')) { - $ENV{WANT_AUTOMAKE} = '1.8'; # to prevent further "cats" and to enhance consistency (possible cwd etc) - $binary = $binary_1_8; - } elsif (-x $binary_1_7 # user may not have 1.7 ... - && (($ENV{WANT_AUTOMAKE} eq '1.7') - || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.7' - || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.7' - || am_version('aclocal.m4') ge '1.7')) { - $ENV{WANT_AUTOMAKE} = '1.7'; # to prevent further "cats" and to enhance consistency (possible cwd etc) - $binary = $binary_1_7; - } elsif (-x $binary_1_6 # user may not have 1.6 ... - && (($ENV{WANT_AUTOMAKE} eq '1.6') - || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.6' - || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.6' - || am_version('aclocal.m4') ge '1.6' - # Autoconf 2.53d and later need automake-1.6c, so enable 1.6 for 2.53 - # and up ..... - || ac_version('configure.in') gt '2.52' - || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.52' - || ac_version('aclocal.m4') gt '2.52')) { - $ENV{WANT_AUTOMAKE} = '1.6'; # to prevent further "cats" and to enhance consistency (possible cwd etc) - $binary = $binary_1_6; - } elsif (-x $binary_1_5 # user may have only 1.4 ... - && (($ENV{WANT_AUTOMAKE} eq '1.5') - || -r 'configure.ac' - || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.5' - || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.5' - || ac_version('configure.in') gt '2.13' - || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.13' - || ac_version('aclocal.m4') gt '2.13')) { - $ENV{WANT_AUTOMAKE} = '1.5'; # to prevent further "cats" and to enhance consistency (possible cwd etc) - $binary = $binary_1_5; - } else { - if (-r 'configure.in' || -r 'configure.ac') { - $ENV{WANT_AUTOMAKE} = '1.4'; # for further consistency - } else { - $ENV{WANT_AUTOMAKE} = '1.8'; - $binary = $binary_1_8; - } - } -} - -$ENV{WANT_AMWRAPPER_DEBUG} and print STDERR "am-wrapper: will execute <$binary>\n"; - -exec $binary, @ARGV; - -die "am-wrapper: ouch, couldn't call binary ($binary).\n"; diff --git a/sys-devel/automake/files/automake-1.8.5-config-guess-uclibc.patch b/sys-devel/automake/files/automake-1.8.5-config-guess-uclibc.patch deleted file mode 100644 index f166a556c6da..000000000000 --- a/sys-devel/automake/files/automake-1.8.5-config-guess-uclibc.patch +++ /dev/null @@ -1,144 +0,0 @@ ---- ./lib/config.guess.guess~ Sun Apr 18 12:50:36 2004 -+++ ./lib/config.guess Fri May 28 23:29:50 2004 -@@ -136,6 +136,19 @@ - UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown - UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -+# Detect uclibc systems. -+ -+LIBC="gnu" -+if [ -f /usr/include/bits/uClibc_config.h ] -+then -+ LIBC=uclibc -+ if [[ -n `grep "#define __UCLIBC_CONFIG_VERSION__" /usr/include/bits/uClibc_config.h` ]] -+ then -+ UCLIBC_SUBVER=`sed -n "/#define __UCLIBC_CONFIG_VERSION__ /s///p" /usr/include/bits/uClibc_config.h` -+ LIBC=$LIBC$UCLIBC_SUBVER -+ fi -+fi -+ - # Note: order is significant - the case branches are not exclusive. - - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -845,19 +858,19 @@ - echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; - arm*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit 0 ;; - cris:Linux:*:*) -- echo cris-axis-linux-gnu -+ echo cris-axis-linux-${LIBC} - exit 0 ;; - ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit 0 ;; - m32r*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit 0 ;; - m68*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit 0 ;; - mips:Linux:*:*) - eval $set_cc_for_build -@@ -876,7 +889,7 @@ - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 -+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-${LIBC}" && exit 0 - ;; - mips64:Linux:*:*) - eval $set_cc_for_build -@@ -895,13 +908,13 @@ - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 -+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-${LIBC}" && exit 0 - ;; - ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -+ echo powerpc-unknown-linux-${LIBC} - exit 0 ;; - ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -+ echo powerpc64-unknown-linux-${LIBC} - exit 0 ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -914,34 +927,34 @@ - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit 0 ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -- PA7*) echo hppa1.1-unknown-linux-gnu ;; -- PA8*) echo hppa2.0-unknown-linux-gnu ;; -- *) echo hppa-unknown-linux-gnu ;; -+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; -+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; -+ *) echo hppa-unknown-linux-${LIBC} ;; - esac - exit 0 ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -+ echo hppa64-unknown-linux-${LIBC} - exit 0 ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit 0 ;; - sh*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit 0 ;; - sparc:Linux:*:* | sparc64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit 0 ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo x86_64-unknown-linux-${LIBC} - exit 0 ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so -@@ -956,20 +969,21 @@ - p'` - case "$ld_supported_targets" in - elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -+ TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" - ;; - a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" - exit 0 ;; - coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff" - exit 0 ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" - exit 0 ;; - esac -+ if [ $LIBC != "gnu" -o $LIBC != "gnulibc1" ];then echo "$TENTATIVE" && exit 0; fi - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c diff --git a/sys-devel/automake/files/digest-automake-1.8.5-r1 b/sys-devel/automake/files/digest-automake-1.8.5-r1 deleted file mode 100644 index 4e5695d11b21..000000000000 --- a/sys-devel/automake/files/digest-automake-1.8.5-r1 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 0114aa6d7dc32112834b68105fb8d7e2 automake-1.8.5.tar.bz2 663182 -MD5 571fd0b0598eb2a27dcf68adcfddfacb automake-1.7.9.tar.bz2 577705 -MD5 2e8053609e9d318f80db0fce29dca7e9 automake-1.6.3.tar.bz2 476275 -MD5 74a22ac0581378e807ecb334a55c5bab automake-1.5.tar.gz 526934 -MD5 24872b81b95d78d05834c39af2cfcf05 automake-1.4-p6.tar.gz 375060 |