tags 667244 + patch
thanks
plus the debian_changes diff needed regeneration (afaics the package will fail
to build if a new config.{sub,guess} is copied during the clean target.
diff -Nru libevocosm-4.0.2/debian/changelog libevocosm-4.0.2/debian/changelog
--- libevocosm-4.0.2/debian/changelog 2012-01-28 00:08:56.000000000 +0000
+++ libevocosm-4.0.2/debian/changelog 2012-04-17 05:32:58.000000000 +0000
@@ -1,3 +1,10 @@
+libevocosm (4.0.2-2.1) unstable; urgency=low
+
+ * Non maintainer upload.
+ * Fix build failure with GCC 4.7. Closes: #667244.
+
+ -- Matthias Klose <d...@debian.org> Tue, 17 Apr 2012 07:31:57 +0200
+
libevocosm (4.0.2-2) unstable; urgency=low
* Acknowledgment for the NMU. Incorporated changes into package.
diff -Nru libevocosm-4.0.2/debian/patches/debian-changes
libevocosm-4.0.2/debian/patches/debian-changes
--- libevocosm-4.0.2/debian/patches/debian-changes 2012-01-28
00:18:33.000000000 +0000
+++ libevocosm-4.0.2/debian/patches/debian-changes 2012-04-17
05:43:44.000000000 +0000
@@ -3,8 +3,10 @@
should be here are changes to the regenerated
autoconf files created during the package
build process.
---- libevocosm-4.0.2.orig/config.sub
-+++ libevocosm-4.0.2/config.sub
+Index: libevocosm-4.0.2/config.sub
+===================================================================
+--- libevocosm-4.0.2.orig/config.sub 2011-07-24 01:32:22.000000000 +0000
++++ libevocosm-4.0.2/config.sub 2012-04-17 05:42:37.971979527 +0000
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -12,23 +14,36 @@
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+# 2011 Free Software Foundation, Inc.
++# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2010-01-22'
-+timestamp='2011-03-23'
++timestamp='2012-02-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
-@@ -76,7 +76,7 @@ version="\
+@@ -21,9 +21,7 @@
+ # GNU General Public License for more details.
+ #
+ # 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., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -76,8 +74,8 @@
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
- Software Foundation, Inc.
+-Software Foundation, Inc.
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
++Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
-@@ -124,8 +124,9 @@ esac
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -124,13 +122,18 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
@@ -40,7 +55,16 @@
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
-@@ -157,8 +158,8 @@ case $os in
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ ;;
++ android-linux)
++ os=-linux-android
++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
++ ;;
+ *)
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+ if [ $basic_machine != $1 ]
+@@ -157,8 +160,8 @@
os=
basic_machine=$1
;;
@@ -51,7 +75,7 @@
;;
-sim | -cisco | -oki | -wec | -winbond)
os=
-@@ -174,10 +175,10 @@ case $os in
+@@ -174,10 +177,10 @@
os=-chorusos
basic_machine=$1
;;
@@ -65,7 +89,30 @@
-hiux*)
os=-hiuxwe2
;;
-@@ -282,11 +283,13 @@ case $basic_machine in
+@@ -246,17 +249,22 @@
+ # Some are omitted here because they have special meanings below.
+ 1750a | 580 \
+ | a29k \
++ | aarch64 | aarch64_be \
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] |
alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr |
avr32 \
++ | be32 | be64 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
++ | epiphany \
+ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++ | hexagon \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
++ | le32 | le64 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore | mep | metag \
+@@ -282,29 +290,39 @@
| moxie \
| mt \
| msp430 \
@@ -78,9 +125,10 @@
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
- | rx \
+- | rx \
++ | rl78 | rx \
| score \
-@@ -294,15 +297,24 @@ case $basic_machine in
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb |
shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet |
sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -89,13 +137,16 @@
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
- | v850 | v850e \
+- | v850 | v850e \
++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
+- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+- # Motorola 68HC11/12.
+ c54x)
+ basic_machine=tic54x-unknown
+ ;;
@@ -105,17 +156,21 @@
+ c6x)
+ basic_machine=tic6x-unknown
+ ;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- # Motorola 68HC11/12.
++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
-@@ -314,6 +326,18 @@ case $basic_machine in
+ os=-none
+ ;;
+@@ -314,6 +332,21 @@
basic_machine=mt-unknown
;;
+ strongarm | thumb | xscale)
+ basic_machine=arm-unknown
+ ;;
-+
++ xgate)
++ basic_machine=$basic_machine-unknown
++ os=-none
++ ;;
+ xscaleeb)
+ basic_machine=armeb-unknown
+ ;;
@@ -127,16 +182,34 @@
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
-@@ -334,7 +358,7 @@ case $basic_machine in
+@@ -328,21 +361,25 @@
+ # Recognize the basic CPU types with company name.
+ 580-* \
+ | a29k-* \
++ | aarch64-* | aarch64_be-* \
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
++ | be32-* | be64-* \
| bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
-@@ -368,26 +392,28 @@ case $basic_machine in
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++ | hexagon-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
++ | le32-* | le64-* \
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+@@ -368,26 +405,29 @@
| mmix-* \
| mt-* \
| msp430-* \
@@ -149,7 +222,8 @@
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
- | romp-* | rs6000-* | rx-* \
+- | romp-* | rs6000-* | rx-* \
++ | rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-*
| sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* |
sparclet-* \
@@ -159,17 +233,20 @@
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile-* | tilegx-* \
+- | tile-* | tilegx-* \
++ | tile*-* \
| tron-* \
| ubicom32-* \
- | v850-* | v850e-* | vax-* \
+- | v850-* | v850e-* | vax-* \
++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
++ | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-* | z80-*)
-@@ -412,7 +438,7 @@ case $basic_machine in
+@@ -412,7 +452,7 @@
basic_machine=a29k-amd
os=-udi
;;
@@ -178,7 +255,7 @@
basic_machine=abacus-unknown
;;
adobe68k)
-@@ -482,11 +508,20 @@ case $basic_machine in
+@@ -482,11 +522,20 @@
basic_machine=powerpc-ibm
os=-cnk
;;
@@ -200,7 +277,7 @@
basic_machine=arm-unknown
os=-cegcc
;;
-@@ -518,7 +553,7 @@ case $basic_machine in
+@@ -518,7 +567,7 @@
basic_machine=craynv-cray
os=-unicosmp
;;
@@ -209,7 +286,15 @@
basic_machine=cr16-unknown
os=-elf
;;
-@@ -734,7 +769,7 @@ case $basic_machine in
+@@ -676,7 +725,6 @@
+ i370-ibm* | ibm*)
+ basic_machine=i370-ibm
+ ;;
+-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
+ i*86v32)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv32
+@@ -734,7 +782,7 @@
basic_machine=ns32k-utek
os=-sysv
;;
@@ -218,7 +303,26 @@
basic_machine=microblaze-xilinx
;;
mingw32)
-@@ -841,6 +876,12 @@ case $basic_machine in
+@@ -773,10 +821,18 @@
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
++ msys)
++ basic_machine=i386-pc
++ os=-msys
++ ;;
+ mvs)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
++ nacl)
++ basic_machine=le32-unknown
++ os=-nacl
++ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+@@ -841,6 +897,12 @@
np1)
basic_machine=np1-gould
;;
@@ -231,7 +335,7 @@
nsr-tandem)
basic_machine=nsr-tandem
;;
-@@ -923,9 +964,10 @@ case $basic_machine in
+@@ -923,9 +985,10 @@
;;
power) basic_machine=power-ibm
;;
@@ -244,7 +348,7 @@
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
-@@ -1019,6 +1061,9 @@ case $basic_machine in
+@@ -1019,6 +1082,9 @@
basic_machine=i860-stratus
os=-sysv4
;;
@@ -254,7 +358,7 @@
sun2)
basic_machine=m68000-sun
;;
-@@ -1075,20 +1120,8 @@ case $basic_machine in
+@@ -1075,25 +1141,8 @@
basic_machine=t90-cray
os=-unicos
;;
@@ -272,12 +376,16 @@
- ;;
- # This must be matched before tile*.
- tilegx*)
-+ # This must be matched before tile*.
-+ tilegx*)
- basic_machine=tilegx-unknown
+- basic_machine=tilegx-unknown
+- os=-linux-gnu
+- ;;
+ tile*)
+- basic_machine=tile-unknown
++ basic_machine=$basic_machine-unknown
os=-linux-gnu
;;
-@@ -1163,6 +1196,9 @@ case $basic_machine in
+ tx39)
+@@ -1163,6 +1212,9 @@
xps | xps100)
basic_machine=xps100-honeywell
;;
@@ -287,7 +395,7 @@
ymp)
basic_machine=ymp-cray
os=-unicos
-@@ -1260,11 +1296,11 @@ esac
+@@ -1260,11 +1312,11 @@
if [ x"$os" != x"" ]
then
case $os in
@@ -303,17 +411,19 @@
;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
-@@ -1301,7 +1337,8 @@ case $os in
+@@ -1300,8 +1352,9 @@
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems*
\
+ | -mingw32* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-@@ -1348,7 +1385,7 @@ case $os in
+@@ -1348,7 +1401,7 @@
-opened*)
os=-openedition
;;
@@ -322,7 +432,7 @@
os=-os400
;;
-wince*)
-@@ -1397,7 +1434,7 @@ case $os in
+@@ -1397,7 +1450,7 @@
-sinix*)
os=-sysv4
;;
@@ -331,7 +441,7 @@
os=-tpf
;;
-triton*)
-@@ -1442,8 +1479,8 @@ case $os in
+@@ -1442,8 +1495,8 @@
-dicos*)
os=-dicos
;;
@@ -342,7 +452,7 @@
-none)
;;
*)
-@@ -1466,10 +1503,10 @@ else
+@@ -1466,10 +1519,10 @@
# system, and we'll never get to this point.
case $basic_machine in
@@ -355,7 +465,7 @@
os=-elf
;;
*-acorn)
-@@ -1481,8 +1518,17 @@ case $basic_machine in
+@@ -1481,8 +1534,17 @@
arm*-semi)
os=-aout
;;
@@ -375,7 +485,14 @@
;;
# This must come before the *-dec entry.
pdp10-*)
-@@ -1509,7 +1555,7 @@ case $basic_machine in
+@@ -1502,14 +1564,11 @@
+ ;;
+ m68000-sun)
+ os=-sunos3
+- # This also exists in the configure program, but was not the
+- # default.
+- # os=-sunos4
+ ;;
m68*-cisco)
os=-aout
;;
@@ -384,7 +501,7 @@
os=-elf
;;
mips*-cisco)
-@@ -1536,7 +1582,7 @@ case $basic_machine in
+@@ -1536,7 +1595,7 @@
*-ibm)
os=-aix
;;
@@ -393,8 +510,10 @@
os=-mmixware
;;
*-wec)
---- libevocosm-4.0.2.orig/config.guess
-+++ libevocosm-4.0.2/config.guess
+Index: libevocosm-4.0.2/config.guess
+===================================================================
+--- libevocosm-4.0.2.orig/config.guess 2011-07-24 01:32:22.000000000 +0000
++++ libevocosm-4.0.2/config.guess 2012-04-17 05:42:37.971979527 +0000
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -402,23 +521,45 @@
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+# 2011 Free Software Foundation, Inc.
++# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2009-12-30'
-+timestamp='2011-05-11'
++timestamp='2012-02-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -57,7 +57,7 @@ GNU config.guess ($timestamp)
+@@ -17,9 +17,7 @@
+ # General Public License for more details.
+ #
+ # 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., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -57,8 +55,8 @@
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
- Software Foundation, Inc.
+-Software Foundation, Inc.
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
++Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
-@@ -181,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -145,7 +143,7 @@
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ *:NetBSD:*:*)
+ # NetBSD (nbsd) targets should (where applicable) match one or
+- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
+ # switched to ELF, *-*-netbsd* would select the old
+ # object file format. This provides both forward
+@@ -181,7 +179,7 @@
fi
;;
*)
@@ -427,7 +568,7 @@
;;
esac
# The OS release
-@@ -224,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -224,7 +222,7 @@
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;;
*5.*)
@@ -436,7 +577,7 @@
;;
esac
# According to Compaq, /usr/sbin/psrinfo has been available on
-@@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -270,7 +268,10 @@
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e
's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -448,7 +589,7 @@
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
-@@ -296,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -296,7 +297,7 @@
echo s390-ibm-zvmoe
exit ;;
*:OS400:*:*)
@@ -457,7 +598,7 @@
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
-@@ -395,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -395,23 +396,23 @@
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
@@ -490,7 +631,7 @@
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
exit ;;
-@@ -481,8 +484,8 @@ EOF
+@@ -481,8 +482,8 @@
echo m88k-motorola-sysv3
exit ;;
AViiON:dgux:*:*)
@@ -501,7 +642,7 @@
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-@@ -495,7 +498,7 @@ EOF
+@@ -495,7 +496,7 @@
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
@@ -510,7 +651,7 @@
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
exit ;;
-@@ -552,7 +555,7 @@ EOF
+@@ -552,7 +553,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
@@ -519,7 +660,7 @@
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk
'{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1;
then
IBM_ARCH=rs6000
-@@ -595,52 +598,52 @@ EOF
+@@ -595,52 +596,52 @@
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
@@ -613,7 +754,7 @@
EOF
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) &&
HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa
-@@ -731,22 +734,22 @@ EOF
+@@ -731,22 +732,22 @@
exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
@@ -641,7 +782,7 @@
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
-@@ -770,14 +773,14 @@ EOF
+@@ -770,14 +771,14 @@
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz'`
@@ -663,9 +804,30 @@
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-@@ -805,14 +808,14 @@ EOF
+@@ -789,13 +790,12 @@
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit ;;
+ *:FreeBSD:*:*)
+- case ${UNAME_MACHINE} in
+- pc98)
+- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'` ;;
++ UNAME_PROCESSOR=`/usr/bin/uname -p`
++ case ${UNAME_PROCESSOR} in
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'` ;;
+ *)
+- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed
-e 's/[-(].*//'` ;;
++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo
${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
+ exit ;;
+ i*:CYGWIN*:*)
+@@ -804,15 +804,18 @@
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
++ i*:MSYS*:*)
++ echo ${UNAME_MACHINE}-pc-msys
++ exit ;;
i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
@@ -681,7 +843,21 @@
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
-@@ -867,7 +870,7 @@ EOF
+@@ -858,6 +861,13 @@
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
++ aarch64:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
++ aarch64_be:Linux:*:*)
++ UNAME_MACHINE=aarch64_be
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+@@ -867,7 +877,7 @@
EV6) UNAME_MACHINE=alphaev6 ;;
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
@@ -690,7 +866,7 @@
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-@@ -879,7 +882,13 @@ EOF
+@@ -879,20 +889,29 @@
then
echo ${UNAME_MACHINE}-unknown-linux-gnu
else
@@ -705,16 +881,35 @@
fi
exit ;;
avr32*:Linux:*:*)
-@@ -892,7 +901,7 @@ EOF
- echo crisv32-axis-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ cris:Linux:*:*)
+- echo cris-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-gnu
+ exit ;;
+ crisv32:Linux:*:*)
+- echo crisv32-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
-+ echo frv-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
++ hexagon:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
LIBC=gnu
-@@ -960,7 +969,7 @@ EOF
+@@ -934,7 +953,7 @@
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+- echo or32-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
+@@ -960,7 +979,7 @@
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
@@ -723,18 +918,19 @@
exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -968,6 +977,9 @@ EOF
+@@ -968,14 +987,17 @@
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ tile*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-tilera-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
-@@ -975,7 +987,7 @@ EOF
- echo x86_64-unknown-linux-gnu
+ x86_64:Linux:*:*)
+- echo x86_64-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -742,7 +938,7 @@
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-@@ -984,11 +996,11 @@ EOF
+@@ -984,11 +1006,11 @@
echo i386-sequent-sysv4
exit ;;
i*86:UNIX_SV:4.2MP:2.*)
@@ -758,7 +954,7 @@
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit ;;
i*86:OS/2:*:*)
-@@ -1020,7 +1032,7 @@ EOF
+@@ -1020,7 +1042,7 @@
fi
exit ;;
i*86:*:5:[678]*)
@@ -767,7 +963,7 @@
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
-@@ -1048,13 +1060,13 @@ EOF
+@@ -1048,13 +1070,13 @@
exit ;;
pc:*:*:*)
# Left here for compatibility:
@@ -784,7 +980,7 @@
Intel:Mach:3*:*)
echo i386-pc-mach3
exit ;;
-@@ -1089,8 +1101,8 @@ EOF
+@@ -1089,8 +1111,8 @@
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
@@ -795,7 +991,7 @@
NCR*:*:4.2:* | MPRAS*:*:4.2:*)
OS_REL='.3'
test -r /etc/.relid \
-@@ -1133,10 +1145,10 @@ EOF
+@@ -1133,10 +1155,10 @@
echo ns32k-sni-sysv
fi
exit ;;
@@ -810,7 +1006,7 @@
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <he...@openmarket.com>.
# How about differentiating between stratus architectures? -djm
-@@ -1162,11 +1174,11 @@ EOF
+@@ -1162,11 +1184,11 @@
exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
@@ -825,7 +1021,7 @@
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
exit ;;
-@@ -1231,6 +1243,9 @@ EOF
+@@ -1231,6 +1253,9 @@
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
@@ -835,7 +1031,7 @@
NSE-?:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
-@@ -1276,13 +1291,13 @@ EOF
+@@ -1276,13 +1301,13 @@
echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
@@ -851,7 +1047,17 @@
case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
-@@ -1322,11 +1337,11 @@ main ()
+@@ -1300,6 +1325,9 @@
+ i*86:AROS:*:*)
+ echo ${UNAME_MACHINE}-pc-aros
+ exit ;;
++ x86_64:VMkernel:*:*)
++ echo ${UNAME_MACHINE}-unknown-esx
++ exit ;;
+ esac
+
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+@@ -1322,11 +1350,11 @@
#include <sys/param.h>
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
@@ -866,8 +1072,10 @@
#endif
#endif
---- /dev/null
-+++ libevocosm-4.0.2/docs/libevocosm.doxygen
+Index: libevocosm-4.0.2/docs/libevocosm.doxygen
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libevocosm-4.0.2/docs/libevocosm.doxygen 2012-04-17 05:31:05.000000000
+0000
@@ -0,0 +1,175 @@
+# Doxyfile 1.2.13-20020210
+
@@ -1044,8 +1252,10 @@
+# Configuration::addtions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
---- /dev/null
-+++ libevocosm-4.0.2/docs/libevocosm_foot.html
+Index: libevocosm-4.0.2/docs/libevocosm_foot.html
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libevocosm-4.0.2/docs/libevocosm_foot.html 2012-04-17 05:31:05.000000000
+0000
@@ -0,0 +1,8 @@
+<hr>
+<p align="center"><small>
@@ -1055,8 +1265,10 @@
+</p>
+</body>
+</html>
---- /dev/null
-+++ libevocosm-4.0.2/docs/Makefile.am
+Index: libevocosm-4.0.2/docs/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libevocosm-4.0.2/docs/Makefile.am 2012-04-17 05:31:05.000000000 +0000
@@ -0,0 +1,13 @@
+EXTRA_DIST = libevocosm.doxygen libevocosm_foot.html libevocosm_head.html
+
@@ -1071,8 +1283,10 @@
+
+install-data-hook:
+ cp -dR html/* $(DESTDIR)$(htmldir)
---- /dev/null
-+++ libevocosm-4.0.2/docs/libevocosm_head.html
+Index: libevocosm-4.0.2/docs/libevocosm_head.html
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libevocosm-4.0.2/docs/libevocosm_head.html 2012-04-17 05:31:05.000000000
+0000
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><head><meta http-equiv="Content-Type"
content="text/html;charset=iso-8859-1">
diff -Nru libevocosm-4.0.2/debian/patches/fix-ftbfs-gcc4.7.diff
libevocosm-4.0.2/debian/patches/fix-ftbfs-gcc4.7.diff
--- libevocosm-4.0.2/debian/patches/fix-ftbfs-gcc4.7.diff 1970-01-01
00:00:00.000000000 +0000
+++ libevocosm-4.0.2/debian/patches/fix-ftbfs-gcc4.7.diff 2012-04-17
05:34:31.000000000 +0000
@@ -0,0 +1,13 @@
+Index: libevocosm-4.0.2/libevocosm/evocosm.h
+===================================================================
+--- libevocosm-4.0.2.orig/libevocosm/evocosm.h 2011-07-24 01:30:42.000000000
+0000
++++ libevocosm-4.0.2/libevocosm/evocosm.h 2012-04-17 05:34:29.707991602
+0000
+@@ -61,6 +61,8 @@
+ #include <omp.h>
+ #endif
+
++#include <unistd.h>
++
+ // Standard C++ library
+ #include <vector>
+
diff -Nru libevocosm-4.0.2/debian/patches/series
libevocosm-4.0.2/debian/patches/series
--- libevocosm-4.0.2/debian/patches/series 2012-01-28 00:18:33.000000000
+0000
+++ libevocosm-4.0.2/debian/patches/series 2012-04-17 05:33:05.000000000
+0000
@@ -1,2 +1,3 @@
doxygen-docs.patch
debian-changes
+fix-ftbfs-gcc4.7.diff
