[Emacs-diffs] trunk r117723: Fix bug #18302 with minor issues in the MSYS2/MinGW64 build.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117723
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18302
author: Karol Ostrovsky <address@hidden>
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2014-08-23 11:48:30 +0300
message:
  Fix bug #18302 with minor issues in the MSYS2/MinGW64 build.
  
   configure.ac: Accept "*-mingw*", not just "*-mingw32", as
   canonical name of a MinGW build, because using MSYS2 'uname'
   produces "MINGW64".
  
   src/Makefile.in (emacs$(EXEEXT)): Retry deletion of bootstrap-emacs
   if the initial "rm -f" fails.  This is for MinGW builds, where
   MS-Windows will not allow deleting the executable file of a
   running program.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/Makefile.in                makefile.in-20091113204419-o5vbwnq5f7feedwu-631

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-08-21 21:52:26 +0000
+++ b/ChangeLog 2014-08-23 08:48:30 +0000
@@ -1,3 +1,9 @@
+2014-08-23  Karol Ostrovsky  <address@hidden>  (tiny change)
+
+       * configure.ac: Accept "*-mingw*", not just "*-mingw32", as
+       canonical name of a MinGW build, because using MSYS2 'uname'
+       produces "MINGW64".
+
 2014-08-21  Ken Brown  <address@hidden>
 
        * configure.ac (HAVE_XPM): Explain the use of CPPFLAGS in the

=== modified file 'configure.ac'
--- a/configure.ac      2014-08-21 21:52:26 +0000
+++ b/configure.ac      2014-08-23 08:48:30 +0000
@@ -650,7 +650,7 @@
   i[3456]86-*-* )
     case "${canonical}" in
       *-darwin* )               opsys=darwin ;;
-      *-mingw32 )
+      *-mingw* )
                opsys=mingw32
                # MinGW overrides and adds some system headers in nt/inc.
                GCC_TEST_OPTIONS="-I $srcdir/nt/inc"
@@ -665,7 +665,7 @@
   # MinGW64
   x86_64-*-* )
     case "${canonical}" in
-      *-mingw32 )
+      *-mingw* )
                opsys=mingw32
                # MinGW overrides and adds some system headers in nt/inc.
                GCC_TEST_OPTIONS="-I $srcdir/nt/inc"
@@ -1323,7 +1323,7 @@
   C_SWITCH_SYSTEM="-ma -qmaxmem=4000"
 if test "$opsys" = "mingw32"; then
   case "$canonical" in
-    x86_64-*-mingw32) C_SWITCH_SYSTEM="-mtune=generic" ;;
+    x86_64-*-mingw*) C_SWITCH_SYSTEM="-mtune=generic" ;;
     *) C_SWITCH_SYSTEM="-mtune=pentium4" ;;
   esac
 fi

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-08-20 14:41:15 +0000
+++ b/src/ChangeLog     2014-08-23 08:48:30 +0000
@@ -1,3 +1,10 @@
+2014-08-23  Karol Ostrovsky  <address@hidden>  (tiny change)
+
+       * Makefile.in (emacs$(EXEEXT)): Retry deletion of bootstrap-emacs
+       if the initial "rm -f" fails.  This is for MinGW builds, where
+       MS-Windows will not allow deleting the executable file of a
+       running program.
+
 2014-08-20  Eli Zaretskii  <address@hidden>
 
        * w32term.c (w32_scroll_bar_handle_click)

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2014-07-13 15:50:35 +0000
+++ b/src/Makefile.in   2014-08-23 08:48:30 +0000
@@ -435,7 +435,9 @@
        else \
          LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \
          test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \
-         rm -f bootstrap-emacs$(EXEEXT); \
+         while test -f bootstrap-emacs$(EXEEXT); do \
+           rm -f bootstrap-emacs$(EXEEXT); \
+         done; \
          ln emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
        fi