From 6d6ee1d71db0b51eaceeb0c62f4bc13cc671ee95 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 23 Aug 2013 17:02:48 -0500
Subject: nacl-toolchain-newlib: update to 12029

---
 abs/extra/nacl-toolchain-newlib/PKGBUILD           |  44 +++++--
 .../binutils-texinfo-r0.patch                      |  58 +++++++++
 .../nacl-toolchain-newlib/gcc-texinfo-r0.patch     | 132 +++++++++++++++++++++
 3 files changed, 225 insertions(+), 9 deletions(-)
 create mode 100644 abs/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch
 create mode 100644 abs/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch

diff --git a/abs/extra/nacl-toolchain-newlib/PKGBUILD b/abs/extra/nacl-toolchain-newlib/PKGBUILD
index 0635d1e..6f86814 100644
--- a/abs/extra/nacl-toolchain-newlib/PKGBUILD
+++ b/abs/extra/nacl-toolchain-newlib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165618 2012-08-27 12:19:30Z foutrelis $
+# $Id$
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgname=nacl-toolchain-newlib
-pkgver=9513
+pkgver=12029
 pkgrel=1
 _binutilsver=2.20.1
 _newlibver=1.20.0
@@ -20,16 +20,20 @@ source=(http://ftp.gnu.org/gnu/binutils/binutils-$_binutilsver.tar.bz2
         http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/nacltoolchain-buildscripts-r$pkgver.tar.gz
         http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclbinutils-$_binutilsver-r$pkgver.patch.bz2
         http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclnewlib-$_newlibver-r$pkgver.patch.bz2
-        http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclgcc-$_gccver-r$pkgver.patch.bz2)
+        http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclgcc-$_gccver-r$pkgver.patch.bz2
+        binutils-texinfo-r0.patch
+        gcc-texinfo-r0.patch)
 sha256sums=('71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64'
             'c644b2847244278c57bec2ddda69d8fab5a7c767f3b9af69aa7aa3da823ff692'
             '97ed664694b02b4d58ac2cafe443d02a388f9cb3645e7778843b5086a5fec040'
-            '3c3d6e63ef8caec24a9e368b72e6c94a28edc8c016da5fef73a312b4a3514909'
-            'caaefc2bf90325f152bd0998a29fcad425522a22c6ce373366c4dde2b76c5338'
-            'be9e48f8714eaadfc3349ac6d8b077050b719d16a3e7592573670cee7a3c4934'
-            'ccbc83627bc7c36f7bbe994ccffe4d51584d8812f2ed62f08528c173e06dcf85')
+            'a77912c4aac01142bd1c2f684f9933d6fcd39f0e67a1058858be50f0db18da7e'
+            '3b0e41b7923a90d611e598b31ed30062cfa3cf2fc2cbe7304e340a0acc780186'
+            '2de88079c500a694b73dab5a6a3690b2126ea0df498f1e27c5819b7d4256cb1a'
+            'c98bda783fbc9726a9d0374118b1315f4ade4fe3bb5cbc96511b7a80b385dd70'
+            '64ba7c3f5edbe33b17312ab6da6c4b9e244e47289bde796a3078bf73072a0139'
+            '7eab20b6db6a7224984fd4b5bff1742571b0429428ea2af02f83f82f3de63070')
 
