From 38a37c071ab97f59641b08a1e37e0c590077afab Mon Sep 17 00:00:00 2001 From: Matej Muzila Date: Thu, 12 Feb 2015 16:37:08 +0100 Subject: [PATCH] Update to 1.5.2 --- .gitignore | 1 + dejagnu-1.5-aarch64.patch | 566 ------------------------------------- dejagnu-1.5-gfortran.patch | 159 ----------- dejagnu-1.5-runtest.patch | 13 - dejagnu-1.5-smp-1.patch | 30 -- dejagnu-1.5-usrmove.patch | 12 - dejagnu.spec | 17 +- sources | 2 +- 8 files changed, 7 insertions(+), 793 deletions(-) delete mode 100644 dejagnu-1.5-aarch64.patch delete mode 100644 dejagnu-1.5-gfortran.patch delete mode 100644 dejagnu-1.5-runtest.patch delete mode 100644 dejagnu-1.5-smp-1.patch delete mode 100644 dejagnu-1.5-usrmove.patch diff --git a/.gitignore b/.gitignore index 3fc5b32..c99cf82 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ dejagnu-1.4.4.tar.gz dejagnu.texi /dejagnu-1.5.tar.gz /dejagnu-1.5.1.tar.gz +/dejagnu-1.5.2.tar.gz diff --git a/dejagnu-1.5-aarch64.patch b/dejagnu-1.5-aarch64.patch deleted file mode 100644 index 23c49c0..0000000 --- a/dejagnu-1.5-aarch64.patch +++ /dev/null @@ -1,566 +0,0 @@ -diff -urN dejagnu-1.5/config.guess dejagnu-1.5-aarch64/config.guess ---- dejagnu-1.5/config.guess 2011-03-03 04:01:07.000000000 -0600 -+++ dejagnu-1.5-aarch64/config.guess 2013-03-03 04:11:34.751854073 -0600 -@@ -2,9 +2,9 @@ - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, --# 2011 Free Software Foundation, Inc. -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2011-02-02' -+timestamp='2012-09-25' - - # 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 -@@ -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 . - # - # 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, 2011 Free --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 - 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 -@@ -202,6 +200,10 @@ - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; -+ *:Bitrig:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} -+ exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -@@ -304,7 +306,7 @@ - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; -- arm:riscos:*:*|arm:RISCOS:*:*) -+ arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) -@@ -792,21 +794,26 @@ - 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*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ *:MINGW64*:*) -+ echo ${UNAME_MACHINE}-pc-mingw64 -+ exit ;; - *: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 -@@ -861,6 +868,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 ;; -@@ -882,20 +896,29 @@ - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else -- echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_PCS_VFP -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf -+ fi - fi - exit ;; - avr32*:Linux:*:*) - 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 ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ hexagon:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - LIBC=gnu -@@ -937,7 +960,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 -@@ -972,13 +995,13 @@ - 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 ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -1185,6 +1208,9 @@ - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; -+ x86_64:Haiku:*:*) -+ echo x86_64-unknown-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1240,7 +1266,7 @@ - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} - exit ;; -- NSE-?:NONSTOP_KERNEL:*:*) -+ NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) -@@ -1309,11 +1335,11 @@ - 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 --#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -- - eval $set_cc_for_build - cat >$dummy.c <. - # - # 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, 2011 Free --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 - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -125,13 +123,17 @@ - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - 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 ] -@@ -154,7 +156,7 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis | -knuth | -cray | -microblaze) -+ -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; -@@ -223,6 +225,12 @@ - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -lynx*178) -+ os=-lynxos178 -+ ;; -+ -lynx*5) -+ os=-lynxos5 -+ ;; - -lynx*) - os=-lynxos - ;; -@@ -247,20 +255,25 @@ - # 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 \ -+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -@@ -286,22 +299,23 @@ - | nds32 | nds32le | nds32be \ - | nios | nios2 \ - | ns16k | ns32k \ -+ | open8 \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ -- | rx \ -+ | rl78 | rx \ - | score \ - | 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 \ -- | spu | strongarm \ -- | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ -+ | spu \ -+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ -- | 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 - ;; -@@ -314,8 +328,7 @@ - c6x) - basic_machine=tic6x-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12 | picochip) -- # Motorola 68HC11/12. -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; -@@ -325,6 +338,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 -+ ;; -+ -+ xscaleel) -+ basic_machine=armel-unknown -+ ;; -+ - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. -@@ -339,11 +367,13 @@ - # 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-* \ - | clipper-* | craynv-* | cydra-* \ -@@ -352,12 +382,15 @@ - | 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-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -+ | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -@@ -382,24 +415,26 @@ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ -+ | open8-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ -+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ -- | 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-* \ - | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ -- | tahoe-* | thumb-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ -+ | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -- | tile-* | tilegx-* \ -+ | tile*-* \ - | tron-* \ - | ubicom32-* \ -- | 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-*) -@@ -697,7 +732,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 -@@ -755,9 +789,13 @@ - basic_machine=ns32k-utek - os=-sysv - ;; -- microblaze) -+ microblaze*) - basic_machine=microblaze-xilinx - ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ os=-mingw64 -+ ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 -@@ -794,10 +832,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 -@@ -950,9 +996,10 @@ - ;; - power) basic_machine=power-ibm - ;; -- ppc) basic_machine=powerpc-unknown -+ ppc | ppcbe) basic_machine=powerpc-unknown - ;; -- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ppc-* | ppcbe-*) -+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -@@ -1046,6 +1093,9 @@ - basic_machine=i860-stratus - os=-sysv4 - ;; -+ strongarm-* | thumb-*) -+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - sun2) - basic_machine=m68000-sun - ;; -@@ -1102,13 +1152,8 @@ - basic_machine=t90-cray - os=-unicos - ;; -- # This must be matched before tile*. -- tilegx*) -- basic_machine=tilegx-unknown -- os=-linux-gnu -- ;; - tile*) -- basic_machine=tile-unknown -+ basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) -@@ -1178,6 +1223,9 @@ - xps | xps100) - basic_machine=xps100-honeywell - ;; -+ xscale-* | xscalee[bl]-*) -+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` -+ ;; - ymp) - basic_machine=ymp-cray - os=-unicos -@@ -1309,15 +1357,15 @@ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -- | -openbsd* | -solidbsd* \ -+ | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-android* \ -- | -linux-newlib* | -linux-uclibc* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ -+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -@@ -1500,6 +1548,9 @@ - c4x-* | tic4x-*) - os=-coff - ;; -+ hexagon-*) -+ os=-elf -+ ;; - tic54x-*) - os=-coff - ;; -@@ -1527,9 +1578,6 @@ - ;; - m68000-sun) - os=-sunos3 -- # This also exists in the configure program, but was not the -- # default. -- # os=-sunos4 - ;; - m68*-cisco) - os=-aout diff --git a/dejagnu-1.5-gfortran.patch b/dejagnu-1.5-gfortran.patch deleted file mode 100644 index b4ac409..0000000 --- a/dejagnu-1.5-gfortran.patch +++ /dev/null @@ -1,159 +0,0 @@ -diff -U0 dejagnu-1.5/ChangeLog.gfortran dejagnu-1.5/ChangeLog ---- dejagnu-1.5/ChangeLog.gfortran 2011-03-09 05:29:16.000000000 +0100 -+++ dejagnu-1.5/ChangeLog 2012-05-14 18:38:36.316469119 +0200 -@@ -0,0 +1,8 @@ -+2011-06-30 Tom Tromey -+ -+ * doc/ref.xml: Document find_gfortran. -+ * doc/dejagnu.texi: Regenerate. -+ * lib/target.exp (default_target_compile): Handle f90. -+ (default_target_compile): Likewise. -+ * lib/libgloss.exp (find_gfortran): New proc. -+ -diff -up dejagnu-1.5/doc/dejagnu.texi.gfortran dejagnu-1.5/doc/dejagnu.texi ---- dejagnu-1.5/doc/dejagnu.texi.gfortran 2011-03-08 01:26:30.000000000 +0100 -+++ dejagnu-1.5/doc/dejagnu.texi 2012-05-14 18:38:36.317469122 +0200 -@@ -6548,6 +6548,7 @@ executable image for an embedded systems - * Find_gcj Procedure: find_gcj procedure. - * Find_g++ Procedure: find_g++ procedure. - * Find_g77 Procedure: find_g77 procedure. -+* Find_gfortran Procedure: find_gfortran procedure. - * Process_multilib_options Procedure: process_multilib_options procedure. - * Add_multilib_option Procedure: add_multilib_option procedure. - * Find_gas Procedure: find_gas procedure. -@@ -6752,7 +6753,7 @@ executable image for an embedded systems - @t{@b{find_g++}(@i{});} - @end quotation - --@node find_g77 procedure, process_multilib_options procedure, find_g++ procedure, Libgloss -+@node find_g77 procedure, find_gfortran procedure, find_g++ procedure, Libgloss - @subsubsection Find_g77 Procedure - - -@@ -6761,7 +6762,16 @@ executable image for an embedded systems - @t{@b{find_g77}(@i{});} - @end quotation - --@node process_multilib_options procedure, add_multilib_option procedure, find_g77 procedure, Libgloss -+@node find_gfortran procedure, process_multilib_options procedure, find_g77 procedure, Libgloss -+@subsubsection Find_gfortran Procedure -+ -+ -+@quotation -+ -+@t{@b{find_gfortran}(@i{});} -+@end quotation -+ -+@node process_multilib_options procedure, add_multilib_option procedure, find_gfortran procedure, Libgloss - @subsubsection Process_multilib_options Procedure - - -diff -up dejagnu-1.5/doc/ref.xml.gfortran dejagnu-1.5/doc/ref.xml ---- dejagnu-1.5/doc/ref.xml.gfortran 2011-03-03 22:38:25.000000000 +0100 -+++ dejagnu-1.5/doc/ref.xml 2012-05-14 18:38:36.333469167 +0200 -@@ -4146,6 +4146,19 @@ - - - -+ -+ Find_gfortran Procedure -+ -+ -+ -+ -+ -+ find_gfortran -+ -+ -+ -+ -+ - - Process_multilib_options Procedure -diff -up dejagnu-1.5/lib/libgloss.exp.gfortran dejagnu-1.5/lib/libgloss.exp ---- dejagnu-1.5/lib/libgloss.exp.gfortran 2011-03-03 10:58:56.000000000 +0100 -+++ dejagnu-1.5/lib/libgloss.exp 2012-05-14 18:38:36.364469259 +0200 -@@ -1,5 +1,5 @@ - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. -+# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. - # - # This file is part of DejaGnu. - # -@@ -701,6 +701,25 @@ proc find_g77 {} { - } - return $CC - } -+ -+proc find_gfortran {} { -+ global tool_root_dir -+ -+ if {![is_remote host]} { -+ set file [lookfor_file $tool_root_dir gfortran] -+ if { $file == "" } { -+ set file [lookfor_file $tool_root_dir gcc/gfortran] -+ } -+ if { $file != "" } { -+ set CC "$file -B[file dirname $file]/" -+ } else { -+ set CC [transform gfortran] -+ } -+ } else { -+ set CC [transform gfortran] -+ } -+ return $CC -+} - - proc find_gnatmake {} { - global tool_root_dir -diff -up dejagnu-1.5/lib/target.exp.gfortran dejagnu-1.5/lib/target.exp ---- dejagnu-1.5/lib/target.exp.gfortran 2011-03-03 10:58:56.000000000 +0100 -+++ dejagnu-1.5/lib/target.exp 2012-05-14 18:38:36.399469362 +0200 -@@ -1,5 +1,5 @@ - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. -+# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. - # - # This file is part of DejaGnu. - # -@@ -367,6 +367,18 @@ proc default_target_compile {source dest - } - } - -+ if { $i == "f90" } { -+ set compiler_type "f90" -+ if {[board_info $dest exists f90flags]} { -+ append add_flags " [target_info f90flags]" -+ } -+ if {[board_info $dest exists f90compiler]} { -+ set compiler [target_info f90compiler] -+ } else { -+ set compiler [find_gfortran] -+ } -+ } -+ - if {[regexp "^dest=" $i]} { - regsub "^dest=" $i "" tmp - if {[board_info $tmp exists name]} { -@@ -420,6 +432,7 @@ proc default_target_compile {source dest - global CC_FOR_TARGET - global CXX_FOR_TARGET - global F77_FOR_TARGET -+ global F90_FOR_TARGET - global GNATMAKE_FOR_TARGET - - if {[info exists GNATMAKE_FOR_TARGET]} { -@@ -446,6 +459,12 @@ proc default_target_compile {source dest - } - } - -+ if {[info exists F90_FOR_TARGET]} { -+ if { $compiler_type == "f90" } { -+ set compiler $F90_FOR_TARGET -+ } -+ } -+ - if { $compiler == "" } { - set compiler [board_info $dest compiler] - if { $compiler == "" } { diff --git a/dejagnu-1.5-runtest.patch b/dejagnu-1.5-runtest.patch deleted file mode 100644 index 6813cbc..0000000 --- a/dejagnu-1.5-runtest.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up dejagnu-1.5/runtest.exp.orig dejagnu-1.5/runtest.exp ---- dejagnu-1.5/runtest.exp.orig 2011-03-04 13:09:59.000000000 +0100 -+++ dejagnu-1.5/runtest.exp 2011-03-22 14:43:06.090850456 +0100 -@@ -1443,8 +1443,7 @@ proc runtest { test_file_name } { - global tool - - clone_output "Running $test_file_name ..." -- set prms_id 0 -- set bug_id 0 -+ reset_vars - set test_result "" - - if {[file exists $test_file_name]} { diff --git a/dejagnu-1.5-smp-1.patch b/dejagnu-1.5-smp-1.patch deleted file mode 100644 index ff53c23..0000000 --- a/dejagnu-1.5-smp-1.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up dejagnu-1.5/lib/remote.exp.smp-1 dejagnu-1.5/lib/remote.exp ---- dejagnu-1.5/lib/remote.exp.smp-1 2011-03-22 14:51:40.962914270 +0100 -+++ dejagnu-1.5/lib/remote.exp 2011-03-22 14:54:36.152608589 +0100 -@@ -86,11 +86,16 @@ proc local_exec { commandline inp outp t - # doesn't assign process groups correctly and we can't reliably kill - # programs that bear children. We can't use tcl's exec because it has - # no way to timeout programs that hang. *sigh* -+ # -+ # The expect command will close the connection when it sees EOF. On -+ # SMP machine, close the connection may send SIGHUP to the child -+ # and cause it to exit before it can exit normally. We should make -+ # the child to ignore SIGHUP. - - global errorInfo - if { "$inp" == "" && "$outp" == "" } { - set id -1 -- set result [catch "eval spawn \{${commandline}\}" pid] -+ set result [catch "eval spawn -ignore SIGHUP \{${commandline}\}" pid] - if { $result == 0 } { - set result2 0 - } else { -@@ -130,7 +135,7 @@ proc local_exec { commandline inp outp t - return [list -1 "open of $commandline $inp $outp failed: $errorInfo"] - } - set pid [pid $id] -- set result [catch "spawn -leaveopen $id" result2] -+ set result [catch "spawn -ignore SIGHUP -leaveopen $id" result2] - } - # Prepend "-" to each pid, to generate the "process group IDs" needed by - # kill. diff --git a/dejagnu-1.5-usrmove.patch b/dejagnu-1.5-usrmove.patch deleted file mode 100644 index 96f1a85..0000000 --- a/dejagnu-1.5-usrmove.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up dejagnu-1.5/runtest.usrmove dejagnu-1.5/runtest ---- dejagnu-1.5/runtest.usrmove 2012-02-24 13:03:17.145409711 +0100 -+++ dejagnu-1.5/runtest 2012-02-24 13:04:32.068473042 +0100 -@@ -109,7 +109,7 @@ fi - # - # .. which is a very weak assumption - --for i in `echo ${execpath} | sed -e 's@/[^/]*$@/share/dejagnu@'` `echo ${execpath} | sed -e 's@/[^/]*/[^/]*$@/share/dejagnu@'` $execpath ; do -+for i in `echo ${execpath} | sed -e 's@/[^/]*$@/share/dejagnu@'` `echo ${execpath} | sed -e 's@/[^/]*/[^/]*$@/share/dejagnu@'` $execpath '/usr/share/dejagnu' '/usr/local/share/dejagnu' ; do - if expr $verbose \> 1 > /dev/null ; then - echo Looking for $i/runtest.exp. - fi diff --git a/dejagnu.spec b/dejagnu.spec index b422bca..a1b7b8b 100644 --- a/dejagnu.spec +++ b/dejagnu.spec @@ -1,7 +1,7 @@ Summary: A front end for testing other programs Name: dejagnu -Version: 1.5.1 -Release: 4%{?dist} +Version: 1.5.2 +Release: 1%{?dist} Epoch: 1 License: GPLv3+ Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-%{version}.tar.gz @@ -10,11 +10,6 @@ URL: http://www.gnu.org/software/dejagnu/ Requires: expect BuildArch: noarch BuildRequires: expect screen texinfo -Patch1: dejagnu-1.5-smp-1.patch -Patch2: dejagnu-1.5-runtest.patch -Patch3: dejagnu-1.5-usrmove.patch -Patch4: dejagnu-1.5-gfortran.patch -Patch5: dejagnu-1.5-aarch64.patch %description DejaGnu is an Expect/Tcl based framework for testing other programs. @@ -26,11 +21,6 @@ into software development). %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build %configure -v @@ -78,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %{_infodir}/dejagnu* %changelog +* Thu Feb 12 2015 Matej Muzila 1:1.5.2-1 +- Update to 1.5.2 + * Sat Jun 07 2014 Fedora Release Engineering - 1:1.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 6902487..9da9f50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8386e04e362345f50ad169f052f4c4ab dejagnu-1.5.1.tar.gz +97a86a21c92ac456641a97f712ea40ac dejagnu-1.5.2.tar.gz