From: Karol Ostrovsky <karol.ostrovsky@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Chris Zheng <chriszheng99@gmail.com>, 18302@debbugs.gnu.org
Subject: bug#18302: MSYS2 build issues
Date: Fri, 22 Aug 2014 16:18:11 +0200 [thread overview]
Message-ID: <CAFpApP_v5rBMWx7Xs-q+kpXrQ29OP=HWk2ZGZ8tf8nUpgNVt7w@mail.gmail.com> (raw)
In-Reply-To: <83r408myxv.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
Hello all,
I will try to summarise the situation, and I am attaching my updated
solution proposal for this particular bug:
1. MSYS2 uname must be handled properly, and that is fixed in the new
proposed patch. I disagree with not renaming opsys from mingw32 to
mingw, since mingw32 string is used in other places in the same file
and it means something else there, which I find possibly confusing.
But this change is not in my new patch.
2. -mtune is back to what it was with a minimal change required for
MSYS2+MinGW-w64 uname handling.
3. Include path for xpm in MSYS2+MinGW-w64 is handled in the same way
as in Cygwin. Perhaps, the same type of comment as was added for
Cygwin should be added for MSYS2+MinGW-w64.
4. A loop is added in the recipe for emacs.exe to handle
bootstrap-emacs.exe busy problem.
Best regards,
Karol
On 22 August 2014 15:33, Eli Zaretskii <eliz@gnu.org> wrote:
>> Date: Fri, 22 Aug 2014 09:04:35 -0400
>> From: Ken Brown <kbrown@cornell.edu>
>> CC: karol.ostrovsky@gmail.com, chriszheng99@gmail.com, 18302@debbugs.gnu.org
>>
>> On 8/22/2014 2:10 AM, Eli Zaretskii wrote:
>> > Thanks, but why not on the release branch? A comment cannot possibly
>> > do any harm.
>>
>> Done, as revision 117454.
>
> Thank you.
[-- Attachment #2: configure.ac.diff --]
[-- Type: text/plain, Size: 1456 bytes --]
diff --git a/configure.ac b/configure.ac
index 3e49527..c350673 100644
--- a/configure.ac
+++ b/configure.ac
@@ -650,7 +650,7 @@ case "${canonical}" in
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 @@ case "${canonical}" in
# 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 @@ test "$opsys" = "aix4.2" && test "x$GCC" != "xyes" && \
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
@@ -3066,11 +3066,13 @@ fi
### run time).
if test "${opsys}" = "mingw32"; then
if test "${with_xpm}" != "no"; then
+ CPPFLAGS="$CPPFLAGS -I/mingw64/include/noX"
AC_CHECK_HEADER(X11/xpm.h, HAVE_XPM=yes, HAVE_XPM=no, [
#define FOR_MSW 1])
fi
if test "${HAVE_XPM}" = "yes"; then
+ REAL_CPPFLAGS="$REAL_CPPFLAGS -I/mingw64/include/noX"
AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm library (-lXpm).])
fi
fi
[-- Attachment #3: Makefile.in.diff --]
[-- Type: text/plain, Size: 502 bytes --]
diff --git a/src/Makefile.in b/src/Makefile.in
index 0dc4886..3f1192f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -435,6 +435,8 @@ emacs$(EXEEXT): temacs$(EXEEXT) \
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
next prev parent reply other threads:[~2014-08-22 14:18 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-20 9:54 bug#18302: MSYS2 build issues Karol Ostrovsky
2014-08-20 16:26 ` Eli Zaretskii
2014-08-20 17:04 ` Glenn Morris
2014-08-20 17:20 ` Eli Zaretskii
2014-08-21 10:08 ` Karol Ostrovsky
2014-08-21 14:30 ` Eli Zaretskii
2014-08-21 16:00 ` Glenn Morris
2014-08-21 18:38 ` Ken Brown
2014-08-21 19:22 ` Eli Zaretskii
2014-08-21 19:33 ` Eli Zaretskii
2014-08-21 21:29 ` Ken Brown
2014-08-22 6:10 ` Eli Zaretskii
2014-08-22 13:04 ` Ken Brown
2014-08-22 13:33 ` Eli Zaretskii
2014-08-22 14:18 ` Karol Ostrovsky [this message]
2014-08-23 8:57 ` Eli Zaretskii
2014-08-25 8:18 ` Karol Ostrovsky
2014-08-25 14:56 ` Eli Zaretskii
2017-11-29 1:46 ` Noam Postavsky
2014-08-21 22:32 ` Angelo Graziosi
2014-08-22 6:30 ` Eli Zaretskii
2014-08-22 10:55 ` Angelo Graziosi
2014-08-22 13:25 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFpApP_v5rBMWx7Xs-q+kpXrQ29OP=HWk2ZGZ8tf8nUpgNVt7w@mail.gmail.com' \
--to=karol.ostrovsky@gmail.com \
--cc=18302@debbugs.gnu.org \
--cc=chriszheng99@gmail.com \
--cc=eliz@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).