-build() {
+prepare() {
   cd "$srcdir"
 
   mkdir SRC
@@ -37,10 +41,25 @@ build() {
   mv newlib-$_newlibver SRC/newlib
   mv gcc-$_gccver SRC/gcc
 
-  for _patch in *.patch; do
+  for _patch in *-r$pkgver.patch; do
     patch -d SRC -Np0 -i "$srcdir/$_patch"
   done
 
+  cd SRC
+
+  # Fix build with texinfo 5.1
+  patch -d binutils -Np1 -i "$srcdir/binutils-texinfo-r0.patch"
+  patch -d gcc -Np1 -i "$srcdir/gcc-texinfo-r0.patch"
+}
+
+build() {
+  cd "$srcdir"
+  ./download_SRC.sh $pkgver
+
+  CFLAGS+=" $CPPFLAGS"
+  CXXFLAGS+=" $CPPFLAGS"
+  unset CPPFLAGS
+
   make PREFIX="$srcdir/$pkgname" CANNED_REVISION="yes" build-with-newlib
 }
 
@@ -49,6 +68,13 @@ package() {
 
   install -d "$pkgdir/usr/lib"
   mv $pkgname "$pkgdir/usr/lib/$pkgname"
+
+  # NaCL license
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # Newlib license
+  install -m644 -t "$pkgdir/usr/share/licenses/$pkgname/" \
+    SRC/newlib/COPYING.{NEWLIB,LIBGLOSS}
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/abs/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch b/abs/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch
new file mode 100644
index 0000000..ab81d8a
--- /dev/null
+++ b/abs/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch
@@ -0,0 +1,58 @@
+https://bugs.gentoo.org/show_bug.cgi?id=464168
+
+commit 935f85422863b42b6fbca30885885e3fa28eea36
+Author: Nick Clifton <nickc@redhat.com>
+Date:   Mon Jan 7 12:11:11 2013 +0000
+
+    	* ld.texinfo: Replace @ with @@ when it is part of the text.
+    	Correct ordering of M68HC11 entry.
+    
+    	* doc/binutils.texi: Fix ordering of top level nodes.
+    	Replace erroneous uses of @itemx with @item.
+    
+    	* bfd.texinfo: Replace @ with @@ when it is part of the text.
+
+diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo
+index 45ffa73..3aa3300 100644
+--- a/bfd/doc/bfd.texinfo
++++ b/bfd/doc/bfd.texinfo
+@@ -322,7 +324,7 @@ All of BFD lives in one directory.
+ @printindex cp
+ 
+ @tex
+-% I think something like @colophon should be in texinfo.  In the
++% I think something like @@colophon should be in texinfo.  In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -333,7 +335,7 @@ All of BFD lives in one directory.
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+ 
+ @bye
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index c7ae2a5..4777ad5 100644
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
+@@ -7877,7 +7879,7 @@ If you have more than one @code{SECT} statement for the same
+ @printindex cp
+ 
+ @tex
+-% I think something like @colophon should be in texinfo.  In the
++% I think something like @@colophon should be in texinfo.  In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -7888,7 +7890,7 @@ If you have more than one @code{SECT} statement for the same
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+ 
+ @bye
diff --git a/abs/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch b/abs/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch
new file mode 100644
index 0000000..8523373
--- /dev/null
+++ b/abs/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch
@@ -0,0 +1,132 @@
+https://bugs.gentoo.org/show_bug.cgi?id=464168
+
+commit 85ad240e47dcdc1bf20ef6a95e921ac1f766d995
+Author: schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date:   Sun Oct 28 09:19:54 2012 +0000
+
+    * doc/cppopts.texi: Fix use of @item vs. @itemx inside @table.
+    * doc/extend.texi: Likewise.
+    * doc/generic.texi: Likewise.
+    * doc/invoke.texi: Likewise.
+    * doc/md.texi: Likewise.
+    * doc/sourcebuild.texi: Likewise.
+    
+    
+    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@192887 138bc75d-0d04-0410-961f-82ee72b054a4
+
+diff --git a/gcc/doc/cppopts.texi b/gcc/doc/cppopts.texi
+index 27b1095..a2eb79d 100644
+--- a/gcc/doc/cppopts.texi
++++ b/gcc/doc/cppopts.texi
+@@ -805,7 +805,7 @@ Replacement:      [    ]    @{    @}    #    \    ^    |    ~
+ Enable special code to work around file systems which only permit very
+ short file names, such as MS-DOS@.
+ 
+-@itemx --help
++@item --help
+ @itemx --target-help
+ @opindex help
+ @opindex target-help
+diff --git a/gcc/doc/md.texi b/gcc/doc/md.texi
+index dfbdc4c..bca0d8f 100644
+--- a/gcc/doc/md.texi
++++ b/gcc/doc/md.texi
+@@ -4483,8 +4483,8 @@ means of constraints requiring operands 1 and 0 to be the same location.
+ @cindex @code{ior@var{m}3} instruction pattern
+ @cindex @code{xor@var{m}3} instruction pattern
+ @item @samp{ssadd@var{m}3}, @samp{usadd@var{m}3}
+-@item @samp{sub@var{m}3}, @samp{sssub@var{m}3}, @samp{ussub@var{m}3}
+-@item @samp{mul@var{m}3}, @samp{ssmul@var{m}3}, @samp{usmul@var{m}3}
++@itemx @samp{sub@var{m}3}, @samp{sssub@var{m}3}, @samp{ussub@var{m}3}
++@itemx @samp{mul@var{m}3}, @samp{ssmul@var{m}3}, @samp{usmul@var{m}3}
+ @itemx @samp{div@var{m}3}, @samp{ssdiv@var{m}3}
+ @itemx @samp{udiv@var{m}3}, @samp{usdiv@var{m}3}
+ @itemx @samp{mod@var{m}3}, @samp{umod@var{m}3}
+diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
+index 89e7712..ec8263f 100644
+--- a/gcc/doc/sourcebuild.texi
++++ b/gcc/doc/sourcebuild.texi
+@@ -691,7 +691,7 @@ standard rule in @file{gcc/Makefile.in} to the variable
+ @code{lang_checks}.
+ 
+ @table @code
+-@itemx all.cross
++@item all.cross
+ @itemx start.encap
+ @itemx rest.encap
+ FIXME: exactly what goes in each of these targets?
+--- a/gcc/doc/c-tree.texi
++++ b/gcc/doc/c-tree.texi
+@@ -2338,13 +2338,13 @@
+ not matter.  The type of the operands and that of the result are
+ always of @code{BOOLEAN_TYPE} or @code{INTEGER_TYPE}.
+ 
+-@itemx POINTER_PLUS_EXPR
++@item POINTER_PLUS_EXPR
+ This node represents pointer arithmetic.  The first operand is always
+ a pointer/reference type.  The second operand is always an unsigned
+ integer type compatible with sizetype.  This is the only binary
+ arithmetic operand that can operate on pointer types.
+ 
+-@itemx PLUS_EXPR
++@item PLUS_EXPR
+ @itemx MINUS_EXPR
+ @itemx MULT_EXPR
+ These nodes represent various binary arithmetic operations.
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -4645,11 +4652,11 @@
+ @option{-fdump-rtl-ce3} enable dumping after the three
+ if conversion passes. 
+ 
+-@itemx -fdump-rtl-cprop_hardreg
++@item -fdump-rtl-cprop_hardreg
+ @opindex fdump-rtl-cprop_hardreg
+ Dump after hard register copy propagation.
+ 
+-@itemx -fdump-rtl-csa
++@item -fdump-rtl-csa
+ @opindex fdump-rtl-csa
+ Dump after combining stack adjustments.
+ 
+@@ -4660,11 +4667,11 @@
+ @option{-fdump-rtl-cse1} and @option{-fdump-rtl-cse2} enable dumping after
+ the two common sub-expression elimination passes.
+ 
+-@itemx -fdump-rtl-dce
++@item -fdump-rtl-dce
+ @opindex fdump-rtl-dce
+ Dump after the standalone dead code elimination passes.
+ 
+-@itemx -fdump-rtl-dbr
++@item -fdump-rtl-dbr
+ @opindex fdump-rtl-dbr
+ Dump after delayed branch scheduling.
+ 
+@@ -4709,7 +4716,7 @@
+ @opindex fdump-rtl-initvals
+ Dump after the computation of the initial value sets.
+ 
+-@itemx -fdump-rtl-into_cfglayout
++@item -fdump-rtl-into_cfglayout
+ @opindex fdump-rtl-into_cfglayout
+ Dump after converting to cfglayout mode.
+ 
+@@ -4739,7 +4746,7 @@
+ @opindex fdump-rtl-rnreg
+ Dump after register renumbering.
+ 
+-@itemx -fdump-rtl-outof_cfglayout
++@item -fdump-rtl-outof_cfglayout
+ @opindex fdump-rtl-outof_cfglayout
+ Dump after converting from cfglayout mode.
+ 
+@@ -4751,7 +4758,7 @@
+ @opindex fdump-rtl-postreload
+ Dump after post-reload optimizations.
+ 
+-@itemx -fdump-rtl-pro_and_epilogue
++@item -fdump-rtl-pro_and_epilogue
+ @opindex fdump-rtl-pro_and_epilogue
+ Dump after generating the function pro and epilogues.
+ 
-- 
cgit v0.12

