Hello community, here is the log from the commit of package automake for openSUSE:Factory checked in at 2018-05-22 16:58:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/automake (Old) and /work/SRC/openSUSE:Factory/.automake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "automake" Tue May 22 16:58:30 2018 rev:49 rq:610273 version:1.16.1 Changes: -------- --- /work/SRC/openSUSE:Factory/automake/automake-testsuite.changes 2018-05-06 14:53:59.749478172 +0200 +++ /work/SRC/openSUSE:Factory/.automake.new/automake-testsuite.changes 2018-05-22 16:58:31.995711560 +0200 @@ -1,0 +2,17 @@ +Fri May 18 12:55:24 CEST 2018 - [email protected] + +- Remove non-existing compress from BuildRequires. + +------------------------------------------------------------------- +Fri May 18 11:41:32 CEST 2018 - [email protected] + +- Add gettext-tools, pkg-config. vala dejagnu, makeinfo, python and zip as + BuildRequires for automake-testsuite to make testsuite complete and + enable more tests. + +------------------------------------------------------------------- +Thu May 10 09:34:46 UTC 2018 - [email protected] + +- automake-SuSE.patch: fix variable syntax + +------------------------------------------------------------------- automake.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ automake-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.PnHI1B/_old 2018-05-22 16:58:32.883679252 +0200 +++ /var/tmp/diff_new_pack.PnHI1B/_new 2018-05-22 16:58:32.887679106 +0200 @@ -51,9 +51,21 @@ Requires(preun): info BuildArch: noarch %if "%{name}" == "automake-testsuite" +BuildRequires: cscope +BuildRequires: dejagnu BuildRequires: expect BuildRequires: flex +BuildRequires: gettext-tools BuildRequires: libtool +BuildRequires: makedepend +BuildRequires: makeinfo +BuildRequires: pkg-config +BuildRequires: python +BuildRequires: sharutils +%if 0%{suse_version} >= 1500 +BuildRequires: vala +%endif +BuildRequires: zip Requires: expect Requires: flex Requires: libtool ++++++ automake.spec ++++++ --- /var/tmp/diff_new_pack.PnHI1B/_old 2018-05-22 16:58:32.911678233 +0200 +++ /var/tmp/diff_new_pack.PnHI1B/_new 2018-05-22 16:58:32.911678233 +0200 @@ -51,9 +51,21 @@ Requires(preun): info BuildArch: noarch %if "%{name}" == "automake-testsuite" +BuildRequires: cscope +BuildRequires: dejagnu BuildRequires: expect BuildRequires: flex +BuildRequires: gettext-tools BuildRequires: libtool +BuildRequires: makedepend +BuildRequires: makeinfo +BuildRequires: pkg-config +BuildRequires: python +BuildRequires: sharutils +%if 0%{suse_version} >= 1500 +BuildRequires: vala +%endif +BuildRequires: zip Requires: expect Requires: flex Requires: libtool ++++++ automake-SuSE.patch ++++++ --- /var/tmp/diff_new_pack.PnHI1B/_old 2018-05-22 16:58:32.943677069 +0200 +++ /var/tmp/diff_new_pack.PnHI1B/_new 2018-05-22 16:58:32.947676923 +0200 @@ -29,10 +29,10 @@ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` - machine="${arch}${endian}"-unknown -+ machine="${arch}${endian}"-$(VENDOR)-unknown ++ machine="${arch}${endian}"-${VENDOR}-unknown ;; - *) machine="$UNAME_MACHINE_ARCH"-unknown ;; -+ *) machine="$UNAME_MACHINE_ARCH"-$(VENDOR)-unknown ;; ++ *) machine="$UNAME_MACHINE_ARCH"-${VENDOR}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. @@ -41,45 +41,45 @@ *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" -+ echo "$UNAME_MACHINE_ARCH"-$(VENDOR)-bitrig"$UNAME_RELEASE" ++ echo "$UNAME_MACHINE_ARCH"-${VENDOR}-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" -+ echo "$UNAME_MACHINE_ARCH"-$(VENDOR)-openbsd"$UNAME_RELEASE" ++ echo "$UNAME_MACHINE_ARCH"-${VENDOR}-openbsd"$UNAME_RELEASE" exit ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" -+ echo "$UNAME_MACHINE_ARCH"-$(VENDOR)-libertybsd"$UNAME_RELEASE" ++ echo "$UNAME_MACHINE_ARCH"-${VENDOR}-libertybsd"$UNAME_RELEASE" exit ;; *:MidnightBSD:*:*) - echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" -+ echo "$UNAME_MACHINE"-$(VENDOR)-midnightbsd"$UNAME_RELEASE" ++ echo "$UNAME_MACHINE"-${VENDOR}-midnightbsd"$UNAME_RELEASE" exit ;; *:ekkoBSD:*:*) - echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" -+ echo "$UNAME_MACHINE"-$(VENDOR)-ekkobsd"$UNAME_RELEASE" ++ echo "$UNAME_MACHINE"-${VENDOR}-ekkobsd"$UNAME_RELEASE" exit ;; *:SolidBSD:*:*) - echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" -+ echo "$UNAME_MACHINE"-$(VENDOR)-solidbsd"$UNAME_RELEASE" ++ echo "$UNAME_MACHINE"-${VENDOR}-solidbsd"$UNAME_RELEASE" exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd"$UNAME_RELEASE" -+ echo powerpc-$(VENDOR)-mirbsd"$UNAME_RELEASE" ++ echo powerpc-${VENDOR}-mirbsd"$UNAME_RELEASE" exit ;; *:MirBSD:*:*) - echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" -+ echo "$UNAME_MACHINE"-$(VENDOR)-mirbsd"$UNAME_RELEASE" ++ echo "$UNAME_MACHINE"-${VENDOR}-mirbsd"$UNAME_RELEASE" exit ;; *:Sortix:*:*) - echo "$UNAME_MACHINE"-unknown-sortix -+ echo "$UNAME_MACHINE"-$(VENDOR)-sortix ++ echo "$UNAME_MACHINE"-${VENDOR}-sortix exit ;; *:Redox:*:*) - echo "$UNAME_MACHINE"-unknown-redox -+ echo "$UNAME_MACHINE"-$(VENDOR)-redox ++ echo "$UNAME_MACHINE"-${VENDOR}-redox exit ;; mips:OSF1:*.*) echo mips-dec-osf1 @@ -88,15 +88,15 @@ exit $exitcode ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 -+ echo m68k-$(VENDOR)-sysv4 ++ echo m68k-${VENDOR}-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-amigaos -+ echo "$UNAME_MACHINE"-$(VENDOR)-amigaos ++ echo "$UNAME_MACHINE"-${VENDOR}-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-morphos -+ echo "$UNAME_MACHINE"-$(VENDOR)-morphos ++ echo "$UNAME_MACHINE"-${VENDOR}-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -105,7 +105,7 @@ exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos -+ echo arm-$(VENDOR)-riscos ++ echo arm-${VENDOR}-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp @@ -114,7 +114,7 @@ exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint"$UNAME_RELEASE" -+ echo m68k-$(VENDOR)-mint"$UNAME_RELEASE" ++ echo m68k-${VENDOR}-mint"$UNAME_RELEASE" exit ;; m68k:machten:*:*) echo m68k-apple-machten"$UNAME_RELEASE" @@ -123,10 +123,10 @@ i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo "$UNAME_MACHINE"-unknown-osf1mk -+ echo "$UNAME_MACHINE"-$(VENDOR)-osf1mk ++ echo "$UNAME_MACHINE"-${VENDOR}-osf1mk else - echo "$UNAME_MACHINE"-unknown-osf1 -+ echo "$UNAME_MACHINE"-$(VENDOR)-osf1 ++ echo "$UNAME_MACHINE"-${VENDOR}-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -135,11 +135,11 @@ exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi"$UNAME_RELEASE" -+ echo sparc-$(VENDOR)-bsdi"$UNAME_RELEASE" ++ echo sparc-${VENDOR}-bsdi"$UNAME_RELEASE" exit ;; *:BSD/OS:*:*) - echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" -+ echo "$UNAME_MACHINE"-$(VENDOR)-bsdi"$UNAME_RELEASE" ++ echo "$UNAME_MACHINE"-${VENDOR}-bsdi"$UNAME_RELEASE" exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -148,7 +148,7 @@ UNAME_PROCESSOR=i586 ;; esac - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" -+ echo "$UNAME_PROCESSOR"-$(VENDOR)-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" ++ echo "$UNAME_PROCESSOR"-${VENDOR}-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; i*:CYGWIN*:*) echo "$UNAME_MACHINE"-pc-cygwin @@ -157,11 +157,11 @@ exit ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix"$UNAME_RELEASE" -+ echo x86_64-$(VENDOR)-interix"$UNAME_RELEASE" ++ echo x86_64-${VENDOR}-interix"$UNAME_RELEASE" exit ;; IA64) - echo ia64-unknown-interix"$UNAME_RELEASE" -+ echo ia64-$(VENDOR)-interix"$UNAME_RELEASE" ++ echo ia64-${VENDOR}-interix"$UNAME_RELEASE" exit ;; esac ;; i*:UWIN*:*) @@ -169,33 +169,33 @@ exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin -+ echo x86_64-$(VENDOR)-cygwin ++ echo x86_64-${VENDOR}-cygwin exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" -+ echo powerpcle-$(VENDOR)-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" ++ echo powerpcle-${VENDOR}-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; *:GNU:*:*) # the GNU system - echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" -+ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-$(VENDOR)-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" ++ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-${VENDOR}-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" -+ echo "$UNAME_MACHINE-$(VENDOR)-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" ++ echo "$UNAME_MACHINE-${VENDOR}-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; i*86:Minix:*:*) echo "$UNAME_MACHINE"-pc-minix exit ;; aarch64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -204,11 +204,11 @@ objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; arc:Linux:*:* | arceb:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; arm*:Linux:*:*) eval "$set_cc_for_build" @@ -216,22 +216,22 @@ | grep -q __ARM_EABI__ then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"eabi ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"eabi else - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"eabihf ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"eabihf fi fi exit ;; avr32*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; cris:Linux:*:*) echo "$UNAME_MACHINE"-axis-linux-"$LIBC" @@ -240,34 +240,34 @@ exit ;; e2k:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; frv:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; hexagon:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; i*86:Linux:*:*) echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; ia64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; k1om:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; m32r*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; m68*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval "$set_cc_for_build" @@ -276,27 +276,27 @@ EOF eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" - test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } -+ test "x$CPU" != x && { echo "$CPU-$(VENDOR)-linux-$LIBC"; exit; } ++ test "x$CPU" != x && { echo "$CPU-${VENDOR}-linux-$LIBC"; exit; } ;; mips64el:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-"$LIBC" -+ echo or1k-$(VENDOR)-linux-"$LIBC" ++ echo or1k-${VENDOR}-linux-"$LIBC" exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-"$LIBC" -+ echo sparc-$(VENDOR)-linux-"$LIBC" ++ echo sparc-${VENDOR}-linux-"$LIBC" exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-"$LIBC" -+ echo hppa64-$(VENDOR)-linux-"$LIBC" ++ echo hppa64-${VENDOR}-linux-"$LIBC" exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level @@ -304,49 +304,49 @@ - PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; - PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; - *) echo hppa-unknown-linux-"$LIBC" ;; -+ PA7*) echo hppa1.1-$(VENDOR)-linux-"$LIBC" ;; -+ PA8*) echo hppa2.0-$(VENDOR)-linux-"$LIBC" ;; -+ *) echo hppa-$(VENDOR)-linux-"$LIBC" ;; ++ PA7*) echo hppa1.1-${VENDOR}-linux-"$LIBC" ;; ++ PA8*) echo hppa2.0-${VENDOR}-linux-"$LIBC" ;; ++ *) echo hppa-${VENDOR}-linux-"$LIBC" ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-"$LIBC" -+ echo powerpc64-$(VENDOR)-linux-"$LIBC" ++ echo powerpc64-${VENDOR}-linux-"$LIBC" exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-"$LIBC" -+ echo powerpc-$(VENDOR)-linux-"$LIBC" ++ echo powerpc-${VENDOR}-linux-"$LIBC" exit ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-"$LIBC" -+ echo powerpc64le-$(VENDOR)-linux-"$LIBC" ++ echo powerpc64le-${VENDOR}-linux-"$LIBC" exit ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-"$LIBC" -+ echo powerpcle-$(VENDOR)-linux-"$LIBC" ++ echo powerpcle-${VENDOR}-linux-"$LIBC" exit ;; riscv32:Linux:*:* | riscv64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" exit ;; sh64*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; sh*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; tile*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; vax:Linux:*:*) echo "$UNAME_MACHINE"-dec-linux-"$LIBC" @@ -355,7 +355,7 @@ exit ;; xtensa*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -+ echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC" ++ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC" exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -364,18 +364,18 @@ exit ;; i*86:XTS-300:*:STOP) - echo "$UNAME_MACHINE"-unknown-stop -+ echo "$UNAME_MACHINE"-$(VENDOR)-stop ++ echo "$UNAME_MACHINE"-${VENDOR}-stop exit ;; i*86:atheos:*:*) - echo "$UNAME_MACHINE"-unknown-atheos -+ echo "$UNAME_MACHINE"-$(VENDOR)-atheos ++ echo "$UNAME_MACHINE"-${VENDOR}-atheos exit ;; i*86:syllable:*:*) echo "$UNAME_MACHINE"-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos"$UNAME_RELEASE" -+ echo i386-$(VENDOR)-lynxos"$UNAME_RELEASE" ++ echo i386-${VENDOR}-lynxos"$UNAME_RELEASE" exit ;; i*86:*DOS:*:*) echo "$UNAME_MACHINE"-pc-msdosdjgpp @@ -384,7 +384,7 @@ *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" -+ echo "$UNAME_MACHINE-$(VENDOR)-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" ++ echo "$UNAME_MACHINE-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then @@ -393,7 +393,7 @@ echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 -+ echo i860-$(VENDOR)-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 ++ echo i860-${VENDOR}-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -402,22 +402,22 @@ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos"$UNAME_RELEASE" -+ echo m68k-$(VENDOR)-lynxos"$UNAME_RELEASE" ++ echo m68k-${VENDOR}-lynxos"$UNAME_RELEASE" exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos"$UNAME_RELEASE" -+ echo sparc-$(VENDOR)-lynxos"$UNAME_RELEASE" ++ echo sparc-${VENDOR}-lynxos"$UNAME_RELEASE" exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos"$UNAME_RELEASE" -+ echo rs6000-$(VENDOR)-lynxos"$UNAME_RELEASE" ++ echo rs6000-${VENDOR}-lynxos"$UNAME_RELEASE" exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos"$UNAME_RELEASE" -+ echo powerpc-$(VENDOR)-lynxos"$UNAME_RELEASE" ++ echo powerpc-${VENDOR}-lynxos"$UNAME_RELEASE" exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv"$UNAME_RELEASE" @@ -426,7 +426,7 @@ echo mips-nec-sysv"$UNAME_RELEASE" else - echo mips-unknown-sysv"$UNAME_RELEASE" -+ echo mips-$(VENDOR)-sysv"$UNAME_RELEASE" ++ echo mips-${VENDOR}-sysv"$UNAME_RELEASE" fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -435,7 +435,7 @@ exit ;; x86_64:Haiku:*:*) - echo x86_64-unknown-haiku -+ echo x86_64-$(VENDOR)-haiku ++ echo x86_64-${VENDOR}-haiku exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux"$UNAME_RELEASE" @@ -444,15 +444,15 @@ UNAME_MACHINE="$cputype" fi - echo "$UNAME_MACHINE"-unknown-plan9 -+ echo "$UNAME_MACHINE"-$(VENDOR)-plan9 ++ echo "$UNAME_MACHINE"-${VENDOR}-plan9 exit ;; *:TOPS-10:*:*) - echo pdp10-unknown-tops10 -+ echo pdp10-$(VENDOR)-tops10 ++ echo pdp10-${VENDOR}-tops10 exit ;; *:TENEX:*:*) - echo pdp10-unknown-tenex -+ echo pdp10-$(VENDOR)-tenex ++ echo pdp10-${VENDOR}-tenex exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 @@ -461,18 +461,18 @@ exit ;; *:TOPS-20:*:*) - echo pdp10-unknown-tops20 -+ echo pdp10-$(VENDOR)-tops20 ++ echo pdp10-${VENDOR}-tops20 exit ;; *:ITS:*:*) - echo pdp10-unknown-its -+ echo pdp10-$(VENDOR)-its ++ echo pdp10-${VENDOR}-its exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" -+ echo "$UNAME_MACHINE"-$(VENDOR)-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" ++ echo "$UNAME_MACHINE"-${VENDOR}-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -481,11 +481,11 @@ exit ;; x86_64:VMkernel:*:*) - echo "$UNAME_MACHINE"-unknown-esx -+ echo "$UNAME_MACHINE"-$(VENDOR)-esx ++ echo "$UNAME_MACHINE"-${VENDOR}-esx exit ;; amd64:Isilon\ OneFS:*:*) - echo x86_64-unknown-onefs -+ echo x86_64-$(VENDOR)-onefs ++ echo x86_64-${VENDOR}-onefs exit ;; esac
