From patchwork Tue Oct 25 15:11:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Preudhomme X-Patchwork-Id: 79198 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp3167839qge; Tue, 25 Oct 2016 08:11:35 -0700 (PDT) X-Received: by 10.98.80.2 with SMTP id e2mr40785233pfb.183.1477408295473; Tue, 25 Oct 2016 08:11:35 -0700 (PDT) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id 77si21116262pfy.91.2016.10.25.08.11.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Oct 2016 08:11:35 -0700 (PDT) Received-SPF: pass (google.com: domain of newlib-return-14114-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org; spf=pass (google.com: domain of newlib-return-14114-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=newlib-return-14114-patch=linaro.org@sourceware.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:subject:to:message-id:date:mime-version :content-type; q=dns; s=default; b=fqJ9xAtuqrMhQwQcvWBrFuA9qNS6p Z0ggluSDk/M2B++lVaH/V9AJ7h93cBeDrdAQwlQQSbsTMV3MBrDN8DhyLPKVzs6W IkozVLQzquOgZwuPx7kZA0QbdaEN9aXgqkBuczleEt9zUuuoaYNBmClI10mjViyW awrFwfFGobMzUg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:subject:to:message-id:date:mime-version :content-type; s=default; bh=iCT3AkvVvOhkyAkg42gGAea7rS8=; b=bkW Xsy2sblWlSN6FwcSoMhNH6lju3+ya0Js/J9AnBBWSujMA7q+hRIIaj3EICKqnf/Z vki54sT3PTRKkjqBsX7fncmdazl/1W9EAHaCsFLc7Gc3RK+decZXd2VLYwSHobjE 5iP6YKCtcYgvOLOCBYqD2nuvbXAUUNXfo3NEEJps= Received: (qmail 87475 invoked by alias); 25 Oct 2016 15:11:23 -0000 Mailing-List: contact newlib-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-owner@sourceware.org Delivered-To: mailing list newlib@sourceware.org Received: (qmail 87463 invoked by uid 89); 25 Oct 2016 15:11:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=arguably, H*MI:e4ae, H*M:e4ae, libm X-HELO: foss.arm.com Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 25 Oct 2016 15:11:12 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D02B428; Tue, 25 Oct 2016 08:11:10 -0700 (PDT) Received: from [10.2.206.52] (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 822CE3F220 for ; Tue, 25 Oct 2016 08:11:10 -0700 (PDT) From: Thomas Preudhomme Subject: [PATCH, newlib] Fix pdf build failure with texinfo 6.1.0 To: newlib@sourceware.org Message-ID: <8476deb1-e4ae-234c-d102-1f8e2b6cfe7b@foss.arm.com> Date: Tue, 25 Oct 2016 16:11:09 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 X-IsSubscribed: yes Hi, make pdf on Ubuntu 16.04 fail with: newlib/libc/libc.texinfo:9: Missing @endcsname inserted. After a lot of fiddling the reason appears to be the combination of concept and function index despite a lack of concept index entries. Arguably texinfo should not error in that case but here we are, newlib will fail to build its documentation on some systems because of this. Since libc.texinfo only contains function index entries this patch simply removes the combination of indices. It does the same for libm.texinfo which has concept index entries but no function index entries. Tested by running make pdf, make dvi, make info and make html successfully. libc.pdf appears to have only one index as expected. == Proposed commit message == Fix pdf build failure with texinfo 6.1.0 as provided in Ubuntu 16.04. Index combination in libc.texinfo and libm.texinfo fails because both file have only one type of index entries. Removing index combination is thus harmless and solves the problem. Is this ok for master? Best regards, Thomas diff --git a/newlib/libc/libc.texinfo b/newlib/libc/libc.texinfo index 6216c9929f0118ac7fad222157b76cbdcdbb6e63..482b0ede84e562c1419587faeddaf92128ba2a46 100644 --- a/newlib/libc/libc.texinfo +++ b/newlib/libc/libc.texinfo @@ -1,6 +1,5 @@ \input texinfo.tex @setfilename libc.info -@syncodeindex fn cp @ifinfo @format diff --git a/newlib/libm/libm.texinfo b/newlib/libm/libm.texinfo index 5c28975faa8ed82bdaebf1705000c6b802492e25..1b5be1f6c5e4f7c3f3b8a5af1d2eb50ff812cc64 100644 --- a/newlib/libm/libm.texinfo +++ b/newlib/libm/libm.texinfo @@ -1,6 +1,5 @@ \input texinfo.tex @setfilename libm.info -@syncodeindex fn cp @ifinfo @format