From MAILER-DAEMON Fri Mar 30 06:21:51 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SDYxr-0001e6-HK
	for mharc-bug-cppi@gnu.org; Fri, 30 Mar 2012 06:21:51 -0400
Received: from eggs.gnu.org ([208.118.235.92]:51230)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <akim.demaille@gmail.com>) id 1SDEXl-00068s-Dd
	for bug-cppi@gnu.org; Thu, 29 Mar 2012 08:33:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <akim.demaille@gmail.com>) id 1SDEXf-0003rD-Lu
	for bug-cppi@gnu.org; Thu, 29 Mar 2012 08:33:32 -0400
Received: from mail-we0-f169.google.com ([74.125.82.169]:57037)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <akim.demaille@gmail.com>) id 1SDEXf-0003r0-CR
	for bug-cppi@gnu.org; Thu, 29 Mar 2012 08:33:27 -0400
Received: by werj55 with SMTP id j55so1254181wer.0
	for <bug-cppi@gnu.org>; Thu, 29 Mar 2012 05:33:25 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=from:content-type:subject:date:message-id:to:mime-version:x-mailer;
	bh=lGYLGNM9Q0MZEyyykmeT5vFGxSZhpJZWiVCf7cWDWp0=;
	b=cR7DRbJbaM1bHOa+ZzR+x9S5bzYcNj8FrXn+JQZX5xqZlwIzUWsBUZBKbrctMH7ljw
	Q4cJx3RBY43s+o8+GgvCPY12D1Xa2Z84nVE/u02LG2j9SXn9uIZrB2i/Zqf9+2K45c55
	ghVSan2VBykSPebCtHncsDed6EpSq2bZ8JsesV3rbMFbIPxEjwTcdJRyi44W7lGVZt/G
	ZYf493FzOQJFYr2t+p3ZOv1ppB8QuYbY9qqMP8yYzQ53pQy/UF8Euy8Ft94zX/xS9ywO
	und68uSnYBWAZizpe2XMhXobbc0cwXdG0X6J9Ls6mvw9r8To8ExlBgISQdsYJ0xwztQ7
	PKCw==
Received: by 10.180.88.164 with SMTP id bh4mr5153855wib.22.1333024405243;
	Thu, 29 Mar 2012 05:33:25 -0700 (PDT)
Received: from tenochtitlan-eth.lrde.epita.fr (sao-paulo.lrde.epita.fr.
	[163.5.55.1])
	by mx.google.com with ESMTPS id ea6sm36483900wib.5.2012.03.29.05.33.23
	(version=TLSv1/SSLv3 cipher=OTHER);
	Thu, 29 Mar 2012 05:33:24 -0700 (PDT)
From: Akim Demaille <akim.demaille@gmail.com>
Content-Type: multipart/mixed; boundary=Apple-Mail-10-382400596
Date: Thu, 29 Mar 2012 14:33:22 +0200
Message-Id: <98EC8B0B-7696-487E-BA58-098B68BA8939@gmail.com>
To: bug-cppi@gnu.org
Mime-Version: 1.0 (Apple Message framework v1084)
X-Mailer: Apple Mail (2.1084)
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 74.125.82.169
X-Mailman-Approved-At: Fri, 30 Mar 2012 06:21:51 -0400
Subject: [bug-cppi] VPATH issues
X-BeenThere: bug-cppi@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: <bug-cppi.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-cppi>,
	<mailto:bug-cppi-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-cppi>
List-Post: <mailto:bug-cppi@gnu.org>
List-Help: <mailto:bug-cppi-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-cppi>,
	<mailto:bug-cppi-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Mar 2012 12:33:37 -0000


--Apple-Mail-10-382400596
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=us-ascii

Hi!

I've needed the following changes to be able to compile
cppi properly in VPATH build.  The second patch could
also have moved the -*- comment in the license header,
I don't know what your favorite choice is.

Cheers!


--Apple-Mail-10-382400596
Content-Disposition: attachment;
	filename=0001-build-fix-VPATH-build-issues.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="0001-build-fix-VPATH-build-issues.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=20b079aa04d6b1e106e790b8d6cdc2981b8f603006=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Akim=20Demaille=20<akim@lrde.epita.fr>=0ADate:=20=
Thu,=2029=20Mar=202012=2014:29:21=20+0200=0ASubject:=20[PATCH=201/2]=20=
build:=20fix=20VPATH=20build=20issues.=0A=0A*=20Makefile.am=20=
(.version):=20Must=20be=20in=20srcdir.=0A*=20src/local.mk=20=
(AM_CPPFLAGS):=20Add=20missing=20-I=20for=20src/system.h.=0A---=0A=20=
Makefile.am=20=20|=20=20=20=206=20+++---=0A=20src/local.mk=20|=20=20=20=20=
2=20+-=0A=202=20files=20changed,=204=20insertions(+),=204=20deletions(-)=0A=
=0Adiff=20--git=20a/Makefile.am=20b/Makefile.am=0Aindex=20=
af628ec..d9becd4=20100644=0A---=20a/Makefile.am=0A+++=20b/Makefile.am=0A=
@@=20-5,7=20+5,7=20@@=20SUBDIRS=20=3D=20po=20.=0A=20=0A=20=
ACLOCAL_AMFLAGS=20=3D=20-I=20m4=0A=20=0A-EXTRA_DIST=20=3D=20cfg.mk=20=
maint.mk=20.prev-version=20.version=20dist-check.mk=0A+EXTRA_DIST=20=3D=20=
cfg.mk=20maint.mk=20.prev-version=20$(top_srcdir)/.version=20=
dist-check.mk=0A=20=0A=20#=20Arrange=20so=20that=20.tarball-version=20=
appears=20only=20in=20the=20distribution=0A=20#=20tarball,=20and=20never=20=
in=20a=20checked-out=20repository.=0A@@=20-35,8=20+35,8=20@@=20=
gen-ChangeLog:=0A=20=09=20=20mv=20$(distdir)/cl-t=20=
$(distdir)/ChangeLog;=09=09=09\=0A=20=09fi=0A=20=0A-BUILT_SOURCES=20=3D=20=
.version=0A-.version:=0A+BUILT_SOURCES=20=3D=20$(top_srcdir)/.version=0A=
+$(top_srcdir)/.version:=0A=20=09echo=20$(VERSION)=20>=20$@-t=20&&=20mv=20=
$@-t=20$@=0A=20=0A=20distcheck-hook:=0Adiff=20--git=20a/src/local.mk=20=
b/src/local.mk=0Aindex=2095d3143..bda9be5=20100644=0A---=20=
a/src/local.mk=0A+++=20b/src/local.mk=0A@@=20-17,7=20+17,7=20@@=20=
DISTCLEANFILES=20+=3D=20src/cpp.h=20src/lex.backup=0A=20=0A=20GPERF=20=3D=20=
gperf=0A=20=0A-AM_CPPFLAGS=20+=3D=20-I$(top_srcdir)/lib=20-Isrc=0A=
+AM_CPPFLAGS=20+=3D=20-I$(top_srcdir)/lib=20-Isrc=20-I$(top_srcdir)/src=0A=
=20=0A=20LDADD=20=3D=20$(top_builddir)/lib/libcppi.a=20$(LIBINTL)=20=
$(top_builddir)/lib/libcppi.a=0A=20=0A--=20=0A1.7.9.4=0A=0A=

--Apple-Mail-10-382400596
Content-Disposition: attachment;
	filename=0002-maint-please-Emacs.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="0002-maint-please-Emacs.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=2036cbe843c2b532857a524b6108d8a8abf234a03d=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Akim=20Demaille=20<akim@lrde.epita.fr>=0ADate:=20=
Thu,=2029=20Mar=202012=2014:30:57=20+0200=0ASubject:=20[PATCH=202/2]=20=
maint:=20please=20Emacs.=0A=0A*=20src/cppi.l:=20Put=20the=20C=20mode=20=
request=20in=20a=20place=20all=20the=0AEmacsen=20check.=0A---=0A=20=
src/cppi.l=20|=20=20=20=208=20+++++++-=0A=201=20file=20changed,=207=20=
insertions(+),=201=20deletion(-)=0A=0Adiff=20--git=20a/src/cppi.l=20=
b/src/cppi.l=0Aindex=20b2c64a4..6e27320=20100644=0A---=20a/src/cppi.l=0A=
+++=20b/src/cppi.l=0A@@=20-22,7=20+22,7=20@@=0A=20#include=20"system.h"=0A=
=20}=0A=20=0A-%{=20/*=20-*-=20C=20-*-=20*/=0A+%{=0A=20=0A=20/*=20When=20=
output=20is=20inhibited,=20exit=20with=20status:=0A=20=20=20=200=20if=20=
all's=20ok=0A@@=20-858,3=20+858,9=20@@=20main=20(int=20argc,=20char=20=
**argv)=0A=20=0A=20=20=20exit=20(max_err);=0A=20}=0A+=0A+/*=0A+=20=20=
Local=20Variables:=0A+=20=20mode:=20c=0A+=20=20End:=0A+*/=0A--=20=0A=
1.7.9.4=0A=0A=

--Apple-Mail-10-382400596--


From MAILER-DAEMON Fri Mar 30 06:21:51 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SDYxr-0001eH-Jk
	for mharc-bug-cppi@gnu.org; Fri, 30 Mar 2012 06:21:51 -0400
Received: from eggs.gnu.org ([208.118.235.92]:56176)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <akim@lrde.epita.fr>) id 1SDEsp-0006Xq-8G
	for bug-cppi@gnu.org; Thu, 29 Mar 2012 08:55:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <akim@lrde.epita.fr>) id 1SDEsi-0002bP-RS
	for bug-cppi@gnu.org; Thu, 29 Mar 2012 08:55:18 -0400
Received: from sao-paulo.lrde.epita.fr ([163.5.55.1]:54502
	helo=kualalumpur.lrde.epita.fr)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <akim@lrde.epita.fr>) id 1SDEsi-0002b8-Ic
	for bug-cppi@gnu.org; Thu, 29 Mar 2012 08:55:12 -0400
Received: from tenochtitlan-eth.lrde.epita.fr ([192.168.101.154])
	by kualalumpur.lrde.epita.fr with esmtpsa
	(TLS-1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.63)
	(envelope-from <akim@lrde.epita.fr>) id 1SDEsO-0002Y0-Gy
	for bug-cppi@gnu.org; Thu, 29 Mar 2012 14:54:52 +0200
From: Akim Demaille <akim@lrde.epita.fr>
Content-Type: multipart/mixed; boundary=Apple-Mail-16-383708873
Date: Thu, 29 Mar 2012 14:55:10 +0200
Message-Id: <7684424F-D398-427E-8829-F02098AEA062@lrde.epita.fr>
To: bug-cppi@gnu.org
Mime-Version: 1.0 (Apple Message framework v1084)
X-Mailer: Apple Mail (2.1084)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 163.5.55.1
X-Mailman-Approved-At: Fri, 30 Mar 2012 06:21:51 -0400
Subject: [bug-cppi] Invalid tweaking of GPerf output
X-BeenThere: bug-cppi@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: <bug-cppi.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-cppi>,
	<mailto:bug-cppi-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-cppi>
List-Post: <mailto:bug-cppi@gnu.org>
List-Help: <mailto:bug-cppi-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-cppi>,
	<mailto:bug-cppi-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Mar 2012 12:55:29 -0000


--Apple-Mail-16-383708873
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii

I've also needed this patch.  Was not part of the first
batch because I was looking for it in gperf, but really
it's in cppi that the problem is.  Below is the diff
straight-from-gperf as-patched-by-cppi of cpp-cond.c:

As you can see the first hunk has twice "static", which
my gcc dislikes.

