From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Christoph Newsgroups: gmane.emacs.devel Subject: Re: How many more gnulib imports? Date: Sun, 20 Feb 2011 09:13:37 -0700 Message-ID: <4D613DB1.9030705@gmail.com> References: <4D60F860.6020303@cs.ucla.edu> <4D613998.6000607@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------040100000909050502000605" X-Trace: dough.gmane.org 1298218446 19463 80.91.229.12 (20 Feb 2011 16:14:06 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 20 Feb 2011 16:14:06 +0000 (UTC) Cc: Eli Zaretskii , Paul Eggert , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 20 17:13:57 2011 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 1PrBv2-0006ia-B4 for ged-emacs-devel@m.gmane.org; Sun, 20 Feb 2011 17:13:57 +0100 Original-Received: from localhost ([127.0.0.1]:46492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PrBv0-0005Cu-Sw for ged-emacs-devel@m.gmane.org; Sun, 20 Feb 2011 11:13:54 -0500 Original-Received: from [140.186.70.92] (port=47856 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PrBut-0005CY-Vt for emacs-devel@gnu.org; Sun, 20 Feb 2011 11:13:49 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PrBus-0001S2-UB for emacs-devel@gnu.org; Sun, 20 Feb 2011 11:13:47 -0500 Original-Received: from mail-iw0-f169.google.com ([209.85.214.169]:62703) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PrBur-0001RY-Ev; Sun, 20 Feb 2011 11:13:45 -0500 Original-Received: by iwl42 with SMTP id 42so2022286iwl.0 for ; Sun, 20 Feb 2011 08:13:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:message-id:date:from:user-agent:mime-version:cc :subject:references:in-reply-to:content-type; bh=Gt/vrGmKlxyiixT/GxumidHWoPq/9pbdQ2AbLCHdjPE=; b=B7iDxKTMVHYW+vLsN7pzxa0VmwrYNhTxHnx5kdfVCnPwp50VZXNx5zchNc8OSmSwwH 2mipBV1FkeuFg0x4LAMTdyyRoDVMbPOaRtQ45byS4oqTz5+LIYt19WGE8WdpCCUsiyDf BY0VxeneXlsJyt+boueCVhGwP0Ojd3F/bWksQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:cc:subject:references :in-reply-to:content-type; b=QhdP7cJAJ3cALUPGpT70PIaAApskRqG3qJMHBXrcas4tUwiIcukqJ3wJVgHNo61Gb4 qzdilxehJZagJErMcORmLaC9bKncD2lN3Inj0Q4QCN98dB3tPXbA61vx2H+HOU8yMB95 iJQQLsT7+2kiU81Mb/9h1bv4ctKVOEnRF4ubo= Original-Received: by 10.42.1.133 with SMTP id 5mr666946icg.239.1298218424538; Sun, 20 Feb 2011 08:13:44 -0800 (PST) Original-Received: from [192.168.1.4] (71-208-192-11.hlrn.qwest.net [71.208.192.11]) by mx.google.com with ESMTPS id 8sm1582022iba.4.2011.02.20.08.13.42 (version=SSLv3 cipher=OTHER); Sun, 20 Feb 2011 08:13:43 -0800 (PST) User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.13) Gecko/20101207 Thunderbird/3.1.7 In-Reply-To: <4D613998.6000607@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.169 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:136284 Archived-At: This is a multi-part message in MIME format. --------------040100000909050502000605 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 2/20/2011 8:56 AM, I wrote: > In regards to the md5 change, I think I have a patch to fix the Windows > build. I will send it for review once my bootstrap finishes and I see > everything works. Shouldn't be too long. Find the patch fixing the Windows build for including lib/md5.c attached. Christoph --------------040100000909050502000605 Content-Type: text/plain; name="md5-fix-v1.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="md5-fix-v1.txt" === modified file 'lib/makefile.w32-in' --- lib/makefile.w32-in 2011-01-31 19:36:08 +0000 +++ lib/makefile.w32-in 2011-02-20 15:49:09 +0000 @@ -27,7 +27,8 @@ $(BLD)/getopt.$(O) \ $(BLD)/getopt1.$(O) \ $(BLD)/strftime.$(O) \ - $(BLD)/time_r.$(O) + $(BLD)/time_r.$(O) \ + $(BLD)/md5.$(O) # # Build the library @@ -93,6 +94,14 @@ $(EMACS_ROOT)/src/m/intel386.h \ $(EMACS_ROOT)/src/config.h +$(BLD)/md5.$(O) : \ + $(EMACS_ROOT)/lib/md5.c \ + $(EMACS_ROOT)/src/s/ms-w32.h \ + $(EMACS_ROOT)/src/m/intel386.h \ + $(EMACS_ROOT)/src/config.h \ + $(EMACS_ROOT)/nt/inc/sys/stat.h \ + $(EMACS_ROOT)/lib/md5.h + # The following dependencies are for supporting parallel builds, where # we must make sure $(BLD) exists before any compilation starts. # === modified file 'src/ChangeLog' --- src/ChangeLog 2011-02-20 08:48:52 +0000 +++ src/ChangeLog 2011-02-20 16:08:30 +0000 @@ -1,3 +1,8 @@ +2011-02-20 Christoph Scholtes + + * makefile.w32-in: Remove md5.$(O). + ($(BLD)/md5.$(O)): Remove prerequisites. + 2011-02-20 Paul Eggert Import crypto/md5 and stdint modules from gnulib. === modified file 'src/makefile.w32-in' --- src/makefile.w32-in 2011-02-09 20:50:17 +0000 +++ src/makefile.w32-in 2011-02-20 15:43:20 +0000 @@ -81,7 +81,6 @@ $(BLD)/lread.$(O) \ $(BLD)/macros.$(O) \ $(BLD)/marker.$(O) \ - $(BLD)/md5.$(O) \ $(BLD)/minibuf.$(O) \ $(BLD)/w32.$(O) \ $(BLD)/w32heap.$(O) \ @@ -221,7 +220,7 @@ syntax.c bytecode.c \ process.c callproc.c unexw32.c \ region-cache.c sound.c atimer.c \ - doprnt.c intervals.c textprop.c composite.c md5.c + doprnt.c intervals.c textprop.c composite.c SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o dbusbind.o obj = $(GLOBAL_SOURCES:.c=.o) @@ -843,6 +842,7 @@ $(EMACS_ROOT)/nt/inc/nl_types.h \ $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ + $(EMACS_ROOT)/lib/md5.h \ $(LISP_H) \ $(SRC)/atimer.h \ $(SRC)/blockinput.h \ @@ -856,7 +856,6 @@ $(SRC)/intervals.h \ $(SRC)/keyboard.h \ $(SRC)/keymap.h \ - $(SRC)/md5.h \ $(SRC)/systime.h \ $(SRC)/w32gui.h \ $(SRC)/window.h @@ -1135,11 +1134,6 @@ $(SRC)/buffer.h \ $(SRC)/character.h -$(BLD)/md5.$(O) : \ - $(SRC)/md5.c \ - $(CONFIG_H) \ - $(SRC)/md5.h - $(BLD)/menu.$(O) : \ $(SRC)/menu.c \ $(CONFIG_H) \ --------------040100000909050502000605--