Skip to contentSkip to conversation

gcc: add patch to disable texinfo when texinfo is 5.0 or newer

PATCH In review Eric Bénard 3 participants 7 messages Jul 9, 2013 – Aug 22, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 gcc: add patch to disable texinfo when texinfo is 5.0 or newer

From: Martin Jansa <[email protected]>

* this is needed only for 4.7 series, newer works fine with texinfo-5*

[YOCTO #3947]

---
 meta/recipes-devtools/gcc/gcc-4.7.inc              |    1 +
 .../gcc/gcc-4.7/disable-texinfo-5.patch            |  107 ++++++++++++++++++++
 2 files changed, 108 insertions(+)
 create mode 100644 meta/recipes-devtools/gcc/gcc-4.7/disable-texinfo-5.patch
meta/recipes-devtools/gcc/gcc-4.7.inc +1 -0
index 1a3e09b..c28823d 100644
@@ -74,6 +74,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://ppc_no_crtsavres.patch \
 	   file://0001-crtstuff.c-USE_PT_GNU_EH_FRAME-Define-for-systems-us.patch \
 	   file://0001-Makefile.in-vis_hide-gen-hide-list-Do-not-make-defin.patch \
+	   file://disable-texinfo-5.patch \
 	  "
 SRC_URI[md5sum] = "cc308a0891e778cfda7a151ab8a6e762"
 SRC_URI[sha256sum] = "8a9283d7010fb9fe5ece3ca507e0af5c19412626384f8a5e9434251ae100b084"
meta/recipes-devtools/gcc/gcc-4.7/disable-texinfo-5.patch new file +107 -0

107 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 2/3 eglibc: fix build with recent texinfo (5.1)

---
 .../remove_hsep_and_vsep_from_info_pages.patch     |   71 ++++++++++++++++++++
 meta/recipes-core/eglibc/eglibc_2.16.bb            |    1 +
 2 files changed, 72 insertions(+)
 create mode 100644 meta/recipes-core/eglibc/eglibc-2.16/remove_hsep_and_vsep_from_info_pages.patch
meta/recipes-core/eglibc/eglibc-2.16/remove_hsep_and_vsep_from_info_pages.patch new file +71 -0
new file mode 100644
index 0000000..3a9abe1
@@ -0,0 +1,71 @@
+From libc-alpha-return-35113-listarch-libc-alpha=sources dot redhat dot com at sourceware dot org Mon Dec 03 09:38:08 2012
+Return-Path: <libc-alpha-return-35113-listarch-libc-alpha=sources dot redhat dot com at sourceware dot org>
+Delivered-To: listarch-libc-alpha at sources dot redhat dot com
+Received: (qmail 4372 invoked by alias); 3 Dec 2012 09:38:05 -0000
+Received: (qmail 3968 invoked by uid 22791); 3 Dec 2012 09:38:03 -0000
+X-SWARE-Spam-Status: No, hits=-2.1 required=5.0
+	tests=AWL,BAYES_00,RP_MATCHES_RCVD
+X-Spam-Check-By: sourceware.org
+From: Allan McRae <allan at archlinux dot org>
+To: libc-alpha at sourceware dot org
+Subject: [PATCH] Remove @hsep and @vsep usage from info pages
+Date: Mon,  3 Dec 2012 19:37:44 +1000
+Message-Id: <[email protected]>
+Mailing-List: contact libc-alpha-help at sourceware dot org; run by ezmlm
+Precedence: bulk
+List-Id: <libc-alpha.sourceware.org>
+List-Subscribe: <mailto:libc-alpha-subscribe at sourceware dot org>
+List-Archive: <http://sourceware.org/ml/libc-alpha/>
+List-Post: <mailto:libc-alpha at sourceware dot org>
+List-Help: <mailto:libc-alpha-help at sourceware dot org>, <http://sourceware dot org/ml/#faqs>
+Sender: libc-alpha-owner at sourceware dot org
+Delivered-To: mailing list libc-alpha at sourceware dot org
+
+2012-12-03  Allan McRae  <[email protected]>
+
+	* manual/stdio.texi (Predefined Printf Handlers): Remove
+	@hsep and @vsep usage.
+
+Upstream-Status: Backport
+---
+
+As far as I can tell, @hsep and @vsep have not been supported in texinfo for
+a long time, although it attempted to add the requested separators resulting
+in ugliness:
+
+     +------+--------------+--------+--------+---------------+
+     |low|Multiplier|From|Upper|Multiplier|
+     |' '|1||' '|1|
+     |k|2^10 (1024)|kilo|K|10^3 (1000)|
+
+Go to "info libc" then 
+IO on streams -> Customizing Printf -> Predefined Printf Handlers
+to see this section.
+
+With texinfo 4.13.91, this becomes an error:
+
+./stdio.texi:3140: Unknown command `hsep'
+./stdio.texi:3140: Unknown command `vsep'
+
+There is also 215 lines of warnings to be fixed at a later date...
+
+
+ manual/stdio.texi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/manual/stdio.texi b/manual/stdio.texi
+index be769a5..7b436f0 100644
+--- a/manual/stdio.texi
++++ b/manual/stdio.texi
+@@ -3137,7 +3137,7 @@ The postfix tag corresponds to bytes, kilobytes, megabytes, gigabytes,
+ etc.  The full table is:
+ 
+ @ifinfo
+-@multitable @hsep @vsep {' '} {2^10 (1024)} {zetta} {Upper} {10^24 (1000)}
++@multitable {' '} {2^10 (1024)} {zetta} {Upper} {10^24 (1000)}
+ @item low @tab Multiplier  @tab From  @tab Upper @tab Multiplier
+ @item ' ' @tab 1           @tab       @tab ' '   @tab 1
+ @item k   @tab 2^10 (1024) @tab kilo  @tab K     @tab 10^3 (1000)
+-- 
+1.8.0.1
+
meta/recipes-core/eglibc/eglibc_2.16.bb +1 -0
index 78bf9be..4db1ea5 100644
@@ -32,6 +32,7 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=h
            file://0001-Add-name_to_handle_at-open_by_handle-etc.-to-PowerPC.patch \
            file://fsl-ppc-no-fsqrt.patch \
            file://0001-R_ARM_TLS_DTPOFF32.patch \
+           file://remove_hsep_and_vsep_from_info_pages.patch \
           "
 LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
       file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 3/3 binutils: fix build with recent texinfo (5.1)

In reply to Eric Bénard
---
 meta/recipes-devtools/binutils/binutils-2.22.inc   |    1 +
 .../binutils/binutils/texinfo.patch                |  294 ++++++++++++++++++++
 2 files changed, 295 insertions(+)
 create mode 100644 meta/recipes-devtools/binutils/binutils/texinfo.patch
meta/recipes-devtools/binutils/binutils-2.22.inc +1 -0
index 9697242..d0415d4 100644
@@ -45,6 +45,7 @@ SRC_URI = "\
      file://0144-timer.cc-include-unistd.h.patch \
      file://0166-2012-04-27-Doug-Kwan-dougkwan-google.com.patch \
      file://0182-PR-ld-13991.patch \
+     file://texinfo.patch \
      "
 
 SRC_URI[md5sum] = "ee0f10756c84979622b992a4a61ea3f5"
meta/recipes-devtools/binutils/binutils/texinfo.patch new file +294 -0

294 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#3 lore raw

Re: [danny][PATCH 3/3] binutils: fix build with recent texinfo (5.1)

Quoted 6 lines · Eric Bénard
---
 meta/recipes-devtools/binutils/binutils-2.22.inc   |    1 +
 .../binutils/binutils/texinfo.patch                |  294 ++++++++++++++++++++
 2 files changed, 295 insertions(+)
 create mode 100644 meta/recipes-devtools/binutils/binutils/texinfo.patch

Sorry for the delay, this series is now in ross/danny-next.

Ross

#4 lore raw

Re: [danny][PATCH 3/3] binutils: fix build with recent texinfo (5.1)

Hi Ross,

Quoted 10 lines · Ross
Quoted 6 lines · Eric Bénard
---
 meta/recipes-devtools/binutils/binutils-2.22.inc   |    1 +
 .../binutils/binutils/texinfo.patch                |  294 ++++++++++++++++++++
 2 files changed, 295 insertions(+)
 create mode 100644 meta/recipes-devtools/binutils/binutils/texinfo.patch

Sorry for the delay, this series is now in ross/danny-next.

when do you think these patches could reach oe-core's danny branch ?

Thanks,
Eric

#5 lore raw

Re: [danny][PATCH 3/3] binutils: fix build with recent texinfo (5.1)

Quoted 3 lines · Eric Bénard
Quoted 2 lines

Sorry for the delay, this series is now in ross/danny-next.

when do you think these patches could reach oe-core's danny branch ?

Consider this ball well and truly dropped.

I'm literally packing now for a week away but I've just pinged Richard about the outstanding commits, so there may be a merge shortly. If not, I'll follow up when I return (1st September).

Ross

#6 lore raw

Re: [danny][PATCH 3/3] binutils: fix build with recent texinfo (5.1)

Quoted 10 lines · Ross
Quoted 3 lines · Eric Bénard
Quoted 2 lines

Sorry for the delay, this series is now in ross/danny-next.

when do you think these patches could reach oe-core's danny branch ?

Consider this ball well and truly dropped.

I'm literally packing now for a week away but I've just pinged Richard about the outstanding commits, so there may be a merge shortly. If not, I'll follow up when I return (1st September).

They're merged.

Cheers,

Richard