From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Christoph Scholtes Newsgroups: gmane.emacs.bugs Subject: bug#11527: import 2012-05-20 gnulib into trunk Date: Sat, 26 May 2012 21:36:31 -0600 Message-ID: <4FC1A13F.7090805@gmail.com> References: <4FB9551A.2010600@cs.ucla.edu> <4FC16EBA.6070805@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1338089822 17163 80.91.229.3 (27 May 2012 03:37:02 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 27 May 2012 03:37:02 +0000 (UTC) To: 11527@debbugs.gnu.org, eggert@cs.ucla.edu, Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun May 27 05:37:00 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SYUHr-0004fL-FD for geb-bug-gnu-emacs@m.gmane.org; Sun, 27 May 2012 05:36:59 +0200 Original-Received: from localhost ([::1]:55045 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYUHr-0003RX-0s for geb-bug-gnu-emacs@m.gmane.org; Sat, 26 May 2012 23:36:59 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:58813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYUHn-0003RR-Gj for bug-gnu-emacs@gnu.org; Sat, 26 May 2012 23:36:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SYUHl-00063D-Gv for bug-gnu-emacs@gnu.org; Sat, 26 May 2012 23:36:55 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35633) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYUHl-00062f-Aq for bug-gnu-emacs@gnu.org; Sat, 26 May 2012 23:36:53 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1SYUIr-0007jQ-Vl for bug-gnu-emacs@gnu.org; Sat, 26 May 2012 23:38:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Christoph Scholtes Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 27 May 2012 03:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11527 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 11527-submit@debbugs.gnu.org id=B11527.133808987429707 (code B ref 11527); Sun, 27 May 2012 03:38:01 +0000 Original-Received: (at 11527) by debbugs.gnu.org; 27 May 2012 03:37:54 +0000 Original-Received: from localhost ([127.0.0.1]:45179 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SYUIk-0007j6-4E for submit@debbugs.gnu.org; Sat, 26 May 2012 23:37:54 -0400 Original-Received: from mail-ob0-f172.google.com ([209.85.214.172]:57610) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SYUIh-0007is-AJ for 11527@debbugs.gnu.org; Sat, 26 May 2012 23:37:52 -0400 Original-Received: by obbeh20 with SMTP id eh20so4132855obb.3 for <11527@debbugs.gnu.org>; Sat, 26 May 2012 20:36:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding; bh=gigEsOc6MtU3/3RTLZJRUrpvKom5c2WCmg/X8Solr/k=; b=DTHU+YBHY94YRkNJNHS62ofEqtBJ+7CKrDt19cizx1u8eA8YGesbSNh2xD3ScsVna3 AZVDsMkshHR+usgYJ4WyK3RAwvDrqHr7HPY1tpZQHzUsHYa9hpfmK+xnemucJjcjfO5K nDJ4BzhcT1eK2EZBNXpG6EwtBX60+fLK4PGrfycXmGjbXo0gfAgFyZ/bR6GGS5jHJoIB mvpHIYs/22PZL5EKKZQA9v/Pv4s9VC3gr20k3nMPR1tFSrEqvpcuxkaQIORbZXy/D4f8 kP1tp2zCIA6N319cHQMq3PdCHU1vABypj/HqCwYCi2A09Wt4N8Aa1IACBpSn2e5+ZEmN kGKg== Original-Received: by 10.50.209.73 with SMTP id mk9mr1849018igc.66.1338089794971; Sat, 26 May 2012 20:36:34 -0700 (PDT) Original-Received: from [192.168.1.3] (71-208-70-38.hlrn.qwest.net. [71.208.70.38]) by mx.google.com with ESMTPS id de2sm2803685igc.4.2012.05.26.20.36.33 (version=SSLv3 cipher=OTHER); Sat, 26 May 2012 20:36:34 -0700 (PDT) User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 In-Reply-To: <4FC16EBA.6070805@cs.ucla.edu> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:60385 Archived-At: Hi Paul, On 5/26/2012 6:00 PM, Paul Eggert wrote: > After further testing I installed that into the trunk > as bzr 108385 and am marking it as done. This breaks the Windows build. Output: sha1.c:28:22: fatal error: stdalign.h: No such file or directory md5.c:26:22: fatal error: stdalign.h: No such file or directory compilation terminated. compilation terminated. mingw32-make[1]: *** [oo/i386/md5.o] Error 1 mingw32-make[1]: *** Waiting for unfinished jobs.... mingw32-make[1]: *** [oo/i386/sha1.o] Error 1 mingw32-make[1]: Leaving directory `D:/devel/emacs/emacs-bzr/trunk_jenkins/lib' mingw32-make: *** [bootstrap-gmake] Error 2 Eli, I am not sure if this is the right fix: === modified file 'lib/makefile.w32-in' --- lib/makefile.w32-in 2012-05-22 16:20:27 +0000 +++ lib/makefile.w32-in 2012-05-27 03:22:07 +0000 @@ -105,6 +105,7 @@ $(SRC)/md5.c \ $(SRC)/md5.h \ $(EMACS_ROOT)/nt/inc/stdint.h \ + $(EMACS_ROOT)/nt/inc/stdalign.h \ $(EMACS_ROOT)/nt/inc/sys/stat.h \ $(EMACS_ROOT)/src/s/ms-w32.h \ $(EMACS_ROOT)/src/config.h @@ -113,6 +114,7 @@ $(SRC)/sha1.c \ $(SRC)/sha1.h \ $(EMACS_ROOT)/nt/inc/stdint.h \ + $(EMACS_ROOT)/nt/inc/stdalign.h \ $(EMACS_ROOT)/nt/inc/sys/stat.h \ $(EMACS_ROOT)/src/s/ms-w32.h \ $(EMACS_ROOT)/src/config.h @@ -121,6 +123,7 @@ $(SRC)/sha256.c \ $(SRC)/sha256.h \ $(EMACS_ROOT)/nt/inc/stdint.h \ + $(EMACS_ROOT)/nt/inc/stdalign.h \ $(EMACS_ROOT)/nt/inc/sys/stat.h \ $(EMACS_ROOT)/src/s/ms-w32.h \ $(EMACS_ROOT)/src/config.h @@ -129,6 +132,7 @@ $(SRC)/sha512.c \ $(SRC)/sha512.h \ $(EMACS_ROOT)/nt/inc/stdint.h \ + $(EMACS_ROOT)/nt/inc/stdalign.h \ $(EMACS_ROOT)/nt/inc/sys/stat.h \ $(EMACS_ROOT)/src/s/ms-w32.h \ $(EMACS_ROOT)/src/config.h === added file 'nt/inc/stdalign.h' --- nt/inc/stdalign.h 1970-01-01 00:00:00 +0000 +++ nt/inc/stdalign.h 2012-05-27 03:28:15 +0000 @@ -0,0 +1,26 @@ +/* Replacement stdalign.h file for building GNU Emacs on Windows. + +Copyright (C) 2012 Free Software Foundation, Inc. + +This file is part of GNU Emacs. + +GNU Emacs is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +GNU Emacs is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Emacs. If not, see . */ + +#ifndef _NT_STDALIGN_H_ +#define _NT_STDALIGN_H_ + +/* Not available on Windows */ +#define _STRING_ARCH_unaligned 1 + +#endif /* _NT_STDALIGN_H_ */ Christoph