From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: msdos build patch Date: Mon, 10 May 2010 02:14:25 -0400 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit X-Trace: dough.gmane.org 1273472083 27395 80.91.229.12 (10 May 2010 06:14:43 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 10 May 2010 06:14:43 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon May 10 08:14:41 2010 connect(): No such file or directory Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OBMGG-0006OM-Rk for ged-emacs-devel@m.gmane.org; Mon, 10 May 2010 08:14:41 +0200 Original-Received: from localhost ([127.0.0.1]:53329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OBMGF-00020u-FJ for ged-emacs-devel@m.gmane.org; Mon, 10 May 2010 02:14:39 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1OBMG7-00020k-Hd for emacs-devel@gnu.org; Mon, 10 May 2010 02:14:31 -0400 Original-Received: from [199.232.76.173] (port=44594 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OBMG6-00020b-S6 for emacs-devel@gnu.org; Mon, 10 May 2010 02:14:30 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1OBMG5-000556-00 for emacs-devel@gnu.org; Mon, 10 May 2010 02:14:30 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:52265) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1OBMG4-000552-OI for emacs-devel@gnu.org; Mon, 10 May 2010 02:14:28 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1OBMG2-0001F0-K0; Mon, 10 May 2010 02:14:26 -0400 X-Spook: underground global Mantis Etacs industrial intelligence X-Ran: $c0MXBQ%=f`j/DFg~Q}M%tx5HL?+k~"\30.hLhV\y(?ga>Nc*rOI9B0n(D*RrNk$%-QPh[ X-Hue: red X-Attribution: GM User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:124656 Archived-At: 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 :libsrc2 rm -f makefile.new junk.c + if "%X11%" == "" goto libsrc2a + mv Makefile makefile.tmp + sed -f ../msdos/sed3x.inp Makefile + rm -f makefile.tmp + :libsrc2a if "%nodebug%" == "" goto libsrc3 sed -e "/^CFLAGS *=/s/ *-gcoff//" makefile.tmp sed -e "/^ALL_CFLAGS *=/s/=/= -s/" 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) --- 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! +