--- s   2012-03-29 14:42:22.000000000 +0200
+++ src/cpp-cond.c      2012-03-29 14:41:01.000000000 +0200
@@ -31,20 +31,21 @@
 #line 1 "../../src/cpp.gp"
 struct KW {char const *name; int code;};
=20
 #define TOTAL_KEYWORDS 9
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 6
 #define MIN_HASH_VALUE 0
 #define MAX_HASH_VALUE 55
 /* maximum key range =3D 56, duplicates =3D 0 */
=20
+static
 #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >=3D 199901L) || =
defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
 inline
 #elif defined(__GNUC__)
 __inline
 #endif
 static unsigned int
 hash (register const char *str, register unsigned int len)
 {
   static const unsigned char asso_values[] =3D
     {
@@ -96,20 +97,21 @@
       /*FALLTHROUGH*/
       case 1:
         hval +=3D asso_values[(unsigned char)str[0]];
         break;
     }
   return hval;
 }
=20
 #ifdef __GNUC__
 __inline
+static
 #if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
 __attribute__ ((__gnu_inline__))
 #endif
 #endif
 const struct KW *
 cpp_cond_lookup (register const char *str, register unsigned int len)
 {
   static const struct KW wordlist[] =3D
     {
 #line 11 "../../src/cpp.gp"




--Apple-Mail-16-383708873
Content-Disposition: attachment;
	filename=0001-build-fix-gperf-fix.patch
Content-Type: application/octet-stream;
	name="0001-build-fix-gperf-fix.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=20d06bd897d450a2f8ee2ff253a732a6a54b05cd4d=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Akim=20Demaille=20<akim@lrde.epita.fr>=0ADate:=20=
Thu,=2029=20Mar=202012=2014:51:20=20+0200=0ASubject:=20[PATCH]=20build:=20=
fix=20gperf=20fix.=0A=0A*=20src/local.mk=20(src/cpp-cond.c):=20Use=20a=20=
more=20accurate=20pattern=0Ato=20make=20the=20lookup=20function=20=
static.=0A---=0A=20src/local.mk=20|=20=20=20=203=20++-=0A=201=20file=20=
changed,=202=20insertions(+),=201=20deletion(-)=0A=0Adiff=20--git=20=
a/src/local.mk=20b/src/local.mk=0Aindex=20bda9be5..22f6b1c=20100644=0A=
---=20a/src/local.mk=0A+++=20b/src/local.mk=0A@@=20-27,7=20+27,8=20@@=20=
GPERF_OPTIONS=20=3D=20\=0A=20src/cpp-cond.c:=20src/cpp.gp=0A=20=09=
$(AM_V_GEN)rm=20-f=20$@=20$@-tmp=0A=20=09$(AM_V_at)$(GPERF)=20=
$(GPERF_OPTIONS)=20$<=20\=0A-=09=20=20|=20perl=20-ne=20=
'/__GNUC_STDC_INLINE__/=20and=20print=20"static\n";=20print'=20\=0A+=09=20=
=20|=20perl=20-0777=20-p=20\=0A+=09=20=20=20=20=20-e=20's/const=20struct=20=
KW=20\*\ncpp_cond_lookup/static\n$$&/'=20\=0A=20=09=20=20>=20$@-tmp=0A=20=
=09$(AM_V_at)chmod=20a-w=20$@-tmp=0A=20=09$(AM_V_at)mv=20$@-tmp=20$@=0A=
--=20=0A1.7.9.4=0A=0A=

--Apple-Mail-16-383708873
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=us-ascii



BTW, I have a number of non-gitignored files.  What is supposed
to happen with these guys?

~/src/gnu/cppi $ git st
# On branch master
# Your branch is ahead of 'origin/master' by 3 commits.
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	po/Makefile.in.in
#	po/Makevars.template
#	po/Rules-quot
#	po/boldquot.sed
#	po/en@boldquot.header
#	po/en@quot.header
#	po/insert-header.sin
#	po/quot.sed
#	po/remove-potcdate.sin


--Apple-Mail-16-383708873--


