From 1cf6b40036873c2cd2290aeb5e628cb1c217ab26 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:47:37 +0000 Subject: [PATCH 01/70] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bae13b1..8c70442 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := cppunit SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From ba0d71b8236617819b24f62c8ed771b2f499d791 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 12:15:30 +0000 Subject: [PATCH 02/70] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8c70442..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: cppunit -# $Id$ -NAME := cppunit -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From d119d3235f752dc2a76fcc65be46503fb81d2f1b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 05:44:15 -0600 Subject: [PATCH 03/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 4152a2a..58cfce0 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,6 +1,6 @@ Name: cppunit Version: 1.12.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ unit testing framework # no license in files @@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1.12.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Jul 24 2009 Fedora Release Engineering - 1.12.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 2de5e766d0706eccadd58bd25c565b76420d69e2 Mon Sep 17 00:00:00 2001 From: "Steven M. Parrish" Date: Tue, 28 Jun 2011 08:01:50 -0400 Subject: [PATCH 04/70] Fix for bug 452340 --- cppunit-msg.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 cppunit-msg.patch diff --git a/cppunit-msg.patch b/cppunit-msg.patch new file mode 100644 index 0000000..9f41649 --- /dev/null +++ b/cppunit-msg.patch @@ -0,0 +1,24 @@ +--- cppunit-1.12.1/include/cppunit/Message.h.dt 2010-10-08 14:02:26.514477964 +0200 ++++ cppunit-1.12.1/include/cppunit/Message.h.dt 2010-10-08 14:02:15.411948098 +0200 +@@ -57,6 +57,8 @@ public: + const std::string &detail2, + const std::string &detail3 ); + ++ ~Message(); ++ + Message &operator =( const Message &other ); + + /*! \brief Returns the short description. +--- cppunit-1.12.1/src/cppunit/Message.cpp.dt 2010-10-08 14:02:39.421768852 +0200 ++++ cppunit-1.12.1/src/cppunit/Message.cpp.dt 2010-10-08 14:02:54.066829633 +0200 +@@ -47,6 +47,10 @@ Message::Message( const std::string &sho + addDetail( detail1, detail2, detail3 ); + } + ++Message::~Message() ++{ ++} ++ + Message & + Message::operator =( const Message &other ) + { From f817b66610a93cca39be736c7651710fe15d0a1e Mon Sep 17 00:00:00 2001 From: "Steven M. Parrish" Date: Tue, 28 Jun 2011 08:02:24 -0400 Subject: [PATCH 05/70] Fix for bug 452340 --- cppunit.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 58cfce0..edfc7fa 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,6 +1,6 @@ Name: cppunit Version: 1.12.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ unit testing framework # no license in files @@ -9,6 +9,7 @@ Group: Development/Libraries Url: http://cppunit.sourceforge.net/ Source: http://downloads.sourceforge.net/cppunit/cppunit-%{version}.tar.gz Patch0: cppunit-1.12.0-nolibdir.patch +Patch1: cppunit-msg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen, graphviz @@ -44,6 +45,7 @@ for file in THANKS ChangeLog NEWS; do touch -c -r $file ${file}.utf8 mv ${file}.utf8 $file done +%patch1 -p1 -b .nomsg %build export LDFLAGS=-ldl @@ -98,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html %changelog +* Tue Jun 28 2011 Steven M. Parrish - 1.12.1-5 +- Fix for bug 452340 + * Tue Feb 08 2011 Fedora Release Engineering - 1.12.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 350c082beae5e9027353271af25e502ac2a83547 Mon Sep 17 00:00:00 2001 From: "Steven M. Parrish" Date: Tue, 28 Jun 2011 08:52:41 -0400 Subject: [PATCH 06/70] Fix for bug 452340 --- .gitignore | 1 + cppunit-msg.patch | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ece7a00..7a13705 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ cppunit-1.12.1.tar.gz +cppunit-1.12.1.tar.gz diff --git a/cppunit-msg.patch b/cppunit-msg.patch index 9f41649..d5c1568 100644 --- a/cppunit-msg.patch +++ b/cppunit-msg.patch @@ -1,5 +1,5 @@ ---- cppunit-1.12.1/include/cppunit/Message.h.dt 2010-10-08 14:02:26.514477964 +0200 -+++ cppunit-1.12.1/include/cppunit/Message.h.dt 2010-10-08 14:02:15.411948098 +0200 +--- cppunit-1.12.1/include/cppunit/Message.h 2010-10-08 14:02:26.514477964 +0200 ++++ cppunit-1.12.1/include/cppunit/Message.h 2010-10-08 14:02:15.411948098 +0200 @@ -57,6 +57,8 @@ public: const std::string &detail2, const std::string &detail3 ); @@ -9,8 +9,8 @@ Message &operator =( const Message &other ); /*! \brief Returns the short description. ---- cppunit-1.12.1/src/cppunit/Message.cpp.dt 2010-10-08 14:02:39.421768852 +0200 -+++ cppunit-1.12.1/src/cppunit/Message.cpp.dt 2010-10-08 14:02:54.066829633 +0200 +--- cppunit-1.12.1/src/cppunit/Message.cpp 2010-10-08 14:02:39.421768852 +0200 ++++ cppunit-1.12.1/src/cppunit/Message.cpp 2010-10-08 14:02:54.066829633 +0200 @@ -47,6 +47,10 @@ Message::Message( const std::string &sho addDetail( detail1, detail2, detail3 ); } From 721d7019810978ef34179c8f6e2b2a7f78d6685e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 5 Oct 2011 15:58:13 +0100 Subject: [PATCH 07/70] Resolves: sf#2912630 unused argument warnings --- cppunit-warnings-sf2912630.patch | 22 ++++++++++++++++++++++ cppunit.spec | 8 +++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 cppunit-warnings-sf2912630.patch diff --git a/cppunit-warnings-sf2912630.patch b/cppunit-warnings-sf2912630.patch new file mode 100644 index 0000000..7b0ba8a --- /dev/null +++ b/cppunit-warnings-sf2912630.patch @@ -0,0 +1,22 @@ +--- cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2007-01-12 05:54:34.000000000 +0100 ++++ cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2009-12-02 15:33:29.639857272 +0100 +@@ -151,9 +151,7 @@ + #include + #endif + #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ +- BOOL APIENTRY DllMain( HANDLE hModule, \ +- DWORD ul_reason_for_call, \ +- LPVOID lpReserved ) \ ++ BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID ) \ + { \ + return TRUE; \ + } \ +@@ -162,7 +160,7 @@ + // Unix + #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER) + #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ +- int main( int argc, char *argv[] ) \ ++ int main( int, char *[] ) \ + { \ + return 0; \ + } \ diff --git a/cppunit.spec b/cppunit.spec index edfc7fa..cc350ca 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,6 +1,6 @@ Name: cppunit Version: 1.12.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C++ unit testing framework # no license in files @@ -10,6 +10,8 @@ Url: http://cppunit.sourceforge.net/ Source: http://downloads.sourceforge.net/cppunit/cppunit-%{version}.tar.gz Patch0: cppunit-1.12.0-nolibdir.patch Patch1: cppunit-msg.patch +#https://sourceforge.net/tracker/?func=detail&aid=2912630&group_id=11795&atid=311795 +Patch2: cppunit-warnings-sf2912630.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen, graphviz @@ -46,6 +48,7 @@ for file in THANKS ChangeLog NEWS; do mv ${file}.utf8 $file done %patch1 -p1 -b .nomsg +%patch2 -p1 -b .warnings-sf2912630 %build export LDFLAGS=-ldl @@ -100,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html %changelog +* Wed Oct 05 2011 Caolán McNamara - 1.12.1-6 +- add sf#2912630 fix for unused argument warnings + * Tue Jun 28 2011 Steven M. Parrish - 1.12.1-5 - Fix for bug 452340 From da2f42985bb7509eb54a630b4d88f0c707ef336a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 17:57:44 -0600 Subject: [PATCH 08/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index cc350ca..d270a53 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,6 +1,6 @@ Name: cppunit Version: 1.12.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: C++ unit testing framework # no license in files @@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 1.12.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Oct 05 2011 Caolán McNamara - 1.12.1-6 - add sf#2912630 fix for unused argument warnings From a31b7f1ed6d904bfd22dec5b9375637c243cf5bd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 14:47:48 -0500 Subject: [PATCH 09/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index d270a53..f478cfa 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,6 +1,6 @@ Name: cppunit Version: 1.12.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: C++ unit testing framework # no license in files @@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 1.12.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jan 12 2012 Fedora Release Engineering - 1.12.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From e48ccc9e246ac0f027105663872877645fb7c563 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 13:04:13 -0600 Subject: [PATCH 10/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index f478cfa..b39bf5c 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,6 +1,6 @@ Name: cppunit Version: 1.12.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: C++ unit testing framework # no license in files @@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 1.12.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Jul 18 2012 Fedora Release Engineering - 1.12.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From ee74cae67228698aa93fac1649db70cc9a5ac29c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 01:01:01 -0500 Subject: [PATCH 11/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index b39bf5c..e5c6470 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,6 +1,6 @@ Name: cppunit Version: 1.12.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: C++ unit testing framework # no license in files @@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.12.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 1.12.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From a771b915efdb7a35a886648ea191d1e77c30f2bb Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 20 May 2014 17:39:46 +0200 Subject: [PATCH 12/70] rhbz#925193 add support for aarch64 --- cppunit-aarch64.patch | 1576 +++++++++++++++++++++++++++++++++++++++++ cppunit.spec | 7 +- 2 files changed, 1582 insertions(+), 1 deletion(-) create mode 100644 cppunit-aarch64.patch diff --git a/cppunit-aarch64.patch b/cppunit-aarch64.patch new file mode 100644 index 0000000..79597f0 --- /dev/null +++ b/cppunit-aarch64.patch @@ -0,0 +1,1576 @@ +diff -urN cppunit-1.12.1/config/config.guess cppunit-1.12.1-aarch64/config/config.guess +--- cppunit-1.12.1/config/config.guess 2008-02-17 14:10:30.000000000 -0600 ++++ cppunit-1.12.1-aarch64/config/config.guess 2013-03-07 21:45:17.103828925 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # 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 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2008-01-23' ++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 +@@ -27,16 +25,16 @@ + # the same distribution terms that you use for the rest of that program. + + +-# Originally written by Per Bothner . +-# Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to and include a ChangeLog ++# entry. + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and + # exits with 0. Otherwise, it exits with 1. + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -56,8 +54,9 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++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." +@@ -144,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 +@@ -170,7 +169,7 @@ + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -180,7 +179,7 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +@@ -201,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} +@@ -223,7 +226,7 @@ + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on +@@ -269,7 +272,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'` +- exit ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + 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 +@@ -295,12 +301,12 @@ + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 ++ echo powerpc-ibm-os400 + exit ;; + 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:*:*) +@@ -324,14 +330,33 @@ + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize +@@ -375,23 +400,23 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; +@@ -461,8 +486,8 @@ + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -475,7 +500,7 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; +@@ -532,7 +557,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + 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 +@@ -575,52 +600,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` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include ++ #include ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); + +- #define _HPUX_SOURCE +- #include +- #include +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa +@@ -640,7 +665,7 @@ + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | +- grep __LP64__ >/dev/null ++ grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else +@@ -711,22 +736,22 @@ + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; +@@ -750,14 +775,14 @@ + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +@@ -769,34 +794,39 @@ + 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 ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- *:Interix*:[3456]*) +- case ${UNAME_MACHINE} in ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +- EM64T | authenticamd) ++ authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) +@@ -806,6 +836,9 @@ + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we +@@ -835,6 +868,27 @@ + 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 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ 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} ++ exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ +@@ -842,20 +896,40 @@ + 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 ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -866,74 +940,33 @@ + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- mips:Linux:*:*) ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU +- #undef mips +- #undef mipsel ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } +- ;; +- mips64:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef mips64 +- #undef mips64el +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mips64el +- #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips64 +- #else +- CPU= +- #endif +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-gnu +- exit ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu + exit ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- 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} ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level +@@ -943,14 +976,17 @@ + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -958,78 +994,18 @@ + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ tile*:Linux:*:*) ++ 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 ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit ;; +- coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^LIBC/{ +- s: ::g +- p +- }'`" +- test x"${LIBC}" != x && { +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" +- exit +- } +- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } +- ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both +@@ -1037,11 +1013,11 @@ + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) +@@ -1058,7 +1034,7 @@ + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) +@@ -1073,7 +1049,7 @@ + fi + exit ;; + i*86:*:5:[678]*) +- # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; +@@ -1101,10 +1077,13 @@ + exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. +- echo i386-pc-msdosdjgpp +- exit ;; ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; +@@ -1139,8 +1118,18 @@ + /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:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4; exit; } ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; +@@ -1153,7 +1142,7 @@ + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) +@@ -1173,10 +1162,10 @@ + echo ns32k-sni-sysv + fi + exit ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm +@@ -1202,11 +1191,11 @@ + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; +@@ -1216,6 +1205,12 @@ + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; ++ 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 ;; +@@ -1243,6 +1238,16 @@ + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +@@ -1258,7 +1263,10 @@ + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) +@@ -1303,13 +1311,13 @@ + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} ++ echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) +- UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; +@@ -1324,11 +1332,14 @@ + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; ++ 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 < + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + +diff -urN cppunit-1.12.1/config/config.sub cppunit-1.12.1-aarch64/config/config.sub +--- cppunit-1.12.1/config/config.sub 2008-02-17 14:10:30.000000000 -0600 ++++ cppunit-1.12.1-aarch64/config/config.sub 2013-03-07 21:45:17.143824323 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2008-01-16' ++timestamp='2012-10-10' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -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 . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -32,13 +30,16 @@ + + + # Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# diff and a properly formatted GNU ChangeLog entry. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. + # If it is invalid, we print an error message on stderr and exit with code 1. + # Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ + # This file is supposed to be the same for all GNU packages + # and recognize all the CPU types, system types and aliases + # that are meaningful with *any* GNU software. +@@ -72,8 +73,9 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++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." +@@ -120,12 +122,18 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ +- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ 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 ] +@@ -148,10 +156,13 @@ + -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) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; ++ -bluegene*) ++ os=-cnk ++ ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 +@@ -166,10 +177,10 @@ + os=-chorusos + basic_machine=$1 + ;; +- -chorusrdb) +- os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 +- ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; +@@ -214,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 + ;; +@@ -238,24 +255,32 @@ + # 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 \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +- | mips64vr | mips64vrel \ ++ | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ +@@ -268,29 +293,42 @@ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | moxie \ + | mt \ + | msp430 \ ++ | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ ++ | open8 \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ ++ | rl78 | rx \ + | score \ +- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | 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 | tic80 | tron \ +- | v850 | v850e \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ ++ | ubicom32 \ ++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ +- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ +- | z8k) ++ | x86 | xc16x | xstormy16 | xtensa \ ++ | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12) +- # Motorola 68HC11/12. ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; +@@ -300,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. +@@ -314,29 +367,37 @@ + # 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-* \ + | 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-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +- | mips64vr-* | mips64vrel-* \ ++ | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ +@@ -351,27 +412,32 @@ + | mmix-* \ + | mt-* \ + | msp430-* \ ++ | 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-* \ +- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | 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*-* \ + | tron-* \ +- | v850-* | v850e-* | vax-* \ ++ | ubicom32-* \ ++ | 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-*) ++ | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) +@@ -393,7 +459,7 @@ + basic_machine=a29k-amd + os=-udi + ;; +- abacus) ++ abacus) + basic_machine=abacus-unknown + ;; + adobe68k) +@@ -439,6 +505,10 @@ + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux +@@ -455,10 +525,27 @@ + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; + convex-c1) + basic_machine=c1-convex + os=-bsd +@@ -487,7 +574,7 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16) ++ cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; +@@ -526,6 +613,10 @@ + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp +@@ -641,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 +@@ -699,6 +789,13 @@ + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze*) ++ basic_machine=microblaze-xilinx ++ ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 +@@ -735,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 +@@ -803,6 +908,12 @@ + np1) + basic_machine=np1-gould + ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -885,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 +@@ -981,6 +1093,9 @@ + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -1037,20 +1152,8 @@ + basic_machine=t90-cray + os=-unicos + ;; +- tic54x | c54x*) +- basic_machine=tic54x-unknown +- os=-coff +- ;; +- tic55x | c55x*) +- basic_machine=tic55x-unknown +- os=-coff +- ;; +- tic6x | c6x*) +- basic_machine=tic6x-unknown +- os=-coff +- ;; + tile*) +- basic_machine=tile-unknown ++ basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) +@@ -1120,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 +@@ -1128,6 +1234,10 @@ + basic_machine=z8k-unknown + os=-sim + ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none +@@ -1166,7 +1276,7 @@ + we32k) + basic_machine=we32k-att + ;; +- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) +@@ -1213,9 +1323,12 @@ + if [ x"$os" != x"" ] + then + case $os in +- # First match some system type aliases +- # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; +@@ -1236,21 +1349,23 @@ + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ +- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* \ ++ | -aos* | -aros* \ + | -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* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ ++ | -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* \ +@@ -1258,7 +1373,7 @@ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1297,7 +1412,7 @@ + -opened*) + os=-openedition + ;; +- -os400*) ++ -os400*) + os=-os400 + ;; + -wince*) +@@ -1346,7 +1461,7 @@ + -sinix*) + os=-sysv4 + ;; +- -tpf*) ++ -tpf*) + os=-tpf + ;; + -triton*) +@@ -1388,6 +1503,11 @@ + -zvmoe) + os=-zvmoe + ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -nacl*) ++ ;; + -none) + ;; + *) +@@ -1410,10 +1530,10 @@ + # system, and we'll never get to this point. + + case $basic_machine in +- score-*) ++ score-*) + os=-elf + ;; +- spu-*) ++ spu-*) + os=-elf + ;; + *-acorn) +@@ -1425,8 +1545,20 @@ + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ hexagon-*) ++ os=-elf ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) +@@ -1446,14 +1578,11 @@ + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; +- mep-*) ++ mep-*) + os=-elf + ;; + mips*-cisco) +@@ -1480,7 +1609,7 @@ + *-ibm) + os=-aix + ;; +- *-knuth) ++ *-knuth) + os=-mmixware + ;; + *-wec) +@@ -1585,7 +1714,7 @@ + -sunos*) + vendor=sun + ;; +- -aix*) ++ -cnk*|-aix*) + vendor=ibm + ;; + -beos*) diff --git a/cppunit.spec b/cppunit.spec index e5c6470..7681639 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,6 +1,6 @@ Name: cppunit Version: 1.12.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: C++ unit testing framework # no license in files @@ -12,6 +12,7 @@ Patch0: cppunit-1.12.0-nolibdir.patch Patch1: cppunit-msg.patch #https://sourceforge.net/tracker/?func=detail&aid=2912630&group_id=11795&atid=311795 Patch2: cppunit-warnings-sf2912630.patch +Patch3: cppunit-aarch64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen, graphviz @@ -49,6 +50,7 @@ for file in THANKS ChangeLog NEWS; do done %patch1 -p1 -b .nomsg %patch2 -p1 -b .warnings-sf2912630 +%patch3 -p1 -b .aarch64 %build export LDFLAGS=-ldl @@ -103,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html %changelog +* Tue May 20 2014 David Tardon - 1.12.1-11 +- rhbz#925193 add support for aarch64 + * Sat Aug 03 2013 Fedora Release Engineering - 1.12.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 66a023bbc404497497d2bbf0dd1ae34d3056b6c9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 01:04:34 -0500 Subject: [PATCH 13/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 7681639..f223434 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,6 +1,6 @@ Name: cppunit Version: 1.12.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: C++ unit testing framework # no license in files @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.12.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue May 20 2014 David Tardon - 1.12.1-11 - rhbz#925193 add support for aarch64 From 41f0a43d20449424a3e9befd8f20d17eeffdb391 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 01:27:58 +0000 Subject: [PATCH 14/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index f223434..e559121 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,6 +1,6 @@ Name: cppunit Version: 1.12.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: C++ unit testing framework # no license in files @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 1.12.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.12.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 98c35b8cc4df924384c7279095ff2bc0af67d09b Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 20 Feb 2015 14:00:43 +0100 Subject: [PATCH 15/70] rebuild for C++ stdlib ABI change in gcc5 --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index e559121..29d0b86 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,6 +1,6 @@ Name: cppunit Version: 1.12.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: C++ unit testing framework # no license in files @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html %changelog +* Fri Feb 20 2015 David Tardon - 1.12.1-14 +- rebuild for C++ stdlib ABI change in gcc5 + * Sat Aug 16 2014 Fedora Release Engineering - 1.12.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From c44b992f2a41dc526033bc4aad46d9a2b13d7750 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 11 Apr 2015 16:48:14 +0200 Subject: [PATCH 16/70] rebuild for yet another C++ ABI break --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 29d0b86..50b39bd 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,6 +1,6 @@ Name: cppunit Version: 1.12.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: C++ unit testing framework # no license in files @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html %changelog +* Sat Apr 11 2015 David Tardon - 1.12.1-15 +- rebuild for yet another C++ ABI break + * Fri Feb 20 2015 David Tardon - 1.12.1-14 - rebuild for C++ stdlib ABI change in gcc5 From 04d85d7597501f5f289c2bd5173f18d67ce47d13 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 03:20:25 +0000 Subject: [PATCH 17/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 50b39bd..3b0dd17 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,6 +1,6 @@ Name: cppunit Version: 1.12.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: C++ unit testing framework # no license in files @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.12.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Apr 11 2015 David Tardon - 1.12.1-15 - rebuild for yet another C++ ABI break From d477b49a62f21c62031cce49a032f24d7b16800b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 18:11:06 +0000 Subject: [PATCH 18/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 3b0dd17..13af25d 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,6 +1,6 @@ Name: cppunit Version: 1.12.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: C++ unit testing framework # no license in files @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.12.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 1.12.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 9f0aaab9f502b95ad1bb8ff3924b96b2aa5ce6f2 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 12 Feb 2016 21:34:04 +0100 Subject: [PATCH 19/70] remove cruft --- cppunit.spec | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/cppunit.spec b/cppunit.spec index 13af25d..ac25446 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -5,7 +5,6 @@ Release: 17%{?dist} Summary: C++ unit testing framework # no license in files License: LGPLv2+ -Group: Development/Libraries Url: http://cppunit.sourceforge.net/ Source: http://downloads.sourceforge.net/cppunit/cppunit-%{version}.tar.gz Patch0: cppunit-1.12.0-nolibdir.patch @@ -14,7 +13,6 @@ Patch1: cppunit-msg.patch Patch2: cppunit-warnings-sf2912630.patch Patch3: cppunit-aarch64.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen, graphviz %description @@ -24,7 +22,6 @@ tests. %package devel Summary: Libraries and headers for cppunit development -Group: Development/Libraries Requires: pkgconfig, automake Requires: %{name} = %{version}-%{release} @@ -34,7 +31,6 @@ programs that use cppunit. %package doc Summary: HTML formatted API documention for cppunit -Group: Documentation %description doc The cppunit-doc package contains HTML formatted API documention generated by @@ -58,7 +54,6 @@ export LDFLAGS=-ldl make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' rm $RPM_BUILD_ROOT%{_libdir}/*.la # remove double of doc @@ -77,21 +72,16 @@ chmod a-x __dist-examples/qt/run.bat mkdir __dist-examples-dir mv __dist-examples __dist-examples-dir/examples -%clean -rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README THANKS ChangeLog TODO BUGS doc/FAQ %{_bindir}/DllPlugInTester %{_libdir}/libcppunit*.so.* %files devel -%defattr(-,root,root,-) %{_bindir}/cppunit-config %{_includedir}/cppunit %{_libdir}/libcppunit.so @@ -100,7 +90,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/cppunit.pc %files doc -%defattr(-,root,root,-) %doc __dist-examples-dir/examples/ %doc doc/html From debb4ed6a8cdd803592e5be89404873f165b515a Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 12 Feb 2016 21:36:22 +0100 Subject: [PATCH 20/70] use %license --- cppunit.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index ac25446..0d88aec 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -77,7 +77,8 @@ mv __dist-examples __dist-examples-dir/examples %postun -p /sbin/ldconfig %files -%doc AUTHORS COPYING NEWS README THANKS ChangeLog TODO BUGS doc/FAQ +%doc AUTHORS NEWS README THANKS ChangeLog TODO BUGS doc/FAQ +%license COPYING %{_bindir}/DllPlugInTester %{_libdir}/libcppunit*.so.* From b28290392fa92c8edf0a22b460dfb2a3a2fd13fa Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 12 Feb 2016 21:36:54 +0100 Subject: [PATCH 21/70] -doc needs license too --- cppunit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/cppunit.spec b/cppunit.spec index 0d88aec..534add4 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -91,6 +91,7 @@ mv __dist-examples __dist-examples-dir/examples %{_libdir}/pkgconfig/cppunit.pc %files doc +%license COPYING %doc __dist-examples-dir/examples/ %doc doc/html From b8f63c42632677c58124fbd4ab32ee644c7669a7 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 13 Feb 2016 08:43:51 +0100 Subject: [PATCH 22/70] switch to new upstream --- .gitignore | 1 + 0001-Update-FSF-address-in-LGPL-license.patch | 28 +++++++++++++++++++ cppunit-msg.patch | 24 ---------------- cppunit-warnings-sf2912630.patch | 22 --------------- cppunit.spec | 25 ++++++++--------- sources | 2 +- 6 files changed, 41 insertions(+), 61 deletions(-) create mode 100644 0001-Update-FSF-address-in-LGPL-license.patch delete mode 100644 cppunit-msg.patch delete mode 100644 cppunit-warnings-sf2912630.patch diff --git a/.gitignore b/.gitignore index 7a13705..0c7cb07 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ cppunit-1.12.1.tar.gz cppunit-1.12.1.tar.gz +cppunit-1.13.2.tar.gz diff --git a/0001-Update-FSF-address-in-LGPL-license.patch b/0001-Update-FSF-address-in-LGPL-license.patch new file mode 100644 index 0000000..d257221 --- /dev/null +++ b/0001-Update-FSF-address-in-LGPL-license.patch @@ -0,0 +1,28 @@ +From 1cebdfc97b39961c2df68e84996f667d529eafc7 Mon Sep 17 00:00:00 2001 +From: Thorsten Behrens +Date: Tue, 12 Nov 2013 08:59:19 +0100 +Subject: [PATCH] Update FSF address in LGPL license. + +Since rpmlint was bitching, and indeed +http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt features a +new address. +--- + COPYING | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/COPYING b/COPYING +index b1e3f5a..0a41847 100644 +--- a/COPYING ++++ b/COPYING +@@ -2,7 +2,7 @@ + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +-- +2.5.0 + diff --git a/cppunit-msg.patch b/cppunit-msg.patch deleted file mode 100644 index d5c1568..0000000 --- a/cppunit-msg.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- cppunit-1.12.1/include/cppunit/Message.h 2010-10-08 14:02:26.514477964 +0200 -+++ cppunit-1.12.1/include/cppunit/Message.h 2010-10-08 14:02:15.411948098 +0200 -@@ -57,6 +57,8 @@ public: - const std::string &detail2, - const std::string &detail3 ); - -+ ~Message(); -+ - Message &operator =( const Message &other ); - - /*! \brief Returns the short description. ---- cppunit-1.12.1/src/cppunit/Message.cpp 2010-10-08 14:02:39.421768852 +0200 -+++ cppunit-1.12.1/src/cppunit/Message.cpp 2010-10-08 14:02:54.066829633 +0200 -@@ -47,6 +47,10 @@ Message::Message( const std::string &sho - addDetail( detail1, detail2, detail3 ); - } - -+Message::~Message() -+{ -+} -+ - Message & - Message::operator =( const Message &other ) - { diff --git a/cppunit-warnings-sf2912630.patch b/cppunit-warnings-sf2912630.patch deleted file mode 100644 index 7b0ba8a..0000000 --- a/cppunit-warnings-sf2912630.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2007-01-12 05:54:34.000000000 +0100 -+++ cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2009-12-02 15:33:29.639857272 +0100 -@@ -151,9 +151,7 @@ - #include - #endif - #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ -- BOOL APIENTRY DllMain( HANDLE hModule, \ -- DWORD ul_reason_for_call, \ -- LPVOID lpReserved ) \ -+ BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID ) \ - { \ - return TRUE; \ - } \ -@@ -162,7 +160,7 @@ - // Unix - #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER) - #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ -- int main( int argc, char *argv[] ) \ -+ int main( int, char *[] ) \ - { \ - return 0; \ - } \ diff --git a/cppunit.spec b/cppunit.spec index 534add4..866103f 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,17 +1,14 @@ Name: cppunit -Version: 1.12.1 -Release: 17%{?dist} +Version: 1.13.2 +Release: 1%{?dist} Summary: C++ unit testing framework # no license in files License: LGPLv2+ -Url: http://cppunit.sourceforge.net/ -Source: http://downloads.sourceforge.net/cppunit/cppunit-%{version}.tar.gz +Url: https://www.freedesktop.org/wiki/Software/cppunit/ +Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz Patch0: cppunit-1.12.0-nolibdir.patch -Patch1: cppunit-msg.patch -#https://sourceforge.net/tracker/?func=detail&aid=2912630&group_id=11795&atid=311795 -Patch2: cppunit-warnings-sf2912630.patch -Patch3: cppunit-aarch64.patch +Patch1: 0001-Update-FSF-address-in-LGPL-license.patch BuildRequires: doxygen, graphviz @@ -39,25 +36,22 @@ the popular doxygen documentation generation tool. %prep %setup -q %patch0 -p1 -b .nolibdir +%patch1 -p1 -b .fsf-address for file in THANKS ChangeLog NEWS; do iconv -f latin1 -t utf8 < $file > ${file}.utf8 touch -c -r $file ${file}.utf8 mv ${file}.utf8 $file done -%patch1 -p1 -b .nomsg -%patch2 -p1 -b .warnings-sf2912630 -%patch3 -p1 -b .aarch64 %build -export LDFLAGS=-ldl -%configure --enable-doxygen --disable-static +%configure --enable-doxygen --disable-static --disable-silent-rules make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' rm $RPM_BUILD_ROOT%{_libdir}/*.la # remove double of doc -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/cppunit +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/cppunit $RPM_BUILD_ROOT%{_datadir}/%{name}/html # ensure that timestamp of cppunit-config is the same for all arches touch -c -r cppunit-config.in.nolibdir $RPM_BUILD_ROOT%{_bindir}/cppunit-config @@ -96,6 +90,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Sat Feb 13 2016 David Tardon - 1.13.2-1 +- switch to new upstream + * Wed Feb 03 2016 Fedora Release Engineering - 1.12.1-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 26c71ca..a405d9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd30e9cf5523cdfc019b94f5e1d7fd19 cppunit-1.12.1.tar.gz +d1c6bdd5a76c66d2c38331e2d287bc01 cppunit-1.13.2.tar.gz From c5a3ce0d4dad3b873f5e79d9f5cc7dbc9b0fb0e2 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 13 Feb 2016 08:56:36 +0100 Subject: [PATCH 23/70] use separate lines for BuildRequires --- cppunit.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 866103f..afcc402 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -10,7 +10,8 @@ Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz Patch0: cppunit-1.12.0-nolibdir.patch Patch1: 0001-Update-FSF-address-in-LGPL-license.patch -BuildRequires: doxygen, graphviz +BuildRequires: doxygen +BuildRequires: graphviz %description CppUnit is the C++ port of the famous JUnit framework for unit testing. From 3e625ca323923c13d92eb907ebe118308c4ac6c1 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 13 Feb 2016 08:57:36 +0100 Subject: [PATCH 24/70] why on Earth would -devel need automake? --- cppunit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index afcc402..892fd99 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -20,7 +20,7 @@ tests. %package devel Summary: Libraries and headers for cppunit development -Requires: pkgconfig, automake +Requires: pkgconfig Requires: %{name} = %{version}-%{release} %description devel From 3ac81b771844d3e614e33d41f87c494704338320 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 13 Feb 2016 08:57:58 +0100 Subject: [PATCH 25/70] Requires: pkgconfig is auto-generated --- cppunit.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 892fd99..3517241 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -20,7 +20,6 @@ tests. %package devel Summary: Libraries and headers for cppunit development -Requires: pkgconfig Requires: %{name} = %{version}-%{release} %description devel From c2bb421a6f1c3e4a5708ee727195a800a4741b31 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 13 Feb 2016 08:59:06 +0100 Subject: [PATCH 26/70] remove rpaths --- cppunit.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cppunit.spec b/cppunit.spec index 3517241..f0f0bd2 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -45,6 +45,10 @@ done %build %configure --enable-doxygen --disable-static --disable-silent-rules +sed -i \ + -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ + -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ + libtool make %{?_smp_mflags} %install From 18c0540380c6e7546f635b9eff0f0318ccb114d6 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 13 Feb 2016 09:18:22 +0100 Subject: [PATCH 27/70] ensure no unexpected soname change sneaks in --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index f0f0bd2..8188320 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,3 +1,5 @@ +%global apiversion 1.13 + Name: cppunit Version: 1.13.2 Release: 1%{?dist} @@ -78,7 +80,8 @@ mv __dist-examples __dist-examples-dir/examples %doc AUTHORS NEWS README THANKS ChangeLog TODO BUGS doc/FAQ %license COPYING %{_bindir}/DllPlugInTester -%{_libdir}/libcppunit*.so.* +%{_libdir}/libcppunit-%{apiversion}.so.0 +%{_libdir}/libcppunit-%{apiversion}.so.0.* %files devel %{_bindir}/cppunit-config From 640b7fe6e058a7856add710991cbec4887003131 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 13 Feb 2016 09:52:40 +0100 Subject: [PATCH 28/70] get sources from subdir --- cppunit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 8188320..689e980 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -8,7 +8,7 @@ Summary: C++ unit testing framework # no license in files License: LGPLv2+ Url: https://www.freedesktop.org/wiki/Software/cppunit/ -Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz +Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.gz Patch0: cppunit-1.12.0-nolibdir.patch Patch1: 0001-Update-FSF-address-in-LGPL-license.patch From b45c7357ae9a109ebc87cf0faaa4cf31081e5e30 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 13 Feb 2016 13:05:50 +0100 Subject: [PATCH 29/70] use %autosetup --- cppunit.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cppunit.spec b/cppunit.spec index 689e980..5fb5f70 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -36,9 +36,7 @@ The cppunit-doc package contains HTML formatted API documention generated by the popular doxygen documentation generation tool. %prep -%setup -q -%patch0 -p1 -b .nolibdir -%patch1 -p1 -b .fsf-address +%autosetup -p1 for file in THANKS ChangeLog NEWS; do iconv -f latin1 -t utf8 < $file > ${file}.utf8 touch -c -r $file ${file}.utf8 From 178f2e9af88cd6e9170ac9eca57b65b18cd3f8fc Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 13 Feb 2016 13:06:27 +0100 Subject: [PATCH 30/70] drop obsolete cppunit-config --- cppunit.spec | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/cppunit.spec b/cppunit.spec index 5fb5f70..19cd9f5 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,15 +2,14 @@ Name: cppunit Version: 1.13.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ unit testing framework # no license in files License: LGPLv2+ Url: https://www.freedesktop.org/wiki/Software/cppunit/ Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.gz -Patch0: cppunit-1.12.0-nolibdir.patch -Patch1: 0001-Update-FSF-address-in-LGPL-license.patch +Patch0: 0001-Update-FSF-address-in-LGPL-license.patch BuildRequires: doxygen BuildRequires: graphviz @@ -56,9 +55,8 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' rm $RPM_BUILD_ROOT%{_libdir}/*.la # remove double of doc rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/cppunit $RPM_BUILD_ROOT%{_datadir}/%{name}/html - -# ensure that timestamp of cppunit-config is the same for all arches -touch -c -r cppunit-config.in.nolibdir $RPM_BUILD_ROOT%{_bindir}/cppunit-config +# remove unused cppunit-config +rm -f $RPM_BUILD_ROOT%{_bindir}/cppunit-config $RPM_BUILD_ROOT%{_mandir}/man1/cppunit-config.1* $RPM_BUILD_ROOT%{_datadir}/aclocal/cppunit.m4 # clean up examples rm -rf __dist-examples __dist-examples-dir @@ -82,11 +80,8 @@ mv __dist-examples __dist-examples-dir/examples %{_libdir}/libcppunit-%{apiversion}.so.0.* %files devel -%{_bindir}/cppunit-config %{_includedir}/cppunit %{_libdir}/libcppunit.so -%{_datadir}/aclocal/cppunit.m4 -%{_mandir}/man1/cppunit-config.1* %{_libdir}/pkgconfig/cppunit.pc %files doc @@ -95,6 +90,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Sat Feb 13 2016 David Tardon - 1.13.2-2 +- drop obsolete cppunit-config + * Sat Feb 13 2016 David Tardon - 1.13.2-1 - switch to new upstream From ba4d8933b81fe1ca65bc22ef051be92a9b631702 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 13 Feb 2016 13:08:24 +0100 Subject: [PATCH 31/70] ChangeLog is for devs --- cppunit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cppunit.spec b/cppunit.spec index 19cd9f5..f2938eb 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -36,7 +36,7 @@ the popular doxygen documentation generation tool. %prep %autosetup -p1 -for file in THANKS ChangeLog NEWS; do +for file in THANKS NEWS; do iconv -f latin1 -t utf8 < $file > ${file}.utf8 touch -c -r $file ${file}.utf8 mv ${file}.utf8 $file @@ -73,7 +73,7 @@ mv __dist-examples __dist-examples-dir/examples %postun -p /sbin/ldconfig %files -%doc AUTHORS NEWS README THANKS ChangeLog TODO BUGS doc/FAQ +%doc AUTHORS NEWS README THANKS TODO BUGS doc/FAQ %license COPYING %{_bindir}/DllPlugInTester %{_libdir}/libcppunit-%{apiversion}.so.0 From 6db10f4c8625d55523a1fcefbfe697122066d1b3 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 13 Feb 2016 13:11:25 +0100 Subject: [PATCH 32/70] replace charset conv. by upstream patch --- 0001-convert-to-UTF-8.patch | 43 +++++++++++++++++++++++++++++++++++++ cppunit.spec | 6 +----- 2 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 0001-convert-to-UTF-8.patch diff --git a/0001-convert-to-UTF-8.patch b/0001-convert-to-UTF-8.patch new file mode 100644 index 0000000..e478a6b --- /dev/null +++ b/0001-convert-to-UTF-8.patch @@ -0,0 +1,43 @@ +From a691504d5fb8fada5343252d3ce5bd147c677e50 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Sat, 13 Feb 2016 12:52:56 +0100 +Subject: [PATCH] convert to UTF-8 + +--- + NEWS | 2 +- + THANKS | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/NEWS b/NEWS +index b3c4c19..65dd5d8 100644 +--- a/NEWS ++++ b/NEWS +@@ -164,7 +164,7 @@ + Win32DynamicLibraryManager.cpp. + + - MinGW, cygwin: enable build of shared library when using libtool. +- patch #1194394 contributed by Stéphane Fillod. ++ patch #1194394 contributed by Stéphane Fillod. + + - autotool: applied patch #1076398 contributed by Henner Sudek. Quote: + "This patch allows AM_PATH_CPPUNIT to accept version +diff --git a/THANKS b/THANKS +index 89cfa9c..331f916 100644 +--- a/THANKS ++++ b/THANKS +@@ -14,10 +14,10 @@ Lavoie Philippe + Pavel Zabelin + Marco Welti + Thomas Neidhart +-Hans Bühler (Dynamic Window library used by MFC UI) ++Hans Bühler (Dynamic Window library used by MFC UI) + John Sisson + Steven Mitter + Stephan Stapel + Abdessattar Sassi (hp-ux plug-in support) + Max Quatember and Andreas Pfaffenbichler (VC++ 7 MFC TestRunner go to source line) +-Vincent Rivière ++Vincent Rivière +-- +2.5.0 + diff --git a/cppunit.spec b/cppunit.spec index f2938eb..3515621 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -10,6 +10,7 @@ License: LGPLv2+ Url: https://www.freedesktop.org/wiki/Software/cppunit/ Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.gz Patch0: 0001-Update-FSF-address-in-LGPL-license.patch +Patch1: 0001-convert-to-UTF-8.patch BuildRequires: doxygen BuildRequires: graphviz @@ -36,11 +37,6 @@ the popular doxygen documentation generation tool. %prep %autosetup -p1 -for file in THANKS NEWS; do - iconv -f latin1 -t utf8 < $file > ${file}.utf8 - touch -c -r $file ${file}.utf8 - mv ${file}.utf8 $file -done %build %configure --enable-doxygen --disable-static --disable-silent-rules From c0f9286546d7a76357966ad18a0373a2421ae747 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 13 Feb 2016 13:15:42 +0100 Subject: [PATCH 33/70] nitpick, use %{buildroot} --- cppunit.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cppunit.spec b/cppunit.spec index 3515621..a3b55bd 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -47,12 +47,12 @@ sed -i \ make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' -rm $RPM_BUILD_ROOT%{_libdir}/*.la +make install DESTDIR=%{buildroot} INSTALL='install -p' +rm %{buildroot}%{_libdir}/*.la # remove double of doc -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/cppunit $RPM_BUILD_ROOT%{_datadir}/%{name}/html +rm -rf %{buildroot}%{_datadir}/doc/cppunit %{buildroot}%{_datadir}/%{name}/html # remove unused cppunit-config -rm -f $RPM_BUILD_ROOT%{_bindir}/cppunit-config $RPM_BUILD_ROOT%{_mandir}/man1/cppunit-config.1* $RPM_BUILD_ROOT%{_datadir}/aclocal/cppunit.m4 +rm -f %{buildroot}%{_bindir}/cppunit-config %{buildroot}%{_mandir}/man1/cppunit-config.1* %{buildroot}%{_datadir}/aclocal/cppunit.m4 # clean up examples rm -rf __dist-examples __dist-examples-dir From 759d9640e34327033b76d1893c35d69fa9e38b3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 07:56:56 +0000 Subject: [PATCH 34/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index a3b55bd..aa30004 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,7 +2,7 @@ Name: cppunit Version: 1.13.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ unit testing framework # no license in files @@ -86,6 +86,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.13.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sat Feb 13 2016 David Tardon - 1.13.2-2 - drop obsolete cppunit-config From e73ee23f779574ac0829607bdb3370ebead79376 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 2 May 2017 21:55:25 +0200 Subject: [PATCH 35/70] new upstream release 1.14.0 --- .gitignore | 1 + 0001-Update-FSF-address-in-LGPL-license.patch | 28 ------------ 0001-convert-to-UTF-8.patch | 43 ------------------- cppunit.spec | 14 +++--- sources | 2 +- 5 files changed, 9 insertions(+), 79 deletions(-) delete mode 100644 0001-Update-FSF-address-in-LGPL-license.patch delete mode 100644 0001-convert-to-UTF-8.patch diff --git a/.gitignore b/.gitignore index 0c7cb07..e87ed69 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ cppunit-1.12.1.tar.gz cppunit-1.12.1.tar.gz cppunit-1.13.2.tar.gz +/cppunit-1.14.0.tar.gz diff --git a/0001-Update-FSF-address-in-LGPL-license.patch b/0001-Update-FSF-address-in-LGPL-license.patch deleted file mode 100644 index d257221..0000000 --- a/0001-Update-FSF-address-in-LGPL-license.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1cebdfc97b39961c2df68e84996f667d529eafc7 Mon Sep 17 00:00:00 2001 -From: Thorsten Behrens -Date: Tue, 12 Nov 2013 08:59:19 +0100 -Subject: [PATCH] Update FSF address in LGPL license. - -Since rpmlint was bitching, and indeed -http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt features a -new address. ---- - COPYING | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/COPYING b/COPYING -index b1e3f5a..0a41847 100644 ---- a/COPYING -+++ b/COPYING -@@ -2,7 +2,7 @@ - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. -- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - --- -2.5.0 - diff --git a/0001-convert-to-UTF-8.patch b/0001-convert-to-UTF-8.patch deleted file mode 100644 index e478a6b..0000000 --- a/0001-convert-to-UTF-8.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a691504d5fb8fada5343252d3ce5bd147c677e50 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Sat, 13 Feb 2016 12:52:56 +0100 -Subject: [PATCH] convert to UTF-8 - ---- - NEWS | 2 +- - THANKS | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/NEWS b/NEWS -index b3c4c19..65dd5d8 100644 ---- a/NEWS -+++ b/NEWS -@@ -164,7 +164,7 @@ - Win32DynamicLibraryManager.cpp. - - - MinGW, cygwin: enable build of shared library when using libtool. -- patch #1194394 contributed by Stéphane Fillod. -+ patch #1194394 contributed by Stéphane Fillod. - - - autotool: applied patch #1076398 contributed by Henner Sudek. Quote: - "This patch allows AM_PATH_CPPUNIT to accept version -diff --git a/THANKS b/THANKS -index 89cfa9c..331f916 100644 ---- a/THANKS -+++ b/THANKS -@@ -14,10 +14,10 @@ Lavoie Philippe - Pavel Zabelin - Marco Welti - Thomas Neidhart --Hans Bühler (Dynamic Window library used by MFC UI) -+Hans Bühler (Dynamic Window library used by MFC UI) - John Sisson - Steven Mitter - Stephan Stapel - Abdessattar Sassi (hp-ux plug-in support) - Max Quatember and Andreas Pfaffenbichler (VC++ 7 MFC TestRunner go to source line) --Vincent Rivière -+Vincent Rivière --- -2.5.0 - diff --git a/cppunit.spec b/cppunit.spec index aa30004..b7f1425 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,16 +1,14 @@ -%global apiversion 1.13 +%global apiversion 1.14 Name: cppunit -Version: 1.13.2 -Release: 3%{?dist} +Version: 1.14.0 +Release: 1%{?dist} Summary: C++ unit testing framework # no license in files License: LGPLv2+ Url: https://www.freedesktop.org/wiki/Software/cppunit/ -Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.gz -Patch0: 0001-Update-FSF-address-in-LGPL-license.patch -Patch1: 0001-convert-to-UTF-8.patch +Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz BuildRequires: doxygen BuildRequires: graphviz @@ -60,7 +58,6 @@ cp -a examples __dist-examples make -C __dist-examples distclean # Makefile.am files are left as documentation find __dist-examples \( -name Makefile.in -o -name .cvsignore -o -name '*.dsw' -o -name '*.dsp' \) -exec rm {} \; -chmod a-x __dist-examples/qt/run.bat mkdir __dist-examples-dir mv __dist-examples __dist-examples-dir/examples @@ -86,6 +83,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Tue May 02 2017 David Tardon - 1.14.0-1 +- new upstream release + * Fri Feb 10 2017 Fedora Release Engineering - 1.13.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index a405d9c..7e7d5fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1c6bdd5a76c66d2c38331e2d287bc01 cppunit-1.13.2.tar.gz +SHA512 (cppunit-1.14.0.tar.gz) = 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e From fb35d7bfcc443f560f7b91249167d4f9dc53c460 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 05:35:31 +0000 Subject: [PATCH 36/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index b7f1425..8c2af79 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,7 +2,7 @@ Name: cppunit Version: 1.14.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ unit testing framework # no license in files @@ -83,6 +83,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.14.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue May 02 2017 David Tardon - 1.14.0-1 - new upstream release From f860376f7b8c8fbc4f5fd86532b2a4450e993065 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 19:13:53 +0000 Subject: [PATCH 37/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 8c2af79..af6d158 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,7 +2,7 @@ Name: cppunit Version: 1.14.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ unit testing framework # no license in files @@ -83,6 +83,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.14.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.14.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 904fe72f081c05237a962bbaaad582bf846e1b0f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 05:51:21 +0000 Subject: [PATCH 38/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index af6d158..227e725 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,7 +2,7 @@ Name: cppunit Version: 1.14.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ unit testing framework # no license in files @@ -83,6 +83,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.14.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 1.14.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 19ca7014c5b6fe2ec20fb9832fbee84434285037 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 19 Feb 2018 12:58:16 +0100 Subject: [PATCH 39/70] add build dependency on gcc --- cppunit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/cppunit.spec b/cppunit.spec index 227e725..b2cb917 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -11,6 +11,7 @@ Url: https://www.freedesktop.org/wiki/Software/cppunit/ Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz BuildRequires: doxygen +BuildRequires: gcc-c++ BuildRequires: graphviz %description From a6e107e673077583432cfedd5244360de4e901a9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 28 Jun 2018 11:53:10 -0500 Subject: [PATCH 40/70] use %make_build %make_install %ldconfig_scriptlets -devel: tighten dep on main pkg with %_isa --- cppunit.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/cppunit.spec b/cppunit.spec index b2cb917..46cc0e6 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,7 +2,7 @@ Name: cppunit Version: 1.14.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ unit testing framework # no license in files @@ -21,7 +21,7 @@ tests. %package devel Summary: Libraries and headers for cppunit development -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package contains the libraries and headers necessary for developing @@ -43,10 +43,12 @@ sed -i \ -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ libtool -make %{?_smp_mflags} + +%make_build %install -make install DESTDIR=%{buildroot} INSTALL='install -p' +%make_install + rm %{buildroot}%{_libdir}/*.la # remove double of doc rm -rf %{buildroot}%{_datadir}/doc/cppunit %{buildroot}%{_datadir}/%{name}/html @@ -62,9 +64,8 @@ find __dist-examples \( -name Makefile.in -o -name .cvsignore -o -name '*.dsw' - mkdir __dist-examples-dir mv __dist-examples __dist-examples-dir/examples -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %doc AUTHORS NEWS README THANKS TODO BUGS doc/FAQ @@ -84,6 +85,10 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Thu Jun 28 2018 Rex Dieter - 1.14.0-5 +- use %%make_build %%make_install %%ldconfig_scriptlets +- -devel: tighten dep on main pkg with %%_isa + * Wed Feb 07 2018 Fedora Release Engineering - 1.14.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 0f840459232a9bc579a7d9c4fce283b996c540b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 22:18:53 +0000 Subject: [PATCH 41/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 46cc0e6..f85a2eb 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,7 +2,7 @@ Name: cppunit Version: 1.14.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C++ unit testing framework # no license in files @@ -85,6 +85,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.14.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Jun 28 2018 Rex Dieter - 1.14.0-5 - use %%make_build %%make_install %%ldconfig_scriptlets - -devel: tighten dep on main pkg with %%_isa From 7f6d5e48f975e7f0c84982890a8c6085a43b4bb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 16:22:36 +0000 Subject: [PATCH 42/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index f85a2eb..d3e3309 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,7 +2,7 @@ Name: cppunit Version: 1.14.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: C++ unit testing framework # no license in files @@ -85,6 +85,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.14.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 1.14.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 4f6ea1131dc2b779bf77bc641b007834f754e5f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 21:07:43 +0000 Subject: [PATCH 43/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index d3e3309..3342757 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,7 +2,7 @@ Name: cppunit Version: 1.14.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: C++ unit testing framework # no license in files @@ -85,6 +85,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.14.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.14.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From a75d37d279a9112ddae71352aa1ee686414c9402 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 21 Dec 2019 11:05:22 +0100 Subject: [PATCH 44/70] new upstream release 1.15.0 --- .gitignore | 1 + cppunit.spec | 13 +++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index e87ed69..3903180 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ cppunit-1.12.1.tar.gz cppunit-1.12.1.tar.gz cppunit-1.13.2.tar.gz /cppunit-1.14.0.tar.gz +/cppunit-1.15.0.tar.gz diff --git a/cppunit.spec b/cppunit.spec index 3342757..a088c8d 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,8 +1,8 @@ -%global apiversion 1.14 +%global apiversion 1.15 Name: cppunit -Version: 1.14.0 -Release: 8%{?dist} +Version: 1.15.0 +Release: 1%{?dist} Summary: C++ unit testing framework # no license in files @@ -52,15 +52,13 @@ sed -i \ rm %{buildroot}%{_libdir}/*.la # remove double of doc rm -rf %{buildroot}%{_datadir}/doc/cppunit %{buildroot}%{_datadir}/%{name}/html -# remove unused cppunit-config -rm -f %{buildroot}%{_bindir}/cppunit-config %{buildroot}%{_mandir}/man1/cppunit-config.1* %{buildroot}%{_datadir}/aclocal/cppunit.m4 # clean up examples rm -rf __dist-examples __dist-examples-dir cp -a examples __dist-examples make -C __dist-examples distclean # Makefile.am files are left as documentation -find __dist-examples \( -name Makefile.in -o -name .cvsignore -o -name '*.dsw' -o -name '*.dsp' \) -exec rm {} \; +find __dist-examples \( -name Makefile.in -o -name .gitignore -o -name '*.dsw' -o -name '*.dsp' -o -name '*.opt' -o -name '*.sln' -o -name '*.vcproj' \) -exec rm {} \; mkdir __dist-examples-dir mv __dist-examples __dist-examples-dir/examples @@ -85,6 +83,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Sat Dec 21 2019 David Tardon - 1.15.0-1 +- new upstream release + * Wed Jul 24 2019 Fedora Release Engineering - 1.14.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 7e7d5fe..e1d27e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cppunit-1.14.0.tar.gz) = 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e +SHA512 (cppunit-1.15.0.tar.gz) = 2ee90c5317f9480020095896b38e470ab8a63ab9b695db479f1b37512570fed37a271c3259004c9ce92b4fb051d37e1aa3bae55ec30c80d97041c59d2a257810 From 28991ff392b0e4639f7e054893e4dec3202a1a03 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 25 Dec 2019 10:15:04 +0100 Subject: [PATCH 45/70] drop unused patches --- cppunit-1.12.0-nolibdir.patch | 13 - cppunit-aarch64.patch | 1576 --------------------------------- 2 files changed, 1589 deletions(-) delete mode 100644 cppunit-1.12.0-nolibdir.patch delete mode 100644 cppunit-aarch64.patch diff --git a/cppunit-1.12.0-nolibdir.patch b/cppunit-1.12.0-nolibdir.patch deleted file mode 100644 index 4786f13..0000000 --- a/cppunit-1.12.0-nolibdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up cppunit-1.12.0/cppunit-config.in.nolibdir cppunit-1.12.0/cppunit-config.in ---- cppunit-1.12.0/cppunit-config.in.nolibdir 2007-10-21 11:19:40.000000000 +0200 -+++ cppunit-1.12.0/cppunit-config.in 2007-10-21 11:20:01.000000000 +0200 -@@ -87,9 +87,6 @@ if test "$echo_cflags" = "yes"; then - fi - - if test "$echo_libs" = "yes"; then -- if test @libdir@ != /usr/lib ; then -- my_linker_flags="-L@libdir@" -- fi - echo ${my_linker_flags} -lcppunit @LIBADD_DL@ - fi - diff --git a/cppunit-aarch64.patch b/cppunit-aarch64.patch deleted file mode 100644 index 79597f0..0000000 --- a/cppunit-aarch64.patch +++ /dev/null @@ -1,1576 +0,0 @@ -diff -urN cppunit-1.12.1/config/config.guess cppunit-1.12.1-aarch64/config/config.guess ---- cppunit-1.12.1/config/config.guess 2008-02-17 14:10:30.000000000 -0600 -+++ cppunit-1.12.1-aarch64/config/config.guess 2013-03-07 21:45:17.103828925 -0600 -@@ -1,10 +1,10 @@ - #! /bin/sh - # 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 --# Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2008-01-23' -+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 -@@ -27,16 +25,16 @@ - # the same distribution terms that you use for the rest of that program. - - --# Originally written by Per Bothner . --# Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# Originally written by Per Bothner. Please send patches (context -+# diff format) to and include a ChangeLog -+# entry. - # - # This script attempts to guess a canonical system name similar to - # config.sub. If it succeeds, it prints the system name on stdout, and - # exits with 0. Otherwise, it exits with 1. - # --# The plan is that this can be called by configure scripts if you --# don't specify an explicit build system type. -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -56,8 +54,9 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+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." -@@ -144,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 -@@ -170,7 +169,7 @@ - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -- | grep __ELF__ >/dev/null -+ | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? -@@ -180,7 +179,7 @@ - fi - ;; - *) -- os=netbsd -+ os=netbsd - ;; - esac - # The OS release -@@ -201,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} -@@ -223,7 +226,7 @@ - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) -- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on -@@ -269,7 +272,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'` -- exit ;; -+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. -+ exitcode=$? -+ trap '' 0 -+ exit $exitcode ;; - 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 -@@ -295,12 +301,12 @@ - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) -- echo powerpc-ibm-os400 -+ echo powerpc-ibm-os400 - exit ;; - 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:*:*) -@@ -324,14 +330,33 @@ - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; -+ s390x:SunOS:*:*) -+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; -+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) -+ echo i386-pc-auroraux${UNAME_RELEASE} -+ exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) -- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ eval $set_cc_for_build -+ SUN_ARCH="i386" -+ # If there is a compiler, see if it is configured for 64-bit objects. -+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. -+ # This test works for both compilers. -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ SUN_ARCH="x86_64" -+ fi -+ fi -+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize -@@ -375,23 +400,23 @@ - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -- echo m68k-milan-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -- echo m68k-hades-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -- echo m68k-unknown-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; -@@ -461,8 +486,8 @@ - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) -- # DG/UX returns AViiON for all architectures -- UNAME_PROCESSOR=`/usr/bin/uname -p` -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -475,7 +500,7 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; -@@ -532,7 +557,7 @@ - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[456]) -+ *:AIX:*:[4567]) - 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 -@@ -575,52 +600,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` -- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -- case "${sc_cpu_version}" in -- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -- 532) # CPU_PA_RISC2_0 -- case "${sc_kernel_bits}" in -- 32) HP_ARCH="hppa2.0n" ;; -- 64) HP_ARCH="hppa2.0w" ;; -+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -+ case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -- esac ;; -- esac -+ esac ;; -+ esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -+ sed 's/^ //' << EOF >$dummy.c -+ -+ #define _HPUX_SOURCE -+ #include -+ #include -+ -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); - -- #define _HPUX_SOURCE -- #include -- #include -- -- int main () -- { -- #if defined(_SC_KERNEL_BITS) -- long bits = sysconf(_SC_KERNEL_BITS); -- #endif -- long cpu = sysconf (_SC_CPU_VERSION); -- -- switch (cpu) -- { -- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -- case CPU_PA_RISC2_0: -- #if defined(_SC_KERNEL_BITS) -- switch (bits) -- { -- case 64: puts ("hppa2.0w"); break; -- case 32: puts ("hppa2.0n"); break; -- default: puts ("hppa2.0"); break; -- } break; -- #else /* !defined(_SC_KERNEL_BITS) */ -- puts ("hppa2.0"); break; -- #endif -- default: puts ("hppa1.0"); break; -- } -- exit (0); -- } -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } - EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -640,7 +665,7 @@ - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -- grep __LP64__ >/dev/null -+ grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else -@@ -711,22 +736,22 @@ - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; -@@ -750,14 +775,14 @@ - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - 5000:UNIX_System_V:4.*:*) -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -@@ -769,34 +794,39 @@ - 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 -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; -- *:Interix*:[3456]*) -- case ${UNAME_MACHINE} in -+ *:Interix*:*) -+ case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; -- EM64T | authenticamd) -+ authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) -@@ -806,6 +836,9 @@ - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; -+ 8664:Windows_NT:*) -+ echo x86_64-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we -@@ -835,6 +868,27 @@ - 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 ;; -+ EV56) UNAME_MACHINE=alphaev56 ;; -+ PCA56) UNAME_MACHINE=alphapca56 ;; -+ PCA57) UNAME_MACHINE=alphapca56 ;; -+ EV6) UNAME_MACHINE=alphaev6 ;; -+ EV67) UNAME_MACHINE=alphaev67 ;; -+ EV68*) UNAME_MACHINE=alphaev68 ;; -+ esac -+ 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} -+ exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -@@ -842,20 +896,40 @@ - 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 -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -866,74 +940,33 @@ - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -- mips:Linux:*:*) -+ mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU -- #undef mips -- #undef mipsel -+ #undef ${UNAME_MACHINE} -+ #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mipsel -+ CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips -+ CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif - EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -- /^CPU/{ -- s: ::g -- p -- }'`" -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -- ;; -- mips64:Linux:*:*) -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #undef CPU -- #undef mips64 -- #undef mips64el -- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mips64el -- #else -- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips64 -- #else -- CPU= -- #endif -- #endif --EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -- /^CPU/{ -- s: ::g -- p -- }'`" -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) -- echo or32-unknown-linux-gnu -- exit ;; -- ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -- ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -+ padre:Linux:*:*) -+ echo sparc-unknown-linux-gnu - exit ;; -- alpha:Linux:*:*) -- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -- EV5) UNAME_MACHINE=alphaev5 ;; -- EV56) UNAME_MACHINE=alphaev56 ;; -- PCA56) UNAME_MACHINE=alphapca56 ;; -- PCA57) UNAME_MACHINE=alphapca56 ;; -- EV6) UNAME_MACHINE=alphaev6 ;; -- EV67) UNAME_MACHINE=alphaev67 ;; -- 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} -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level -@@ -943,14 +976,17 @@ - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; -- parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu -+ exit ;; -+ ppc:Linux:*:*) -+ echo powerpc-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -958,78 +994,18 @@ - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -+ tile*:Linux:*:*) -+ 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 -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -- i*86:Linux:*:*) -- # The BFD linker knows what the default object file format is, so -- # first see if it will tell us. cd to the root directory to prevent -- # problems with other programs or directories called `ld' in the path. -- # Set LC_ALL=C to ensure ld outputs messages in English. -- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ -- | sed -ne '/supported targets:/!d -- s/[ ][ ]*/ /g -- s/.*supported targets: *// -- s/ .*// -- p'` -- case "$ld_supported_targets" in -- elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -- ;; -- a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit ;; -- coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit ;; -- "") -- # Either a pre-BFD a.out linker (linux-gnuoldld) or -- # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit ;; -- esac -- # Determine whether the default compiler is a.out or elf -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include -- #ifdef __ELF__ -- # ifdef __GLIBC__ -- # if __GLIBC__ >= 2 -- LIBC=gnu -- # else -- LIBC=gnulibc1 -- # endif -- # else -- LIBC=gnulibc1 -- # endif -- #else -- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) -- LIBC=gnu -- #else -- LIBC=gnuaout -- #endif -- #endif -- #ifdef __dietlibc__ -- LIBC=dietlibc -- #endif --EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -- /^LIBC/{ -- s: ::g -- p -- }'`" -- test x"${LIBC}" != x && { -- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -- exit -- } -- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } -- ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both -@@ -1037,11 +1013,11 @@ - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) -- # Unixware is an offshoot of SVR4, but it has its own version -- # number series starting with 2... -- # I am not positive that other SVR4 systems won't match this, -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. -- # Use sysv4.2uw... so that sysv4* matches it. -+ # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) -@@ -1058,7 +1034,7 @@ - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) -@@ -1073,7 +1049,7 @@ - fi - exit ;; - i*86:*:5:[678]*) -- # UnixWare 7.x, OpenUNIX and OpenServer 6. -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; -@@ -1101,10 +1077,13 @@ - exit ;; - pc:*:*:*) - # Left here for compatibility: -- # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i386. -- echo i386-pc-msdosdjgpp -- exit ;; -+ # uname -m prints for DJGPP always 'pc', but it prints nothing about -+ # the processor, so we play safe by assuming i586. -+ # Note: whatever this is, it MUST be the same as what config.sub -+ # prints for the "djgpp" host, or else GDB configury will decide that -+ # this is a cross-build. -+ echo i586-pc-msdosdjgpp -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; -@@ -1139,8 +1118,18 @@ - /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:*) -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && { echo i486-ncr-sysv4; exit; } ;; -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4; exit; } ;; -+ NCR*:*:4.2:* | MPRAS*:*:4.2:*) -+ OS_REL='.3' -+ test -r /etc/.relid \ -+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; -@@ -1153,7 +1142,7 @@ - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; -- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) -@@ -1173,10 +1162,10 @@ - echo ns32k-sni-sysv - fi - exit ;; -- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says -- echo i586-unisys-sysv4 -- exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says -+ echo i586-unisys-sysv4 -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm -@@ -1202,11 +1191,11 @@ - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then -- echo mips-nec-sysv${UNAME_RELEASE} -+ echo mips-nec-sysv${UNAME_RELEASE} - else -- echo mips-unknown-sysv${UNAME_RELEASE} -+ echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; -@@ -1216,6 +1205,12 @@ - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; -+ 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 ;; -@@ -1243,6 +1238,16 @@ - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in -+ i386) -+ eval $set_cc_for_build -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ UNAME_PROCESSOR="x86_64" -+ fi -+ fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -@@ -1258,7 +1263,10 @@ - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; -- NSE-?:NONSTOP_KERNEL:*:*) -+ NEO-?:NONSTOP_KERNEL:*:*) -+ echo neo-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) -@@ -1303,13 +1311,13 @@ - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) -- echo mips-sei-seiux${UNAME_RELEASE} -+ echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) -- UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; -@@ -1324,11 +1332,14 @@ - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; -+ 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 < - printf ("m68k-sony-newsos%s\n", - #ifdef NEWSOS4 -- "4" -+ "4" - #else -- "" -+ "" - #endif -- ); exit (0); -+ ); exit (0); - #endif - #endif - -diff -urN cppunit-1.12.1/config/config.sub cppunit-1.12.1-aarch64/config/config.sub ---- cppunit-1.12.1/config/config.sub 2008-02-17 14:10:30.000000000 -0600 -+++ cppunit-1.12.1-aarch64/config/config.sub 2013-03-07 21:45:17.143824323 -0600 -@@ -1,10 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 --# Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2008-01-16' -+timestamp='2012-10-10' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -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 . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -32,13 +30,16 @@ - - - # Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# diff and a properly formatted GNU ChangeLog entry. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. - # If it is invalid, we print an error message on stderr and exit with code 1. - # Otherwise, we print the canonical config type on stdout and succeed. - -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD -+ - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases - # that are meaningful with *any* GNU software. -@@ -72,8 +73,9 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+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." -@@ -120,12 +122,18 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -+ 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 ] -@@ -148,10 +156,13 @@ - -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) -+ -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; -+ -bluegene*) -+ os=-cnk -+ ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 -@@ -166,10 +177,10 @@ - os=-chorusos - basic_machine=$1 - ;; -- -chorusrdb) -- os=-chorusrdb -+ -chorusrdb) -+ os=-chorusrdb - basic_machine=$1 -- ;; -+ ;; - -hiux*) - os=-hiuxwe2 - ;; -@@ -214,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 - ;; -@@ -238,24 +255,32 @@ - # 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 \ -+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -- | mips64vr | mips64vrel \ -+ | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ -@@ -268,29 +293,42 @@ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ -+ | moxie \ - | mt \ - | msp430 \ -+ | nds32 | nds32le | nds32be \ - | nios | nios2 \ - | ns16k | ns32k \ -+ | open8 \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ -+ | rl78 | rx \ - | score \ -- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -+ | 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 | tic80 | tron \ -- | v850 | v850e \ -+ | spu \ -+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ -+ | ubicom32 \ -+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ -- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -- | z8k) -+ | x86 | xc16x | xstormy16 | xtensa \ -+ | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12) -- # Motorola 68HC11/12. -+ c54x) -+ basic_machine=tic54x-unknown -+ ;; -+ c55x) -+ basic_machine=tic55x-unknown -+ ;; -+ c6x) -+ basic_machine=tic6x-unknown -+ ;; -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; -@@ -300,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. -@@ -314,29 +367,37 @@ - # 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-* \ - | 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-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -+ | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -- | mips64vr-* | mips64vrel-* \ -+ | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ -+ | mips64r5900-* | mips64r5900el-* \ -+ | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ -@@ -351,27 +412,32 @@ - | mmix-* \ - | mt-* \ - | msp430-* \ -+ | 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-* \ -- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ -+ | 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*-* \ - | tron-* \ -- | v850-* | v850e-* | vax-* \ -+ | ubicom32-* \ -+ | 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-*) -+ | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) -@@ -393,7 +459,7 @@ - basic_machine=a29k-amd - os=-udi - ;; -- abacus) -+ abacus) - basic_machine=abacus-unknown - ;; - adobe68k) -@@ -439,6 +505,10 @@ - basic_machine=m68k-apollo - os=-bsd - ;; -+ aros) -+ basic_machine=i386-pc -+ os=-aros -+ ;; - aux) - basic_machine=m68k-apple - os=-aux -@@ -455,10 +525,27 @@ - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; -+ bluegene*) -+ basic_machine=powerpc-ibm -+ os=-cnk -+ ;; -+ c54x-*) -+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c55x-*) -+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c6x-*) -+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; -+ cegcc) -+ basic_machine=arm-unknown -+ os=-cegcc -+ ;; - convex-c1) - basic_machine=c1-convex - os=-bsd -@@ -487,7 +574,7 @@ - basic_machine=craynv-cray - os=-unicosmp - ;; -- cr16) -+ cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; -@@ -526,6 +613,10 @@ - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ dicos) -+ basic_machine=i686-pc -+ os=-dicos -+ ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp -@@ -641,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 -@@ -699,6 +789,13 @@ - basic_machine=ns32k-utek - os=-sysv - ;; -+ microblaze*) -+ basic_machine=microblaze-xilinx -+ ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ os=-mingw64 -+ ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 -@@ -735,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 -@@ -803,6 +908,12 @@ - np1) - basic_machine=np1-gould - ;; -+ neo-tandem) -+ basic_machine=neo-tandem -+ ;; -+ nse-tandem) -+ basic_machine=nse-tandem -+ ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; -@@ -885,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 -@@ -981,6 +1093,9 @@ - basic_machine=i860-stratus - os=-sysv4 - ;; -+ strongarm-* | thumb-*) -+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - sun2) - basic_machine=m68000-sun - ;; -@@ -1037,20 +1152,8 @@ - basic_machine=t90-cray - os=-unicos - ;; -- tic54x | c54x*) -- basic_machine=tic54x-unknown -- os=-coff -- ;; -- tic55x | c55x*) -- basic_machine=tic55x-unknown -- os=-coff -- ;; -- tic6x | c6x*) -- basic_machine=tic6x-unknown -- os=-coff -- ;; - tile*) -- basic_machine=tile-unknown -+ basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) -@@ -1120,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 -@@ -1128,6 +1234,10 @@ - basic_machine=z8k-unknown - os=-sim - ;; -+ z80-*-coff) -+ basic_machine=z80-unknown -+ os=-sim -+ ;; - none) - basic_machine=none-none - os=-none -@@ -1166,7 +1276,7 @@ - we32k) - basic_machine=we32k-att - ;; -- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) -+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) -@@ -1213,9 +1323,12 @@ - if [ x"$os" != x"" ] - then - case $os in -- # First match some system type aliases -- # that might get confused with valid system types. -+ # First match some system type aliases -+ # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -+ -auroraux) -+ os=-auroraux -+ ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; -@@ -1236,21 +1349,23 @@ - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ -- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ -+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ -+ | -sym* | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -- | -aos* \ -+ | -aos* | -aros* \ - | -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* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -chorusos* | -chorusrdb* | -cegcc* \ -+ | -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* \ -@@ -1258,7 +1373,7 @@ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1297,7 +1412,7 @@ - -opened*) - os=-openedition - ;; -- -os400*) -+ -os400*) - os=-os400 - ;; - -wince*) -@@ -1346,7 +1461,7 @@ - -sinix*) - os=-sysv4 - ;; -- -tpf*) -+ -tpf*) - os=-tpf - ;; - -triton*) -@@ -1388,6 +1503,11 @@ - -zvmoe) - os=-zvmoe - ;; -+ -dicos*) -+ os=-dicos -+ ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1410,10 +1530,10 @@ - # system, and we'll never get to this point. - - case $basic_machine in -- score-*) -+ score-*) - os=-elf - ;; -- spu-*) -+ spu-*) - os=-elf - ;; - *-acorn) -@@ -1425,8 +1545,20 @@ - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; -+ hexagon-*) -+ os=-elf -+ ;; -+ tic54x-*) -+ os=-coff -+ ;; -+ tic55x-*) -+ os=-coff -+ ;; -+ tic6x-*) -+ os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) -@@ -1446,14 +1578,11 @@ - ;; - m68000-sun) - os=-sunos3 -- # This also exists in the configure program, but was not the -- # default. -- # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; -- mep-*) -+ mep-*) - os=-elf - ;; - mips*-cisco) -@@ -1480,7 +1609,7 @@ - *-ibm) - os=-aix - ;; -- *-knuth) -+ *-knuth) - os=-mmixware - ;; - *-wec) -@@ -1585,7 +1714,7 @@ - -sunos*) - vendor=sun - ;; -- -aix*) -+ -cnk*|-aix*) - vendor=ibm - ;; - -beos*) From 904ab9d8554a9422ab6aa1fdc8bf2b098c54b188 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 25 Dec 2019 10:12:54 +0100 Subject: [PATCH 46/70] new upstream release 1.15.1 --- .gitignore | 1 + cppunit.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3903180..f28941f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ cppunit-1.12.1.tar.gz cppunit-1.13.2.tar.gz /cppunit-1.14.0.tar.gz /cppunit-1.15.0.tar.gz +/cppunit-1.15.1.tar.gz diff --git a/cppunit.spec b/cppunit.spec index a088c8d..3a4925a 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,7 +1,7 @@ %global apiversion 1.15 Name: cppunit -Version: 1.15.0 +Version: 1.15.1 Release: 1%{?dist} Summary: C++ unit testing framework @@ -58,7 +58,7 @@ rm -rf __dist-examples __dist-examples-dir cp -a examples __dist-examples make -C __dist-examples distclean # Makefile.am files are left as documentation -find __dist-examples \( -name Makefile.in -o -name .gitignore -o -name '*.dsw' -o -name '*.dsp' -o -name '*.opt' -o -name '*.sln' -o -name '*.vcproj' \) -exec rm {} \; +find __dist-examples \( -name Makefile.in -o -name .gitignore -o -name '*.opt' -o -name '*.sln' -o -name '*.vcproj' \) -exec rm {} \; mkdir __dist-examples-dir mv __dist-examples __dist-examples-dir/examples @@ -69,8 +69,8 @@ mv __dist-examples __dist-examples-dir/examples %doc AUTHORS NEWS README THANKS TODO BUGS doc/FAQ %license COPYING %{_bindir}/DllPlugInTester -%{_libdir}/libcppunit-%{apiversion}.so.0 -%{_libdir}/libcppunit-%{apiversion}.so.0.* +%{_libdir}/libcppunit-%{apiversion}.so.1 +%{_libdir}/libcppunit-%{apiversion}.so.1.* %files devel %{_includedir}/cppunit @@ -83,6 +83,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Wed Dec 25 2019 David Tardon - 1.15.1-1 +- new upstream release + * Sat Dec 21 2019 David Tardon - 1.15.0-1 - new upstream release diff --git a/sources b/sources index e1d27e4..d35f7ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cppunit-1.15.0.tar.gz) = 2ee90c5317f9480020095896b38e470ab8a63ab9b695db479f1b37512570fed37a271c3259004c9ce92b4fb051d37e1aa3bae55ec30c80d97041c59d2a257810 +SHA512 (cppunit-1.15.1.tar.gz) = 0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691 From 3726984e9768234d267e1ecc867490d45058bb32 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 25 Dec 2019 21:19:23 +0100 Subject: [PATCH 47/70] try again --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 3a4925a..3994cb5 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,7 +2,7 @@ Name: cppunit Version: 1.15.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ unit testing framework # no license in files @@ -83,6 +83,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Wed Dec 25 2019 David Tardon - 1.15.1-2 +- try again + * Wed Dec 25 2019 David Tardon - 1.15.1-1 - new upstream release From 57d72f0b454bccba84e92356d742deaa29a11f53 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 14:56:28 +0000 Subject: [PATCH 48/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 3994cb5..ab3aa0a 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,7 +2,7 @@ Name: cppunit Version: 1.15.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ unit testing framework # no license in files @@ -83,6 +83,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.15.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Dec 25 2019 David Tardon - 1.15.1-2 - try again From d93745dc587f22f9330251657416d6b23864e943 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 14:40:28 +0000 Subject: [PATCH 49/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index ab3aa0a..db48d00 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,7 +2,7 @@ Name: cppunit Version: 1.15.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ unit testing framework # no license in files @@ -83,6 +83,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.15.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 1.15.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From b8c47403b001e0191981f95fc003aa5da8f8e217 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 03:57:28 +0000 Subject: [PATCH 50/70] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- cppunit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/cppunit.spec b/cppunit.spec index db48d00..24e2cc0 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -13,6 +13,7 @@ Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: graphviz +BuildRequires: make %description CppUnit is the C++ port of the famous JUnit framework for unit testing. From 9b0dbd2473d20852b8cc84d6eacc5eabcea88f05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 02:39:09 +0000 Subject: [PATCH 51/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 24e2cc0..981ac42 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,7 +2,7 @@ Name: cppunit Version: 1.15.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ unit testing framework # no license in files @@ -84,6 +84,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.15.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.15.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f805f0bc57b859fdd6e0ef2bcf95b22d1cfc8032 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 15:09:54 +0000 Subject: [PATCH 52/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From a024dea3e514b73863d4e89a303c4f60aeeb104f Mon Sep 17 00:00:00 2001 From: Edjunior Machado Date: Mon, 4 Oct 2021 14:38:18 +0200 Subject: [PATCH 53/70] Introduce CI gating #2 --- .fmf/version | 1 + gating.yaml | 19 ++++++ plans/ci.fmf | 6 ++ tests/Sanity/basic-test/Makefile | 63 ++++++++++++++++++++ tests/Sanity/basic-test/PURPOSE | 3 + tests/Sanity/basic-test/hello.cpp | 92 ++++++++++++++++++++++++++++++ tests/Sanity/basic-test/main.fmf | 14 +++++ tests/Sanity/basic-test/runtest.sh | 56 ++++++++++++++++++ 8 files changed, 254 insertions(+) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/ci.fmf create mode 100644 tests/Sanity/basic-test/Makefile create mode 100644 tests/Sanity/basic-test/PURPOSE create mode 100644 tests/Sanity/basic-test/hello.cpp create mode 100644 tests/Sanity/basic-test/main.fmf create mode 100755 tests/Sanity/basic-test/runtest.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..ce3cdc1 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,19 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} +--- !Policy +product_versions: + - rhel-8 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} +--- !Policy +product_versions: + - rhel-9 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..1ad2c12 --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,6 @@ +summary: CI Gating Plan +discover: + how: fmf + directory: tests +execute: + how: beakerlib diff --git a/tests/Sanity/basic-test/Makefile b/tests/Sanity/basic-test/Makefile new file mode 100644 index 0000000..7575c1a --- /dev/null +++ b/tests/Sanity/basic-test/Makefile @@ -0,0 +1,63 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /tools/cppunit/Sanity/basic-test +# Description: cppunit basic test +# Author: Edjunior Machado +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2021 Red Hat, Inc. +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the 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, see http://www.gnu.org/licenses/. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export TEST=/tools/cppunit/Sanity/basic-test +export TESTVERSION=1.0 + +BUILT_FILES= + +FILES=$(METADATA) runtest.sh Makefile PURPOSE hello.cpp + +.PHONY: all install download clean + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + test -x runtest.sh || chmod a+x runtest.sh + +clean: + rm -f *~ $(BUILT_FILES) + + +include /usr/share/rhts/lib/rhts-make.include + +$(METADATA): Makefile + @echo "Owner: Edjunior Machado " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: cppunit basic test" >> $(METADATA) + @echo "Type: Sanity" >> $(METADATA) + @echo "TestTime: 1h" >> $(METADATA) + @echo "RunFor: cppunit" >> $(METADATA) + @echo "Requires: gcc-c++ cppunit cppunit-devel" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2+" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/Sanity/basic-test/PURPOSE b/tests/Sanity/basic-test/PURPOSE new file mode 100644 index 0000000..82f79dd --- /dev/null +++ b/tests/Sanity/basic-test/PURPOSE @@ -0,0 +1,3 @@ +PURPOSE of /tools/cppunit/Sanity/basic-test +Description: cppunit basic test +Author: Edjunior Machado diff --git a/tests/Sanity/basic-test/hello.cpp b/tests/Sanity/basic-test/hello.cpp new file mode 100644 index 0000000..51fdecd --- /dev/null +++ b/tests/Sanity/basic-test/hello.cpp @@ -0,0 +1,92 @@ +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace std; + +class Math +{ +public: + int Addition (int x, int y); +}; + +int +Math::Addition (int x, int y) +{ + return (x + y); +} + +class Test:public + CPPUNIT_NS::TestCase +{ + CPPUNIT_TEST_SUITE (Test); + CPPUNIT_TEST (testAddition); + CPPUNIT_TEST_SUITE_END (); + +public: + void + setUp (void); + void + tearDown (void); + +protected: + void + testAddition (void); + +private: + Math * + mTestObj; +}; + +void +Test::testAddition (void) +{ + CPPUNIT_ASSERT (5 == mTestObj->Addition (2, 3)); +} + +void +Test::setUp (void) +{ + mTestObj = new Math (); +} + +void +Test::tearDown (void) +{ + delete mTestObj; +} + +CPPUNIT_TEST_SUITE_REGISTRATION (Test); + +int +main (int ac, char **av) +{ + CPPUNIT_NS::TestResult controller; + + CPPUNIT_NS::TestResultCollector result; + controller.addListener (&result); + + CPPUNIT_NS::BriefTestProgressListener progress; + controller.addListener (&progress); + + CPPUNIT_NS::TestRunner runner; + runner. + addTest (CPPUNIT_NS::TestFactoryRegistry::getRegistry ().makeTest ()); + runner.run (controller); + + CPPUNIT_NS::CompilerOutputter compileroutputter (&result, std::cerr); + compileroutputter.write (); + + ofstream xmlFileOut ("output.xml"); + CPPUNIT_NS::XmlOutputter xmlOut (&result, xmlFileOut); + xmlOut.write (); + + return result.wasSuccessful ()? 0 : 1; +} diff --git a/tests/Sanity/basic-test/main.fmf b/tests/Sanity/basic-test/main.fmf new file mode 100644 index 0000000..0c92a73 --- /dev/null +++ b/tests/Sanity/basic-test/main.fmf @@ -0,0 +1,14 @@ +summary: cppunit basic test +description: '' +contact: Edjunior Machado +component: + - cppunit +test: ./runtest.sh +framework: beakerlib +recommend: + - gcc-c++ + - cppunit + - cppunit-devel +duration: 1h +extra-summary: /tools/cppunit/Sanity/basic-test +extra-task: /tools/cppunit/Sanity/basic-test diff --git a/tests/Sanity/basic-test/runtest.sh b/tests/Sanity/basic-test/runtest.sh new file mode 100755 index 0000000..4d9e0aa --- /dev/null +++ b/tests/Sanity/basic-test/runtest.sh @@ -0,0 +1,56 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /tools/cppunit/Sanity/basic-test +# Description: cppunit basic test +# Author: Edjunior Machado +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2021 Red Hat, Inc. +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the 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, see http://www.gnu.org/licenses/. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include Beaker environment +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +PACKAGE="cppunit" + +rlJournalStart + rlPhaseStartSetup + rlAssertRpm $PACKAGE + rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" + rlRun "cp hello.cpp $TmpDir" + rlRun "pushd $TmpDir" + rlPhaseEnd + + rlPhaseStartTest + rlRun "g++ -Wall -o hello hello.cpp -lcppunit" + rlAssertExists "hello" + rlRun "./hello > hello.log" + rlRun "cat hello.log" + rlAssertGrep 'Test::testAddition : OK' hello.log + rlRun "cat output.xml" + rlAssertGrep 'Test::testAddition' output.xml + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd From 2a7033404255c22ed93b3c9d37140adc95222d08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 23:56:06 +0000 Subject: [PATCH 54/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 981ac42..dcc266a 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,7 +2,7 @@ Name: cppunit Version: 1.15.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C++ unit testing framework # no license in files @@ -84,6 +84,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.15.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.15.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 9dd1edd4ea35b67e7dab7238087f0e418685cd6a Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 27 Jan 2022 19:18:45 +0100 Subject: [PATCH 55/70] Disable -Werror --- cppunit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index dcc266a..4ca7cf2 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -39,7 +39,7 @@ the popular doxygen documentation generation tool. %autosetup -p1 %build -%configure --enable-doxygen --disable-static --disable-silent-rules +%configure --enable-doxygen --disable-static --disable-silent-rules --disable-werror sed -i \ -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ From afbed4528baaf2ec54d5ea811e913b1de4fd692b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 23:41:04 +0000 Subject: [PATCH 56/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cppunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 4ca7cf2..6f74215 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,7 +2,7 @@ Name: cppunit Version: 1.15.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: C++ unit testing framework # no license in files @@ -84,6 +84,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.15.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 1.15.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f66f9ad8e1396dd2207e0469e85c319a0c96f8d7 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 21 Nov 2022 21:03:19 +0100 Subject: [PATCH 57/70] Convert license to SPDX --- cppunit.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cppunit.spec b/cppunit.spec index 6f74215..3ea5859 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,11 +2,11 @@ Name: cppunit Version: 1.15.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: C++ unit testing framework # no license in files -License: LGPLv2+ +License: LGPL-2.1-or-later Url: https://www.freedesktop.org/wiki/Software/cppunit/ Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz @@ -84,6 +84,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Mon Nov 21 2022 David Tardon - 1.15.1-8 +- Convert license to SPDX + * Wed Jul 20 2022 Fedora Release Engineering - 1.15.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From fe4e258d13ef3b2a806934236db233c4443ac147 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 21 Nov 2022 21:03:21 +0100 Subject: [PATCH 58/70] Convert to rpmautospec --- changelog | 146 +++++++++++++++++++++++++++++++++++++++++++++++++ cppunit.spec | 149 +-------------------------------------------------- 2 files changed, 148 insertions(+), 147 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..56b16be --- /dev/null +++ b/changelog @@ -0,0 +1,146 @@ +* Mon Nov 21 2022 David Tardon - 1.15.1-8 +- Convert license to SPDX + +* Wed Jul 20 2022 Fedora Release Engineering - 1.15.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jan 19 2022 Fedora Release Engineering - 1.15.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.15.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.15.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 1.15.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Dec 25 2019 David Tardon - 1.15.1-2 +- try again + +* Wed Dec 25 2019 David Tardon - 1.15.1-1 +- new upstream release + +* Sat Dec 21 2019 David Tardon - 1.15.0-1 +- new upstream release + +* Wed Jul 24 2019 Fedora Release Engineering - 1.14.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 1.14.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1.14.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Jun 28 2018 Rex Dieter - 1.14.0-5 +- use %%make_build %%make_install %%ldconfig_scriptlets +- -devel: tighten dep on main pkg with %%_isa + +* Wed Feb 07 2018 Fedora Release Engineering - 1.14.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 1.14.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.14.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue May 02 2017 David Tardon - 1.14.0-1 +- new upstream release + +* Fri Feb 10 2017 Fedora Release Engineering - 1.13.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Feb 13 2016 David Tardon - 1.13.2-2 +- drop obsolete cppunit-config + +* Sat Feb 13 2016 David Tardon - 1.13.2-1 +- switch to new upstream + +* Wed Feb 03 2016 Fedora Release Engineering - 1.12.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.12.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Apr 11 2015 David Tardon - 1.12.1-15 +- rebuild for yet another C++ ABI break + +* Fri Feb 20 2015 David Tardon - 1.12.1-14 +- rebuild for C++ stdlib ABI change in gcc5 + +* Sat Aug 16 2014 Fedora Release Engineering - 1.12.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.12.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue May 20 2014 David Tardon - 1.12.1-11 +- rhbz#925193 add support for aarch64 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.12.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 1.12.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 1.12.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 1.12.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Oct 05 2011 Caolán McNamara - 1.12.1-6 +- add sf#2912630 fix for unused argument warnings + +* Tue Jun 28 2011 Steven M. Parrish - 1.12.1-5 +- Fix for bug 452340 + +* Tue Feb 08 2011 Fedora Release Engineering - 1.12.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jul 24 2009 Fedora Release Engineering - 1.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Feb 24 2009 Fedora Release Engineering - 1.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Sep 18 2008 Patrice Dumas 1.12.1-1 +- Update to 1.12.1 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.12.0-5 +- Autorebuild for GCC 4.3 + +* Mon Dec 17 2007 Patrice Dumas 1.12.0-4 +- remove libdir reference to cppunit-config, should fix multiarch conflict + (#340951) +- fix encoding and remove windows related files in examples +- keep timestamps + +* Mon Jan 29 2007 Patrice Dumas 1.12.0-3 +- add rightly files to -devel (#224106) +- add necessary requires for -devel (#224106) +- ship examples + +* Sun Sep 10 2006 Patrice Dumas 1.12.0-2 +- rebuild for FC6 + +* Wed Jul 5 2006 Patrice Dumas 1.12.0-1 +- update to 1.12 + +* Sun May 21 2006 Patrice Dumas 1.11.6-1 +- update to 1.11.6 + +* Wed Dec 21 2005 Patrice Dumas 1.11.4-1 +- update + +* Mon Aug 15 2005 Tom "spot" Callaway 1.11.0-2 +- various cleanups + +* Mon Jul 4 2005 Patrice Dumas 1.11.0-1 +- update using the fedora template + +* Sat Apr 14 2001 Bastiaan Bakker +- Initial release diff --git a/cppunit.spec b/cppunit.spec index 3ea5859..88c5f4a 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,7 +2,7 @@ Name: cppunit Version: 1.15.1 -Release: 8%{?dist} +Release: %autorelease Summary: C++ unit testing framework # no license in files @@ -84,149 +84,4 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog -* Mon Nov 21 2022 David Tardon - 1.15.1-8 -- Convert license to SPDX - -* Wed Jul 20 2022 Fedora Release Engineering - 1.15.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 1.15.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.15.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.15.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 1.15.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Dec 25 2019 David Tardon - 1.15.1-2 -- try again - -* Wed Dec 25 2019 David Tardon - 1.15.1-1 -- new upstream release - -* Sat Dec 21 2019 David Tardon - 1.15.0-1 -- new upstream release - -* Wed Jul 24 2019 Fedora Release Engineering - 1.14.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 1.14.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1.14.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jun 28 2018 Rex Dieter - 1.14.0-5 -- use %%make_build %%make_install %%ldconfig_scriptlets -- -devel: tighten dep on main pkg with %%_isa - -* Wed Feb 07 2018 Fedora Release Engineering - 1.14.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 1.14.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.14.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue May 02 2017 David Tardon - 1.14.0-1 -- new upstream release - -* Fri Feb 10 2017 Fedora Release Engineering - 1.13.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Feb 13 2016 David Tardon - 1.13.2-2 -- drop obsolete cppunit-config - -* Sat Feb 13 2016 David Tardon - 1.13.2-1 -- switch to new upstream - -* Wed Feb 03 2016 Fedora Release Engineering - 1.12.1-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.12.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Apr 11 2015 David Tardon - 1.12.1-15 -- rebuild for yet another C++ ABI break - -* Fri Feb 20 2015 David Tardon - 1.12.1-14 -- rebuild for C++ stdlib ABI change in gcc5 - -* Sat Aug 16 2014 Fedora Release Engineering - 1.12.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.12.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue May 20 2014 David Tardon - 1.12.1-11 -- rhbz#925193 add support for aarch64 - -* Sat Aug 03 2013 Fedora Release Engineering - 1.12.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 1.12.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 1.12.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 1.12.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Oct 05 2011 Caolán McNamara - 1.12.1-6 -- add sf#2912630 fix for unused argument warnings - -* Tue Jun 28 2011 Steven M. Parrish - 1.12.1-5 -- Fix for bug 452340 - -* Tue Feb 08 2011 Fedora Release Engineering - 1.12.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jul 24 2009 Fedora Release Engineering - 1.12.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Feb 24 2009 Fedora Release Engineering - 1.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Sep 18 2008 Patrice Dumas 1.12.1-1 -- Update to 1.12.1 - -* Tue Feb 19 2008 Fedora Release Engineering - 1.12.0-5 -- Autorebuild for GCC 4.3 - -* Mon Dec 17 2007 Patrice Dumas 1.12.0-4 -- remove libdir reference to cppunit-config, should fix multiarch conflict - (#340951) -- fix encoding and remove windows related files in examples -- keep timestamps - -* Mon Jan 29 2007 Patrice Dumas 1.12.0-3 -- add rightly files to -devel (#224106) -- add necessary requires for -devel (#224106) -- ship examples - -* Sun Sep 10 2006 Patrice Dumas 1.12.0-2 -- rebuild for FC6 - -* Wed Jul 5 2006 Patrice Dumas 1.12.0-1 -- update to 1.12 - -* Sun May 21 2006 Patrice Dumas 1.11.6-1 -- update to 1.11.6 - -* Wed Dec 21 2005 Patrice Dumas 1.11.4-1 -- update - -* Mon Aug 15 2005 Tom "spot" Callaway 1.11.0-2 -- various cleanups - -* Mon Jul 4 2005 Patrice Dumas 1.11.0-1 -- update using the fedora template - -* Sat Apr 14 2001 Bastiaan Bakker -- Initial release +%autochangelog From 023a4e8d0c6406fd4bdb9e3a9e50169a4c961713 Mon Sep 17 00:00:00 2001 From: Edjunior Machado Date: Fri, 9 Dec 2022 17:09:46 +0100 Subject: [PATCH 59/70] tests: Fix fmf plan deprecated attributes --- plans/ci.fmf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plans/ci.fmf b/plans/ci.fmf index 1ad2c12..3fd3ab7 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -1,6 +1,5 @@ summary: CI Gating Plan discover: how: fmf - directory: tests execute: - how: beakerlib + how: tmt From 31153821eb1408afb08194a80009b6927e2cdff4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:36:20 +0000 Subject: [PATCH 60/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 4266f011a57a62e88bb6fb6a6c14cbfc74188c66 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 16:30:34 +0000 Subject: [PATCH 61/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From beaea53af79581ab031e258ae73dd5637c861932 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Thu, 24 Aug 2023 08:51:48 +0200 Subject: [PATCH 62/70] Backport patch to run tests in deterministic order --- cppunit.spec | 4 +++ run-tests-in-deterministic-order.patch | 43 ++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 run-tests-in-deterministic-order.patch diff --git a/cppunit.spec b/cppunit.spec index 88c5f4a..4a994fe 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -10,6 +10,10 @@ License: LGPL-2.1-or-later Url: https://www.freedesktop.org/wiki/Software/cppunit/ Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz +# Backport patch to run tests in deterministic order +# https://gerrit.libreoffice.org/c/cppunit/+/123963 +Patch: run-tests-in-deterministic-order.patch + BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: graphviz diff --git a/run-tests-in-deterministic-order.patch b/run-tests-in-deterministic-order.patch new file mode 100644 index 0000000..2942e42 --- /dev/null +++ b/run-tests-in-deterministic-order.patch @@ -0,0 +1,43 @@ +From 64eaa35c2de99581e522608e841defffb4b2923b Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Thu, 21 Oct 2021 11:14:34 +0200 +Subject: [PATCH] Run tests in deterministic order + +LibreOffice already benefits from this (see + +"external/cppunit: Run tests in deterministic order", especially as otherwise +the order in which tests happened to get run differed between --disable-lto and +--enable-lto builds. + +Change-Id: I87d6d7cb0f4c2f6a0ea1ac3ba3d48b4e089eb5c7 +Reviewed-on: https://gerrit.libreoffice.org/c/cppunit/+/123963 +Tested-by: Stephan Bergmann +Reviewed-by: Stephan Bergmann +--- + +diff --git a/src/cppunit/TestFactoryRegistry.cpp b/src/cppunit/TestFactoryRegistry.cpp +index 35448a6..3b68d58 100644 +--- a/src/cppunit/TestFactoryRegistry.cpp ++++ b/src/cppunit/TestFactoryRegistry.cpp +@@ -143,12 +143,20 @@ + void + TestFactoryRegistry::addTestToSuite( TestSuite *suite ) + { ++ std::multimap sorted; + for ( Factories::iterator it = m_factories.begin(); + it != m_factories.end(); + ++it ) + { + TestFactory *factory = *it; +- suite->addTest( factory->makeTest() ); ++ Test *test = factory->makeTest(); ++ sorted.insert({test->getName(), test}); ++ } ++ // In the unlikely case of multiple Tests with identical names, those will ++ // still be added in random order: ++ for (auto const &i: sorted) ++ { ++ suite->addTest( i.second ); + } + } + From 80c2931f5caa403972c1a99b3b3f0adb67983c77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 16:17:28 +0000 Subject: [PATCH 63/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 55a0dd2157b1db8986b4d422cbe9200e16db78d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 08:17:23 +0000 Subject: [PATCH 64/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 902beef5607257cd1e3db100f75b7b8d6ca0d9e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 30 Apr 2024 14:25:28 +0200 Subject: [PATCH 65/70] tests: Fix TMT dependencies Those are hard dependencies and they were incomplete. --- tests/Sanity/basic-test/main.fmf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Sanity/basic-test/main.fmf b/tests/Sanity/basic-test/main.fmf index 0c92a73..ed785d1 100644 --- a/tests/Sanity/basic-test/main.fmf +++ b/tests/Sanity/basic-test/main.fmf @@ -5,9 +5,10 @@ component: - cppunit test: ./runtest.sh framework: beakerlib -recommend: +require: + - bash + - coreutils - gcc-c++ - - cppunit - cppunit-devel duration: 1h extra-summary: /tools/cppunit/Sanity/basic-test From 989836a857e9efaf0e7ee59118852eca99556849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 30 Apr 2024 14:34:21 +0200 Subject: [PATCH 66/70] Refer to sources with HTTPS --- cppunit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cppunit.spec b/cppunit.spec index 4a994fe..e45bbca 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -8,7 +8,7 @@ Summary: C++ unit testing framework # no license in files License: LGPL-2.1-or-later Url: https://www.freedesktop.org/wiki/Software/cppunit/ -Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz +Source: https://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz # Backport patch to run tests in deterministic order # https://gerrit.libreoffice.org/c/cppunit/+/123963 From ddce20592fcf29465716c15275e1873874759d83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 3 May 2024 14:16:43 +0200 Subject: [PATCH 67/70] tests: Remove unused remnants of Beaker The Makefile and PURPOSE files are remnants of a RHEL Beaker test system which was converted into TMT test system as a main.fmf file. The two files are not used anymore and can be removed. --- tests/Sanity/basic-test/Makefile | 63 -------------------------------- tests/Sanity/basic-test/PURPOSE | 3 -- 2 files changed, 66 deletions(-) delete mode 100644 tests/Sanity/basic-test/Makefile delete mode 100644 tests/Sanity/basic-test/PURPOSE diff --git a/tests/Sanity/basic-test/Makefile b/tests/Sanity/basic-test/Makefile deleted file mode 100644 index 7575c1a..0000000 --- a/tests/Sanity/basic-test/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /tools/cppunit/Sanity/basic-test -# Description: cppunit basic test -# Author: Edjunior Machado -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2021 Red Hat, Inc. -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the 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, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/tools/cppunit/Sanity/basic-test -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE hello.cpp - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Edjunior Machado " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: cppunit basic test" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 1h" >> $(METADATA) - @echo "RunFor: cppunit" >> $(METADATA) - @echo "Requires: gcc-c++ cppunit cppunit-devel" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2+" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/Sanity/basic-test/PURPOSE b/tests/Sanity/basic-test/PURPOSE deleted file mode 100644 index 82f79dd..0000000 --- a/tests/Sanity/basic-test/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /tools/cppunit/Sanity/basic-test -Description: cppunit basic test -Author: Edjunior Machado From 514c60ea82052dfc2f2241d22d773a6178896a9e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 20:07:03 +0000 Subject: [PATCH 68/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 361280b7ca4ebc99c2c3437e858de5f779ee8454 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:44:21 +0000 Subject: [PATCH 69/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 87f035d1fa3a022b13e3bc412c95ff4e2cc91dc8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:45:58 +0000 Subject: [PATCH 70/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild