From: Glenn Morris <rgm@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: msdos build patch
Date: Mon, 10 May 2010 02:14:25 -0400 [thread overview]
Message-ID: <jnpr14jnb2.fsf@fencepost.gnu.org> (raw)
Hi,
Does this patch (or something like it) look ok for the msdos build?
The motivation is to remove the last use of cpp in lib-src/Makefile.in.
(Sorry, Gnus complains about non-printable characters, so the
config.bat patch may have mangled line-endings.)
BTW, config.bat still seems to contain code for the
no-longer-supported DJGPP v1.x case.
*** config.bat 2010-05-07 11:21:29 +0000
--- config.bat 2010-05-10 06:03:53 +0000
***************
*** 231,236 ****
--- 231,241 ----
sed -f ../msdos/sed3v2.inp <makefile.new >Makefile
:libsrc2
rm -f makefile.new junk.c
+ if "%X11%" == "" goto libsrc2a
+ mv Makefile makefile.tmp
+ sed -f ../msdos/sed3x.inp <makefile.tmp >Makefile
+ rm -f makefile.tmp
+ :libsrc2a
if "%nodebug%" == "" goto libsrc3
sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp
sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >Makefile
*** lib-src/Makefile.in 2010-05-10 02:16:09 +0000
--- lib-src/Makefile.in 2010-05-10 05:55:58 +0000
***************
*** 167,177 ****
# ========================== start of cpp stuff =======================
/* From here on, comments must be done in C syntax. */
- #ifdef MSDOS
- #include "../src/config.h"
- LIBS_SYSTEM = MSDOS_LIBS_SYSTEM
- #endif
-
LOADLIBES=$(LIBS_SYSTEM)
\f
--- 167,172 ----
*** msdos/sed1x.inp 2010-01-04 05:35:18 +0000
--- msdos/sed1x.inp 2010-05-10 05:58:19 +0000
***************
*** 5,10 ****
--- 5,11 ----
s!^ @true *$! @rem!
s/DOC/DOC-X/g
#/^LIBXMENU *=/s!= *!= ../oldxmenu/!
+ /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
/^temacs *:/s!OLDXMENU!LIBXMENU!
# arch-tag: 3e8a78f2-3dec-44f3-81f6-3785a562da19
*** src/Makefile.in 2010-05-10 02:16:09 +0000
--- src/Makefile.in 2010-05-10 05:56:13 +0000
***************
*** 322,328 ****
#endif
#ifdef MSDOS
- LIBS_SYSTEM = MSDOS_LIBS_SYSTEM
#ifdef HAVE_X_WINDOWS
MSDOS_OBJ = dosfns.o msdos.o
#else
--- 322,327 ----
*** src/s/msdos.h 2010-05-10 02:16:09 +0000
--- src/s/msdos.h 2010-05-10 06:04:34 +0000
***************
*** 140,148 ****
commentary below, in the non-X branch. The 140KB number was
measured on GNU/Linux and on MS-WIndows. */
#define SYSTEM_PURESIZE_EXTRA (-170000+140000)
- #define MSDOS_LIBS_SYSTEM -lxext -lsys
#else
- #define MSDOS_LIBS_SYSTEM
/* We need a little extra space, see ../../lisp/loadup.el.
As of 20091024, DOS-specific files use up 62KB of pure space. But
overall, we end up wasting 130KB of pure space, because
--- 140,146 ----
*** /dev/null 2010-05-09 15:35:46.968393334 -0700
--- sed3x.inp 2010-05-09 23:01:24.000000000 -0700
***************
*** 0 ****
--- 1,5 ----
+ # -sed3x.inp------------------------------------------------------------
+ # Extra configuration script for lib-src/makefile for DesqView/X
+ # ----------------------------------------------------------------------
+ /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
+
next reply other threads:[~2010-05-10 6:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-10 6:14 Glenn Morris [this message]
2010-05-10 17:13 ` msdos build patch Eli Zaretskii
2010-05-11 3:00 ` Glenn Morris
2010-05-15 8:47 ` 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=jnpr14jnb2.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=eliz@gnu.org \
--cc=emacs-devel@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).