From e34d9fc5886117712cdc17753e25f1eb76cee42ddfa7c5d8049d2c50d51dc277 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Tue, 16 Apr 2013 11:33:36 +0000 Subject: [PATCH 1/3] - Update to 1.20.7: - Adapt patches to changed sources. - Add patch to pass the directory for gpm.h when generating dependencies: gpm-dependencies.patch - Add patch that enables the creation of the libgpm.so symlink again and installs it: gpm-do_create_symlink.patch - Removed patches not needed anymore: gpm-gcc4.3.patch gpm-libtool.patch config-guess-sub-update.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/gpm?expand=0&rev=25 --- gpm-1.20.6.tar.lzma | 3 - ...es.tar.lzma => gpm-1.20.7-patches.tar.lzma | 0 gpm-1.20.7.tar.lzma | 3 + gpm-DESTDIR.patch | 57 +++++++++++++------ gpm-ceil.patch | 32 +++++------ gpm-conf.patch | 57 ++++++++----------- gpm-dependencies.patch | 26 +++++++++ gpm-do_create_symlink.patch | 46 +++++++++++++++ gpm-gcc4.3.patch | 10 ---- gpm-libtool.patch | 11 ---- gpm-weak-wgetch.patch | 34 +++++++---- gpm.changes | 15 +++++ gpm.spec | 24 ++++---- 13 files changed, 204 insertions(+), 114 deletions(-) delete mode 100644 gpm-1.20.6.tar.lzma rename gpm-1.20.6-patches.tar.lzma => gpm-1.20.7-patches.tar.lzma (100%) create mode 100644 gpm-1.20.7.tar.lzma create mode 100644 gpm-dependencies.patch create mode 100644 gpm-do_create_symlink.patch delete mode 100644 gpm-gcc4.3.patch delete mode 100644 gpm-libtool.patch diff --git a/gpm-1.20.6.tar.lzma b/gpm-1.20.6.tar.lzma deleted file mode 100644 index 704282d..0000000 --- a/gpm-1.20.6.tar.lzma +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0795792f1e4f300f8f2d4474db04baba1ef99dc0017fec0057fcb6ee59eb8745 -size 998443 diff --git a/gpm-1.20.6-patches.tar.lzma b/gpm-1.20.7-patches.tar.lzma similarity index 100% rename from gpm-1.20.6-patches.tar.lzma rename to gpm-1.20.7-patches.tar.lzma diff --git a/gpm-1.20.7.tar.lzma b/gpm-1.20.7.tar.lzma new file mode 100644 index 0000000..e980168 --- /dev/null +++ b/gpm-1.20.7.tar.lzma @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c +size 789691 diff --git a/gpm-DESTDIR.patch b/gpm-DESTDIR.patch index 704b7b9..bcc6487 100644 --- a/gpm-DESTDIR.patch +++ b/gpm-DESTDIR.patch @@ -1,8 +1,15 @@ +--- + Makefile.in | 8 ++++++-- + Makefile.include.in | 1 + + doc/Makefile.in | 31 ++++++++++--------------------- + src/Makefile.in | 19 ++++++++++--------- + 4 files changed, 27 insertions(+), 32 deletions(-) + Index: Makefile.in =================================================================== ---- Makefile.in.orig 2009-02-09 10:58:53.000000000 +0100 -+++ Makefile.in 2010-09-07 19:08:40.912655993 +0200 -@@ -87,9 +87,13 @@ install-strip: +--- Makefile.in.orig 2012-10-26 23:21:38.000000000 +0200 ++++ Makefile.in 2013-04-16 11:42:15.933917724 +0200 +@@ -65,9 +65,13 @@ install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) $(STRIP)' install installdirs: @@ -20,8 +27,8 @@ Index: Makefile.in ### GENERIC Index: Makefile.include.in =================================================================== ---- Makefile.include.in.orig 2009-02-09 10:58:53.000000000 +0100 -+++ Makefile.include.in 2010-09-07 19:03:04.962483820 +0200 +--- Makefile.include.in.orig 2012-10-26 23:21:38.000000000 +0200 ++++ Makefile.include.in 2013-04-16 11:42:15.933917724 +0200 @@ -43,6 +43,7 @@ YACC = @YACC@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -32,8 +39,8 @@ Index: Makefile.include.in ELISP = @ELISP@ Index: doc/Makefile.in =================================================================== ---- doc/Makefile.in.orig 2009-02-09 10:58:53.000000000 +0100 -+++ doc/Makefile.in 2010-09-07 19:09:37.506283144 +0200 +--- doc/Makefile.in.orig 2012-10-26 23:21:38.000000000 +0200 ++++ doc/Makefile.in 2013-04-16 11:42:15.933917724 +0200 @@ -111,29 +111,18 @@ gpmdoc.ps: gpm.ps # install & uninstall @@ -76,17 +83,19 @@ Index: doc/Makefile.in # e.g. /var/cache/man/cat1/mev.1.gz. Deleting these is not our job, Index: src/Makefile.in =================================================================== ---- src/Makefile.in.orig 2009-02-09 10:58:53.000000000 +0100 -+++ src/Makefile.in 2010-09-07 19:07:57.361560078 +0200 -@@ -104,15 +104,16 @@ check: all +--- src/Makefile.in.orig 2012-10-26 23:21:38.000000000 +0200 ++++ src/Makefile.in 2013-04-16 11:47:36.772320635 +0200 +@@ -104,17 +104,17 @@ check: all installdirs: install: check - $(INSTALL_PROGRAM) gpm $(sbindir)/gpm -- $(INSTALL_DATA) -m 644 lib/libgpm.a $(libdir)/libgpm.a -- $(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(includedir)/gpm.h + $(INSTALL_PROGRAM) gpm $(DESTDIR)$(sbindir)/gpm -+ $(INSTALL_DATA) -m 644 lib/libgpm.a $(DESTDIR)$(libdir)/libgpm.a + if [ -f lib/libgpm.a ] ; then \ +- $(INSTALL_DATA) -m 644 lib/libgpm.a $(libdir)/libgpm.a ; \ ++ $(INSTALL_DATA) -m 644 lib/libgpm.a $(DESTDIR)$(libdir)/libgpm.a ; \ + fi +- $(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(includedir)/gpm.h + $(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(DESTDIR)$(includedir)/gpm.h # POSIX requires the range of a for loop be nonempty and Bash # 2.x goes along; unfortunately that means an additional @@ -94,13 +103,12 @@ Index: src/Makefile.in if test "x@SHLIB@" != "x" ; then \ - $(INSTALL_DATA) -m 644 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \ - cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \ -+ $(INSTALL_DATA) -m 755 lib/libgpm.so.@abi_full@ $(DESTDIR)$(libdir)/libgpm.so.@abi_full@ ; \ -+ cd $(DESTDIR)$(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so ; \ -+ cd $(DESTDIR)$(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@; \ ++ $(INSTALL_DATA) -m 644 lib/libgpm.so.@abi_full@ $(DESTDIR)$(libdir)/libgpm.so.@abi_full@ ; \ ++ cd $(DESTDIR)$(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \ echo "WARNING: We installed a lib, you should now call ldconfig" ; \ echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" ; \ echo "Or to update everything just type ldconfig" ; \ -@@ -122,7 +123,7 @@ install: check +@@ -124,7 +124,7 @@ install: check # prog/ for i in $(PROG); do \ @@ -109,3 +117,18 @@ Index: src/Makefile.in done install-strip: +@@ -133,10 +133,11 @@ install-strip: + # Note: this leaves around /usr/lib/libgpm.so.1 and /usr/lib/libgpm.so.1.nn + # This is probably the right thing, because programs may be linked to it + uninstall: +- rm -f $(bindir)/mev $(bindir)/gpm-root $(bindir)/disable-paste \ +- $(sbindir)/gpm $(libdir)/libgpm.a $(libdir)/libgpm.so $(includedir)/gpm.h ++ rm -f $(DESTDIR)$(bindir)/mev $(DESTDIR)$(bindir)/gpm-root $(DESTDIR)$(bindir)/disable-paste \ ++ $(DESTDIR)$(sbindir)/gpm $(DESTDIR)$(libdir)/libgpm.a $(DESTDIR)$(libdir)/libgpm.so \ ++ $(DESTDIR) $(includedir)/gpm.h + for i in $(PROG); do \ +- rm -f $(bindir)/$$i ;\ ++ rm -f $(DESTDIR)$(bindir)/$$i ;\ + done + + # Configure & unconfigure diff --git a/gpm-ceil.patch b/gpm-ceil.patch index cb8d02c..a244747 100644 --- a/gpm-ceil.patch +++ b/gpm-ceil.patch @@ -2,11 +2,16 @@ Note that GCC 4.0 will optimize ceil (constant), we therefore have to make the argument non-constant. ================================================================================ -Index: configure.ac +--- + configure.ac.footer | 20 ++++++++++++++++++++ + src/Makefile.in | 3 ++- + 2 files changed, 22 insertions(+), 1 deletion(-) + +Index: configure.ac.footer =================================================================== ---- configure.ac.orig 2009-02-09 10:58:53.000000000 +0100 -+++ configure.ac 2010-09-08 16:10:06.434722846 +0200 -@@ -108,6 +108,25 @@ fi +--- configure.ac.footer.orig 2012-10-26 23:21:38.000000000 +0200 ++++ configure.ac.footer 2013-04-16 12:21:01.350791832 +0200 +@@ -112,6 +112,25 @@ fi AC_CHECK_FUNCS(vsyslog syslog) AC_FUNC_ALLOCA @@ -32,28 +37,19 @@ Index: configure.ac case $with_curses in No|no|N|n) SHARED_LIBS=-lc ;; *) -@@ -138,6 +157,7 @@ AC_SUBST(ELISP) +@@ -142,6 +161,7 @@ AC_SUBST(ELISP) AC_SUBST(SHLIB) AC_SUBST(PICFLAGS) AC_SUBST(SOLDFLAGS) +AC_SUBST(SYNLDFLAGS) + AC_SUBST(LIBGPM_A) AC_SUBST(CURSES_OBJS) AC_SUBST(SHARED_LIBS) - AC_SUBST(lispdir) Index: src/Makefile.in =================================================================== ---- src/Makefile.in.orig 2010-09-08 16:06:46.812997967 +0200 -+++ src/Makefile.in 2010-09-08 16:09:40.464506680 +0200 -@@ -82,7 +82,7 @@ prog/%: prog/%.o - all: gpm lib/libgpm.so.@abi_lev@ lib/libgpm.a $(PROG) - - gpm: $(GOBJ) -- $(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm -+ $(CC) @LDFLAGS@ @SYNLDFLAGS@ -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm - - # construct dependings of sourcefiles and link sourcefiles - $(DEPFILE) dep: prog/gpm-root.c -@@ -164,7 +164,8 @@ lib/libgpm.a: $(LOBJ) +--- src/Makefile.in.orig 2013-04-16 12:18:43.719054511 +0200 ++++ src/Makefile.in 2013-04-16 12:18:43.762053491 +0200 +@@ -166,7 +166,8 @@ lib/libgpm.a: $(LOBJ) lib/libgpm.so.@abi_full@: $(PICS) $(CC) @SOLDFLAGS@libgpm.so.@abi_lev@ \ diff --git a/gpm-conf.patch b/gpm-conf.patch index e6dba03..5f9d75b 100644 --- a/gpm-conf.patch +++ b/gpm-conf.patch @@ -1,8 +1,18 @@ +--- + README | 2 +- + doc/README.synaptics | 4 ++-- + doc/README.twiddler | 12 ++++++------ + doc/doc.gpm.in | 6 +++--- + src/headers/twiddler.h | 4 ++-- + src/prog/gpm-root.y | 2 +- + src/synaptics.c | 4 ++-- + 7 files changed, 17 insertions(+), 17 deletions(-) + Index: README =================================================================== ---- README.orig 2009-02-09 10:58:53.000000000 +0100 -+++ README 2010-09-08 13:26:14.060039119 +0200 -@@ -128,7 +128,7 @@ Configuration is optional... +--- README.orig 2012-10-26 23:21:38.000000000 +0200 ++++ README 2013-04-16 11:48:12.185482121 +0200 +@@ -108,7 +108,7 @@ Configuration is optional... (string-match "con.*" (getenv "TERM")))) (load-library "t-mouse")) @@ -11,11 +21,10 @@ Index: README directory, test it out and then edit it to suit your feels. * You'd like to name the gpm info file inside /usr/info/dir. Just insert - Index: doc/README.synaptics =================================================================== ---- doc/README.synaptics.orig 2009-02-09 10:58:53.000000000 +0100 -+++ doc/README.synaptics 2010-09-08 13:26:14.108033711 +0200 +--- doc/README.synaptics.orig 2012-10-26 23:21:38.000000000 +0200 ++++ doc/README.synaptics 2013-04-16 11:48:12.186482098 +0200 @@ -25,8 +25,8 @@ the buttons, this support currently has These features can be enabled/disabled and many of them have time and speed @@ -29,8 +38,8 @@ Index: doc/README.synaptics Index: doc/README.twiddler =================================================================== ---- doc/README.twiddler.orig 2009-02-09 10:58:53.000000000 +0100 -+++ doc/README.twiddler 2010-09-08 13:26:14.128031459 +0200 +--- doc/README.twiddler.orig 2012-10-26 23:21:38.000000000 +0200 ++++ doc/README.twiddler 2013-04-16 11:48:12.186482098 +0200 @@ -101,23 +101,23 @@ precompile values because that would mea file, and provide documentation as well. Using a compulsory configuration file reliefs my workload :-) @@ -63,8 +72,8 @@ Index: doc/README.twiddler configuration files: error messages include the file name and the Index: doc/doc.gpm.in =================================================================== ---- doc/doc.gpm.in.orig 2008-06-16 22:44:05.000000000 +0200 -+++ doc/doc.gpm.in 2010-09-08 13:26:14.128031459 +0200 +--- doc/doc.gpm.in.orig 2012-10-26 23:21:38.000000000 +0200 ++++ doc/doc.gpm.in 2013-04-16 11:48:12.187482074 +0200 @@ -1971,7 +1971,7 @@ Available command line options are the f @item -u @@ -92,25 +101,10 @@ Index: doc/doc.gpm.in $(HOME)/.gpm-root The user configuration file. /dev/vcs* Virtual Console Screens .fi - -Index: doc/gpm.info -=================================================================== ---- doc/gpm.info.orig 2009-02-09 10:59:44.000000000 +0100 -+++ doc/gpm.info 2010-09-08 13:26:14.168026952 +0200 -@@ -1594,7 +1594,7 @@ distribution directory. The tool won't r - - `-u' - Deny using user-specific configuration files. With this option on, -- only `/etc/gpm-root.conf' will be used as a source of -+ only `/etc/gpm/root.conf' will be used as a source of - configuration information. This option is intended for those - system administrators who fear security could be broken by this - daemon. Things should be sufficiently secure, but if you find a - Index: src/headers/twiddler.h =================================================================== ---- src/headers/twiddler.h.orig 2009-02-09 10:58:53.000000000 +0100 -+++ src/headers/twiddler.h 2010-09-08 13:26:14.284013884 +0200 +--- src/headers/twiddler.h.orig 2012-10-26 23:21:38.000000000 +0200 ++++ src/headers/twiddler.h 2013-04-16 11:48:12.188482050 +0200 @@ -46,7 +46,7 @@ #define TW_M_MASK 0x1FF /* mask of movement bits, after shifting */ #define TW_M_BIT 0x100 @@ -123,8 +117,8 @@ Index: src/headers/twiddler.h Index: src/prog/gpm-root.y =================================================================== ---- src/prog/gpm-root.y.orig 2009-02-09 10:58:53.000000000 +0100 -+++ src/prog/gpm-root.y 2010-09-08 13:26:14.304011630 +0200 +--- src/prog/gpm-root.y.orig 2012-10-26 23:21:38.000000000 +0200 ++++ src/prog/gpm-root.y 2013-04-16 11:48:12.203481695 +0200 @@ -77,7 +77,7 @@ #endif @@ -134,11 +128,10 @@ Index: src/prog/gpm-root.y #define DEFAULT_FORE 7 #define DEFAULT_BACK 0 - Index: src/synaptics.c =================================================================== ---- src/synaptics.c.orig 2009-02-09 10:58:53.000000000 +0100 -+++ src/synaptics.c 2010-09-08 13:26:14.308011179 +0200 +--- src/synaptics.c.orig 2012-10-26 23:21:38.000000000 +0200 ++++ src/synaptics.c 2013-04-16 11:48:12.204481671 +0200 @@ -2064,7 +2064,7 @@ static void tp_process_report (Gpm_Event ** syn_read_config_file ** diff --git a/gpm-dependencies.patch b/gpm-dependencies.patch new file mode 100644 index 0000000..73bd398 --- /dev/null +++ b/gpm-dependencies.patch @@ -0,0 +1,26 @@ +From: Philipp Thomas +Date: 2013-04-16 13:06:54+02:00 +Subject: pass directory for gpm.h + +The directory containing gpm.h wasn't passed to the compiler when +generating dependencies. + +--- + src/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +signed-off-by: Philipp Thomas + +Index: src/Makefile.in +=================================================================== +--- src/Makefile.in.orig 2012-10-26 23:21:38.000000000 +0200 ++++ src/Makefile.in 2013-04-16 13:06:07.913236362 +0200 +@@ -96,7 +96,7 @@ $(DEPFILE) dep: prog/gpm-root.c + + # create dependencies + for DEPS in `echo *.c */*.c`; do \ +- $(CC) -I. -I $(srcdir) -M @CPPFLAGS@ $(CPPFLAGS) $$DEPS | \ ++ $(CC) -I. -I $(srcdir) -I $(srcdir)/headers -M @CPPFLAGS@ $(CPPFLAGS) $$DEPS | \ + $(SED) 's/^\(.*\)\.o\([ :]+\)/\1.o \1.lo\2/g' >> $(DEPFILE) ; done + + ### INSTALL diff --git a/gpm-do_create_symlink.patch b/gpm-do_create_symlink.patch new file mode 100644 index 0000000..24f3462 --- /dev/null +++ b/gpm-do_create_symlink.patch @@ -0,0 +1,46 @@ +From: Philipp Thomas +Date: 2013-04-16 13:20:48+02:00 +Subject: Do create the symlink libgpm.so + +--- + src/Makefile.in | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +signed-off-by: Philipp Thomas + +Index: src/Makefile.in +=================================================================== +--- src/Makefile.in.orig 2013-04-16 13:16:45.723219315 +0200 ++++ src/Makefile.in 2013-04-16 13:29:52.385720884 +0200 +@@ -79,7 +79,7 @@ prog/%: prog/%.o + # | $(SED) '\''s/\($*\)\.o\([ :]*\)/\1.o \1.lo\2/g'\'' > $(DEPDIR)/$@' + + # Do it all! +-all: gpm lib/libgpm.so.@abi_lev@ @LIBGPM_A@ $(PROG) ++all: gpm lib/libgpm.so.@abi_lev@ lib/libgpm.so @LIBGPM_A@ $(PROG) + + gpm: $(GOBJ) + $(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm +@@ -114,7 +114,8 @@ install: check + # headache in cases like this + if test "x@SHLIB@" != "x" ; then \ + $(INSTALL_DATA) -m 644 lib/libgpm.so.@abi_full@ $(DESTDIR)$(libdir)/libgpm.so.@abi_full@ ; \ +- cd $(DESTDIR)$(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \ ++ cd $(DESTDIR)$(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ && \ ++ $(LN_S) -f libgpm.so.@abi_lev@ libgpm.so ; \ + echo "WARNING: We installed a lib, you should now call ldconfig" ; \ + echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" ; \ + echo "Or to update everything just type ldconfig" ; \ +@@ -170,9 +171,9 @@ lib/libgpm.so.@abi_full@: $(PICS) + + lib/libgpm.so.@abi_lev@: lib/libgpm.so.@abi_full@ + $(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so.@abi_lev@ +-# unneeded, isn't it? +-#lib/libgpm.so: lib/libgpm.so.@abi_full@ +-# $(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so ++ ++lib/libgpm.so: lib/libgpm.so.@abi_full@ ++ $(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so + + include $(DEPFILE) + diff --git a/gpm-gcc4.3.patch b/gpm-gcc4.3.patch deleted file mode 100644 index 5d7f275..0000000 --- a/gpm-gcc4.3.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/daemon/open_console.c.gcc4.3 2008-05-28 11:12:34.000000000 +0200 -+++ src/daemon/open_console.c 2008-05-28 11:12:40.000000000 +0200 -@@ -21,7 +21,6 @@ - - #include /* open and co. */ - #include /* stat() */ --#include /* ioctl */ - - /* Linux specific (to be outsourced in gpm2 */ - #include /* for serial console check */ diff --git a/gpm-libtool.patch b/gpm-libtool.patch deleted file mode 100644 index e69a298..0000000 --- a/gpm-libtool.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.libtool 2009-02-11 08:12:00.000000000 +0100 -+++ configure.ac 2009-02-11 08:12:08.000000000 +0100 -@@ -42,7 +42,7 @@ release="`cat $srcdir/.gitversion`" - # - - AC_PROG_CC --AC_PROG_RANLIB -+AC_PROG_LIBTOOL - AC_PROG_INSTALL - AC_PROG_YACC - AC_PROG_LN_S diff --git a/gpm-weak-wgetch.patch b/gpm-weak-wgetch.patch index b03283a..1999b34 100644 --- a/gpm-weak-wgetch.patch +++ b/gpm-weak-wgetch.patch @@ -1,5 +1,25 @@ ---- src/lib/libcurses.c.weak-wgetch 2002-12-24 17:57:16.000000000 -0500 -+++ src/lib/libcurses.c 2004-03-22 15:51:24.000000000 -0500 +--- + configure.ac.footer | 2 +- + src/lib/libcurses.c | 7 ++++++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +Index: configure.ac.footer +=================================================================== +--- configure.ac.footer.orig 2013-04-16 12:26:55.701393713 +0200 ++++ configure.ac.footer 2013-04-16 12:29:05.441356326 +0200 +@@ -148,7 +148,7 @@ No|no|N|n) SHARED_LIBS=-lc ;; + AC_CHECK_LIB($i, wgetch,,,$TERMLIBS) + else :; fi + done +- SHARED_LIBS="$LIBS $TERMLIBS -lc" ++ SHARED_LIBS="-lc" + LIBS=$SAVELIBS ;; + esac + +Index: src/lib/libcurses.c +=================================================================== +--- src/lib/libcurses.c.orig 2012-10-26 23:21:38.000000000 +0200 ++++ src/lib/libcurses.c 2013-04-16 12:26:55.834390599 +0200 @@ -41,7 +41,12 @@ #endif /* HAVE_NCURSES_CURSES_H */ #endif /* HAVE_NCURSES_H */ @@ -14,13 +34,3 @@ int Gpm_Wgetch(WINDOW *win) { ---- configure.ac.weak-wgetch 2004-03-22 15:49:51.000000000 -0500 -+++ configure.ac 2004-03-22 15:51:24.000000000 -0500 -@@ -115,7 +115,7 @@ - AC_CHECK_LIB($i, wgetch,,,$TERMLIBS) - else :; fi - done -- SHARED_LIBS="$LIBS $TERMLIBS -lc" -+ SHARED_LIBS="-lc" - LIBS=$SAVELIBS ;; - esac diff --git a/gpm.changes b/gpm.changes index 9e5e753..74d2469 100644 --- a/gpm.changes +++ b/gpm.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Apr 16 12:23:35 CEST 2013 - pth@suse.de + +- Update to 1.20.7: + +- Adapt patches to changed sources. +- Add patch to pass the directory for gpm.h when generating + dependencies: gpm-dependencies.patch +- Add patch that enables the creation of the libgpm.so symlink + again and installs it: gpm-do_create_symlink.patch +- Removed patches not needed anymore: + gpm-gcc4.3.patch + gpm-libtool.patch + config-guess-sub-update.patch + ------------------------------------------------------------------- Tue Feb 12 07:56:47 UTC 2013 - schwab@suse.de diff --git a/gpm.spec b/gpm.spec index 3f9a42f..177e6e4 100644 --- a/gpm.spec +++ b/gpm.spec @@ -17,7 +17,7 @@ Name: gpm -Version: 1.20.6 +Version: 1.20.7 Release: 0 Summary: Console Mouse Support License: GPL-2.0+ @@ -45,15 +45,17 @@ Patch18: gpm-glibc210.patch Patch19: gpm-use_getdtablesize.patch Patch20: gpm-int_ptr_casts.patch Patch21: gpm-close-fds.patch -Patch22: gpm-gcc4.3.patch Patch23: gpm-lib-silent.patch -Patch24: gpm-libtool.patch Patch25: gpm-multilib.patch Patch26: gpm-weak-wgetch.patch -Patch27: config-guess-sub-update.patch +#PATCH-FIX-UPSTREAM Pass path to gpm.h +Patch28: gpm-dependencies.patch +#PATCH-FIX-UPSTREAM Create the symlink libgpm.so +Patch29: gpm-do_create_symlink.patch BuildRequires: bison BuildRequires: libtool BuildRequires: lzma +BuildRequires: makeinfo BuildRequires: ncurses-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %install_info_prereq @@ -94,18 +96,18 @@ Development files for the gpm (general purpose mouse) package. %patch19 %patch20 %patch21 -%patch22 %patch23 -%patch24 %patch25 %patch26 -%patch27 +%patch28 +%patch29 cp %{S:2} %{S:3} %{S:4} . %build # This package failed when testing with -Wl,-as-needed being default. # So we disable it here, if you want to retest, just delete this comment and the line below. -export SUSE_ASNEEDED=0 +#export SUSE_ASNEEDED=0 +./autogen.sh autoreconf -fi CFLAGS="$RPM_OPT_FLAGS -DQUIET_LIBGPM" \ %configure --disable-static \ @@ -171,8 +173,8 @@ touch %{buildroot}%{_localstatedir}/run/gpm.pid %files %defattr(-,root,root) -%doc BUGS COPYING README README.SuSE TODO doc/changes -%doc doc/Announce doc/FAQ doc/README* +%doc COPYING README README.gpm2 README.SuSE TODO +%doc doc/Announce doc/FAQ doc/README* doc/changelog %{_infodir}/* %{_mandir}/*/* %dir %config /etc/gpm @@ -186,7 +188,7 @@ touch %{buildroot}%{_localstatedir}/run/gpm.pid %files devel %defattr(-,root,root) -%{_includedir}/*.h +%{_includedir}/gpm.h %{_libdir}/libgpm.so %changelog From 15e61d7d7d3c08bbb9d421cbd43c8001d9ae64a2ed2196116c5aa73fcd2084ae Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Tue, 16 Apr 2013 13:03:27 +0000 Subject: [PATCH 2/3] - Add software URL. - Remove the patches tarball as upstream doesn't provide it anymore. OBS-URL: https://build.opensuse.org/package/show/Base:System/gpm?expand=0&rev=26 --- gpm-1.20.7-patches.tar.lzma | 3 --- gpm.changes | 6 ++++++ gpm.spec | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 gpm-1.20.7-patches.tar.lzma diff --git a/gpm-1.20.7-patches.tar.lzma b/gpm-1.20.7-patches.tar.lzma deleted file mode 100644 index 75adfaa..0000000 --- a/gpm-1.20.7-patches.tar.lzma +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad1c1a23324e626a532c76e5870aa36357f0df798960c53fc208fdfbdf8a5151 -size 312560 diff --git a/gpm.changes b/gpm.changes index 74d2469..840daa1 100644 --- a/gpm.changes +++ b/gpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 16 15:01:42 CEST 2013 - pth@suse.de + +- Add software URL. +- Remove the patches tarball as upstream doesn't provide it anymore. + ------------------------------------------------------------------- Tue Apr 16 12:23:35 CEST 2013 - pth@suse.de diff --git a/gpm.spec b/gpm.spec index 177e6e4..b5fe75f 100644 --- a/gpm.spec +++ b/gpm.spec @@ -24,8 +24,7 @@ License: GPL-2.0+ Group: System/Console Url: http://linux.schottelius.org/gpm/ -Source0: gpm-%{version}.tar.lzma -Source1: gpm-%{version}-patches.tar.lzma +Source0: http://www.nico.schottelius.org/software/gpm/archives/gpm-%{version}.tar.lzma Source2: rcgpm Source3: sysconfig.mouse-%{name} Source4: README.SuSE From 9f44f60ebbd1dac3f6d1f769ad558afb97b9bff381b4cb58b5033f78ce1aefab Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Tue, 16 Apr 2013 13:04:03 +0000 Subject: [PATCH 3/3] - Actually remove the unneeded patch. OBS-URL: https://build.opensuse.org/package/show/Base:System/gpm?expand=0&rev=27 --- config-guess-sub-update.patch | 1639 --------------------------------- 1 file changed, 1639 deletions(-) delete mode 100644 config-guess-sub-update.patch diff --git a/config-guess-sub-update.patch b/config-guess-sub-update.patch deleted file mode 100644 index ac45509..0000000 --- a/config-guess-sub-update.patch +++ /dev/null @@ -1,1639 +0,0 @@ -Index: config/config.guess -=================================================================== ---- config/config.guess.orig -+++ config/config.guess -@@ -1,14 +1,14 @@ - #! /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, 2013 Free Software Foundation, Inc. - --timestamp='2008-01-23' -+timestamp='2012-12-30' - - # 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 --# the Free Software Foundation; either version 2 of the License, or -+# the Free Software Foundation; either version 3 of the License, or - # (at your option) any later version. - # - # This program is distributed in the hope that it will be useful, but -@@ -17,26 +17,22 @@ timestamp='2008-01-23' - # 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 - # configuration script generated by Autoconf, you may include it under --# 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. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). -+# -+# Originally written by Per Bothner. - # --# 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. -+# 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 - # --# The plan is that this can be called by configure scripts if you --# don't specify an explicit build system type. -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. -+ - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -56,8 +52,9 @@ version="\ - 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, 2013 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 +141,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` | - 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 +167,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - 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 +177,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - fi - ;; - *) -- os=netbsd -+ os=netbsd - ;; - esac - # The OS release -@@ -201,6 +198,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - # 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 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - 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 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - # 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 +299,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - 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 +328,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - 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 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - # 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 +484,8 @@ EOF - 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 +498,7 @@ EOF - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; -@@ -532,7 +555,7 @@ EOF - 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 +598,52 @@ EOF - 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); -- -- 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); -- } -+ #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); -+ } - EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -640,7 +663,7 @@ EOF - # => 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 +734,22 @@ EOF - 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 +773,14 @@ EOF - 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 +792,39 @@ EOF - 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 +834,9 @@ EOF - [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 +866,27 @@ EOF - 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 +894,40 @@ EOF - 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 +938,33 @@ EOF - 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 +974,17 @@ EOF - *) 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 +992,18 @@ EOF - 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 +1011,11 @@ EOF - 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 +1032,7 @@ EOF - 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 +1047,7 @@ EOF - 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 +1075,13 @@ EOF - 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 +1116,18 @@ EOF - /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 +1140,7 @@ EOF - 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 +1160,10 @@ EOF - 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 +1189,11 @@ EOF - 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 +1203,12 @@ EOF - 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 +1236,16 @@ EOF - *: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 +1261,10 @@ EOF - *: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 +1309,13 @@ EOF - 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 +1330,14 @@ EOF - 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 - -Index: config/config.sub -=================================================================== ---- config/config.sub.orig -+++ config/config.sub -@@ -1,44 +1,42 @@ - #! /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, 2013 Free Software Foundation, Inc. - --timestamp='2008-01-16' -+timestamp='2013-01-23' - --# This file is (in principle) common to ALL GNU software. --# The presence of a machine in this file suggests that SOME GNU software --# can handle that machine. It does not imply ALL GNU software can. --# --# 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 --# the Free Software Foundation; either version 2 of the License, or -+# 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 -+# the Free Software Foundation; either version 3 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. -+# 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, 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 - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). - - --# Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. - # - # 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 +70,9 @@ Report bugs and patches to