r310 - in /packages/flasm/trunk/debian: changelog patches/fix-FTBFS-with-new-bison.patch patches/series

pabs at users.alioth.debian.org pabs at users.alioth.debian.org
Thu Feb 19 06:55:11 UTC 2009


Author: pabs
Date: Thu Feb 19 06:55:10 2009
New Revision: 310

URL: http://svn.debian.org/wsvn/?sc=1&rev=310
Log:
Fix FTBFS with new version of bison (2.4.1)

Added:
    packages/flasm/trunk/debian/patches/fix-FTBFS-with-new-bison.patch
Modified:
    packages/flasm/trunk/debian/changelog
    packages/flasm/trunk/debian/patches/series

Modified: packages/flasm/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/flasm/trunk/debian/changelog?rev=310&op=diff
==============================================================================
--- packages/flasm/trunk/debian/changelog (original)
+++ packages/flasm/trunk/debian/changelog Thu Feb 19 06:55:10 2009
@@ -1,6 +1,7 @@
 flasm (1.62-3) UNRELEASED; urgency=low
 
   * Fix src pkg to work with dpkg-source 3.0 (quilt) (Closes: #485343)
+  * Fix FTBFS with new version of bison (2.4.1)
 
  -- Paul Wise <pabs at debian.org>  Thu, 19 Feb 2009 14:30:19 +0900
 

Added: packages/flasm/trunk/debian/patches/fix-FTBFS-with-new-bison.patch
URL: http://svn.debian.org/wsvn/packages/flasm/trunk/debian/patches/fix-FTBFS-with-new-bison.patch?rev=310&op=file
==============================================================================
--- packages/flasm/trunk/debian/patches/fix-FTBFS-with-new-bison.patch (added)
+++ packages/flasm/trunk/debian/patches/fix-FTBFS-with-new-bison.patch Thu Feb 19 06:55:10 2009
@@ -1,0 +1,322 @@
+flasm fix-FTBFS-with-new-bison.patch
+Paul Wise <pabs at debian.org>
+Patch assembler.y so that it builds with bison 2.4.1
+Forwarded to http://sf.net/support/tracker.php?aid=2615264
+--- a/assembler.y
++++ b/assembler.y
+@@ -605,24 +605,24 @@
+ 
+ trycatchfinally 
+         : TRY name_opt                          {
+-                                                    $$ = writeByte(SWFACTION_TRY);
++                                                    $<num>$ = writeByte(SWFACTION_TRY);
+                                                     /* action length */
+-                                                    $$ += writeShort(strlen($2)+8);
++                                                    $<num>$ += writeShort(strlen($2)+8);
+                                                     /* zero flag */
+-                                                    $$ += writeByte(0);
++                                                    $<num>$ += writeByte(0);
+                                                     /* zero try length */
+-                                                    $$ += writeShort(0);
++                                                    $<num>$ += writeShort(0);
+                                                     /* zero catch length */
+-                                                    $$ += writeShort(0);
++                                                    $<num>$ += writeShort(0);
+                                                     /* zero finally length */
+-                                                    $$ += writeShort(0);
++                                                    $<num>$ += writeShort(0);
+                                                     /* error variable name */
+-                                                    $$ += writeString($2);
++                                                    $<num>$ += writeString($2);
+                                                 }
+ 
+-        statements_opt                          {   $$ = $<num>3 + $4; patchLength($$ - 6,  $4);    }
+-        catch_opt                               {   $$ = $<num>5 + $6; patchLength($$ - 8,  $6);    }
+-        finally_opt                             {   $$ = $<num>7 + $8; patchLength($$ - 10, $8);    }
++        statements_opt                          {   $<num>$ = $<num>3 + $4; patchLength($<num>$ - 6,  $4);    }
++        catch_opt                               {   $<num>$ = $<num>5 + $6; patchLength($<num>$ - 8,  $6);    }
++        finally_opt                             {   $<num>$ = $<num>7 + $8; patchLength($<num>$ - 10, $8);    }
+         END                                     {
+                                                     byte flag = 0;
+                                                     $$ = $<num>9;
+@@ -634,24 +634,24 @@
+                                                 }
+ 
+         | TRY register                          {
+-                                                    $$ = writeByte(SWFACTION_TRY);
++                                                    $<num>$ = writeByte(SWFACTION_TRY);
+                                                     /* action length */
+-                                                    $$ += writeShort(8);
++                                                    $<num>$ += writeShort(8);
+                                                     /* zero flag */
+-                                                    $$ += writeByte(0);
++                                                    $<num>$ += writeByte(0);
+                                                     /* zero try length */
+-                                                    $$ += writeShort(0);
++                                                    $<num>$ += writeShort(0);
+                                                     /* zero catch length */
+-                                                    $$ += writeShort(0);
++                                                    $<num>$ += writeShort(0);
+                                                     /* zero finally length */
+-                                                    $$ += writeShort(0);
++                                                    $<num>$ += writeShort(0);
+                                                     /* error register number */
+-                                                    $$ += writeByte((byte) $2);
++                                                    $<num>$ += writeByte((byte) $2);
+                                                 }
+ 
+-        statements_opt                          {   $$ = $<num>3 + $4; patchLength($$ - 6,  $4);    }
+-        catch_opt                               {   $$ = $<num>5 + $6; patchLength($$ - 8,  $6);    }
+-        finally_opt                             {   $$ = $<num>7 + $8; patchLength($$ - 10, $8);    }
++        statements_opt                          {   $<num>$ = $<num>3 + $4; patchLength($<num>$ - 6,  $4);    }
++        catch_opt                               {   $<num>$ = $<num>5 + $6; patchLength($<num>$ - 8,  $6);    }
++        finally_opt                             {   $<num>$ = $<num>7 + $8; patchLength($<num>$ - 10, $8);    }
+         END                                     {
+                                                     byte flag = 4;
+                                                     $$ = $<num>9;
+@@ -707,29 +707,29 @@
+ 
+ function
+         : FUNCTION name_opt                     {
+-                                                    $$ = writeByte(SWFACTION_DEFINEFUNCTION);
++                                                    $<num>$ = writeByte(SWFACTION_DEFINEFUNCTION);
+                                                     /* zero block length */
+-                                                    $$ += writeShort(0);
+-                                                    $$ += writeString($2);
++                                                    $<num>$ += writeShort(0);
++                                                    $<num>$ += writeString($2);
+                                                 }
+ 
+           '(' function_args ')'                 {
+                                                     unsigned int i;
+                                                     numArgs = $5;
+ 
+-                                                    $$ = $<num>3 + writeShort(numArgs);
++                                                    $<num>$ = $<num>3 + writeShort(numArgs);
+ 
+                                                     for(i = 0; i < numArgs; ++i)
+-                                                        $$ += writeString(func_args[i]);
++                                                        $<num>$ += writeString(func_args[i]);
+ 
+                                                     /* zero function length */
+-                                                    $$ += writeShort(0);
++                                                    $<num>$ += writeShort(0);
+                                                     /* patch block length */
+-                                                    patchLength($$-3, $$-3);
++                                                    patchLength($<num>$-3, $<num>$-3);
+                                                 }
+ 
+           statements_opt END                    {
+-                                                    $$ = $<num>7 + $8;
++                                                    $<num>$ = $<num>7 + $8;
+                                                     /* patch function length */
+                                                     patchLength($8, $8);
+                                                 }
+@@ -738,7 +738,7 @@
+ regarg
+         : REGISTER INTEGER '=' STRING           {
+                                                     numArgs++;
+-                                                    $$ = writeByte((byte) $2);
++                                                    $<num>$ = writeByte((byte) $2);
+ 
+                                                     if ($2 == 0)
+                                                         yyerror("Function argument can't be stored in r:0");
+@@ -837,25 +837,25 @@
+ 
+ function2
+         : FUNCTION2 name_opt                    {
+-                                                    $$ = writeByte(SWFACTION_DEFINEFUNCTION2);
++                                                    $<num>$ = writeByte(SWFACTION_DEFINEFUNCTION2);
+                                                     /* zero block length */
+-                                                    $$ += writeShort(0);
++                                                    $<num>$ += writeShort(0);
+                                                     /* function name */
+-                                                    $$ += writeString($2);
++                                                    $<num>$ += writeString($2);
+                                                     curFunc++;
+                                                     memset(regfunc_args[curFunc], 0, sizeof (regfunc_args[curFunc]));
+                                                     numArgs = 0;
+                                                     /* zero num of function arguments */
+-                                                    $$ += writeShort(numArgs);
++                                                    $<num>$ += writeShort(numArgs);
+                                                     /* allocate zero registers */
+                                                     numRegisters[curFunc] = 0;
+-                                                    $$ += writeByte(numRegisters[curFunc]);
++                                                    $<num>$ += writeByte(numRegisters[curFunc]);
+                                                     /* zero automatic register flags */
+-                                                    $$ += writeShort(0);
++                                                    $<num>$ += writeShort(0);
+                                                 }
+ 
+           '(' regarglist ')'                    {
+-                                                    $$ = $<num>3 + $5;
++                                                    $<num>$ = $<num>3 + $5;
+                                                     /* patch num of function arguments */
+                                                     patchLength($5 + 3, numArgs);
+                                                     autoregFlags = 0;
+@@ -866,9 +866,9 @@
+                                                     byte curautoreg = 1;
+                                                     unsigned int i;
+ 
+-                                                    $$ = $<num>7;
++                                                    $<num>$ = $<num>7;
+                                                     /* zero body length */
+-                                                    $$ += writeShort(0);
++                                                    $<num>$ += writeShort(0);
+                                                     
+                                                     /* make sure auto registers are allocated in the right order */
+                                                     for (i = 0; i < MAX_AUTO_REGS; i++) {
+@@ -883,17 +883,17 @@
+                                                     }
+ 
+                                                     /* patch automatic register flags */
+-                                                    patchLength($$ - $<num>3, autoregFlags);
++                                                    patchLength($<num>$ - $<num>3, autoregFlags);
+                                                     /* patch block length */
+-                                                    patchLength($$ - 3, $$ - 3);
++                                                    patchLength($<num>$ - 3, $<num>$ - 3);
+                                                 }
+ 
+           statements_opt END                    {
+-                                                    $$ = $<num>11 + $12;
++                                                    $<num>$ = $<num>11 + $12;
+ 
+                                                     /* patch number of registers to allocate */
+                                                     if (numRegisters[curFunc] < MAX_REGISTERS)
+-                                                        patchFlag($$ - $<num>3 + 2, (byte) numRegisters[curFunc]);
++                                                        patchFlag($<num>$ - $<num>3 + 2, (byte) numRegisters[curFunc]);
+                                                     else
+                                                         yyerror("Too many registers.");
+ 
+@@ -905,15 +905,15 @@
+ 
+ with
+         : WITH                                  {
+-                                                    $$ = writeByte(SWFACTION_WITH);
++                                                    $<num>$ = writeByte(SWFACTION_WITH);
+                                                     /* length of with action */
+-                                                    $$ += writeShort(2);
++                                                    $<num>$ += writeShort(2);
+                                                     /* length of with block - will be patched */
+-                                                    $$ += writeShort(0);
++                                                    $<num>$ += writeShort(0);
+                                                 }
+                                                 
+           statements_opt END                    { 
+-                                                    $$ = $<num>2 + $3;
++                                                    $<num>$ = $<num>2 + $3;
+                                                     patchLength($3, $3);
+                                                 }
+ 
+@@ -921,24 +921,24 @@
+ 
+ settarget
+         : SETTARGET STRING                      {
+-                                                    $$ = writeByte(SWFACTION_SETTARGET);
+-                                                    $$ += writeShort(strlen($2)+1);
+-                                                    $$ += writeString($2);
++                                                    $<num>$ = writeByte(SWFACTION_SETTARGET);
++                                                    $<num>$ += writeShort(strlen($2)+1);
++                                                    $<num>$ += writeString($2);
+                                                 }
+ 
+           statements_opt END                    {
+-                                                    $$ = $4 + writeByte(SWFACTION_SETTARGET);
+-                                                    $$ += $<num>3 + writeShort(1);
+-                                                    $$ += writeByte(0);
++                                                    $<num>$ = $4 + writeByte(SWFACTION_SETTARGET);
++                                                    $<num>$ += $<num>3 + writeShort(1);
++                                                    $<num>$ += writeByte(0);
+                                                 }
+         ;
+ 
+ settargetexpression
+-        : SETTARGETEXPR                         {   $$ = writeByte(SWFACTION_SETTARGETEXPRESSION);  }
++        : SETTARGETEXPR                         {   $<num>$ = writeByte(SWFACTION_SETTARGETEXPRESSION);  }
+           statements_opt END                    {
+-                                                    $$ = $3 + writeByte(SWFACTION_SETTARGET);
+-                                                    $$ += $<num>2 + writeShort(1);
+-                                                    $$ += writeByte(0);
++                                                    $<num>$ = $3 + writeByte(SWFACTION_SETTARGET);
++                                                    $<num>$ += $<num>2 + writeShort(1);
++                                                    $<num>$ += writeByte(0);
+                                                 }
+         ;
+ 
+@@ -946,14 +946,14 @@
+         : IFFRAMELOADEDEXPR                     {
+                                                     if (frameloadedStart>-1)
+                                                         yyerror("IfFrameLoaded actions can't be nested");
+-                                                    $$ = writeByte(SWFACTION_IFFRAMELOADEDEXPRESSION);
+-                                                    $$ += writeShort(1);
+-                                                    $$ += writeByte(0);
++                                                    $<num>$ = writeByte(SWFACTION_IFFRAMELOADEDEXPRESSION);
++                                                    $<num>$ += writeShort(1);
++                                                    $<num>$ += writeByte(0);
+                                                     frameloadedStart = numActions;
+                                                 }
+ 
+           statements_opt END                    { 
+-                                                    $$ = $<num>2 + $3;
++                                                    $<num>$ = $<num>2 + $3;
+                                                     patchFrameLoaded($3, numActions-frameloadedStart);
+                                                     frameloadedStart = -1;
+                                                 }
+@@ -963,15 +963,15 @@
+         : IFFRAMELOADED INTEGER                 {
+                                                     if (frameloadedStart>-1)
+                                                         yyerror("IfFrameLoaded actions can't be nested");
+-                                                    $$ = writeByte(SWFACTION_IFFRAMELOADED);
+-                                                    $$ += writeShort(3);
+-                                                    $$ += writeShort($2);
+-                                                    $$ += writeByte(0);
++                                                    $<num>$ = writeByte(SWFACTION_IFFRAMELOADED);
++                                                    $<num>$ += writeShort(3);
++                                                    $<num>$ += writeShort($2);
++                                                    $<num>$ += writeByte(0);
+                                                     frameloadedStart = numActions;
+                                                 }
+                                          
+           statements_opt END                    { 
+-                                                    $$ = $<num>3 + $4;
++                                                    $<num>$ = $<num>3 + $4;
+                                                     patchFrameLoaded($4, numActions-frameloadedStart);
+                                                     frameloadedStart = -1;
+                                                 }
+@@ -980,9 +980,9 @@
+ impassets
+         : IMPORTASSETS FROM STRING              {   numAssets = 0;  }
+           impassetsblocks_opt END               {
+-                                                    $$ = $5;
++                                                    $<num>$ = $5;
+                                                     writeImportAssets($3, numAssets);
+-                                                    $$ = 0;
++                                                    $<num>$ = 0;
+                                                 }
+         ;
+ 
+@@ -1199,9 +1199,9 @@
+           constant_list_opt                     {   $$ = writeConstants();  }
+ 
+         | PUSH                                  {
+-                                                    $$ = writeByte(SWFACTION_PUSHDATA);
++                                                    $<num>$ = writeByte(SWFACTION_PUSHDATA);
+                                                     /* length */
+-                                                    $$ += writeShort(0);
++                                                    $<num>$ += writeShort(0);
+                                                 }
+ 
+           push_list                             {   
+@@ -1212,10 +1212,10 @@
+         | SWFACTION HEX                         {
+                                                     if (xtoi($2)>0xff)
+                                                         yyerror("Action code out of range");
+-                                                    $$ = writeByte((char)xtoi($2));
++                                                    $<num>$ = writeByte((char)xtoi($2));
+                                                     if (xtoi($2)>=0x80)
+                                                     /* length */
+-                                                    $$ += writeShort(0);
++                                                    $<num>$ += writeShort(0);
+                                                 }
+ 
+           hexlist_opt                           {

Modified: packages/flasm/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/packages/flasm/trunk/debian/patches/series?rev=310&op=diff
==============================================================================
--- packages/flasm/trunk/debian/patches/series (original)
+++ packages/flasm/trunk/debian/patches/series Thu Feb 19 06:55:10 2009
@@ -1,1 +1,2 @@
 01-config-file.patch
+fix-FTBFS-with-new-bison.patch




More information about the pkg-flash-devel mailing list