r311 - in /packages/flasm/trunk/debian: changelog patches/fix-FTBFS-with-new-bison.patch
pabs at users.alioth.debian.org
pabs at users.alioth.debian.org
Sun Feb 22 06:16:09 UTC 2009
Author: pabs
Date: Sun Feb 22 06:16:08 2009
New Revision: 311
URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=311
Log:
use the gentoo/fedora patch instead
Modified:
packages/flasm/trunk/debian/changelog
packages/flasm/trunk/debian/patches/fix-FTBFS-with-new-bison.patch
Modified: packages/flasm/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/flasm/trunk/debian/changelog?rev=311&op=diff
==============================================================================
--- packages/flasm/trunk/debian/changelog (original)
+++ packages/flasm/trunk/debian/changelog Sun Feb 22 06:16:08 2009
@@ -1,7 +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)
+ * Fix FTBFS with new version of bison (2.4.1) (patch from Gentoo/Fedora)
-- Paul Wise <pabs at debian.org> Thu, 19 Feb 2009 14:30:19 +0900
Modified: packages/flasm/trunk/debian/patches/fix-FTBFS-with-new-bison.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/flasm/trunk/debian/patches/fix-FTBFS-with-new-bison.patch?rev=311&op=diff
==============================================================================
--- packages/flasm/trunk/debian/patches/fix-FTBFS-with-new-bison.patch (original)
+++ packages/flasm/trunk/debian/patches/fix-FTBFS-with-new-bison.patch Sun Feb 22 06:16:08 2009
@@ -1,10 +1,12 @@
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
+Patch forwarded to http://sf.net/support/tracker.php?aid=2615264
+Patch from Gentoo and Fedora:
+http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/app-misc/flasm/files/flasm-1.6.2-bison-2.patch?rev=HEAD
+http://cvs.fedoraproject.org/viewvc/rpms/flasm/devel/flasm-1.62-midrule.patch?revision=HEAD
--- a/assembler.y
+++ b/assembler.y
-@@ -605,24 +605,24 @@
+@@ -605,24 +605,24 @@ finally_opt
trycatchfinally
: TRY name_opt {
@@ -39,7 +41,7 @@
END {
byte flag = 0;
$$ = $<num>9;
-@@ -634,24 +634,24 @@
+@@ -634,24 +634,24 @@ trycatchfinally
}
| TRY register {
@@ -74,7 +76,7 @@
END {
byte flag = 4;
$$ = $<num>9;
-@@ -707,29 +707,29 @@
+@@ -707,25 +707,25 @@ name_opt
function
: FUNCTION name_opt {
@@ -107,21 +109,7 @@
}
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 @@
+@@ -837,25 +837,25 @@ autoregarglist
function2
: FUNCTION2 name_opt {
@@ -154,7 +142,7 @@
/* patch num of function arguments */
patchLength($5 + 3, numArgs);
autoregFlags = 0;
-@@ -866,9 +866,9 @@
+@@ -866,9 +866,9 @@ function2
byte curautoreg = 1;
unsigned int i;
@@ -166,7 +154,7 @@
/* make sure auto registers are allocated in the right order */
for (i = 0; i < MAX_AUTO_REGS; i++) {
-@@ -883,17 +883,17 @@
+@@ -883,9 +883,9 @@ function2
}
/* patch automatic register flags */
@@ -178,17 +166,7 @@
}
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 @@
+@@ -905,11 +905,11 @@ function2
with
: WITH {
@@ -203,12 +181,7 @@
}
statements_opt END {
-- $$ = $<num>2 + $3;
-+ $<num>$ = $<num>2 + $3;
- patchLength($3, $3);
- }
-
-@@ -921,24 +921,24 @@
+@@ -921,9 +921,9 @@ with
settarget
: SETTARGET STRING {
@@ -221,29 +194,16 @@
}
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);
- }
+@@ -934,7 +934,7 @@ settarget
;
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 @@
+ $$ = $3 + writeByte(SWFACTION_SETTARGET);
+ $$ += $<num>2 + writeShort(1);
+@@ -946,9 +946,9 @@ ifframeloadedexpression
: IFFRAMELOADEDEXPR {
if (frameloadedStart>-1)
yyerror("IfFrameLoaded actions can't be nested");
@@ -256,13 +216,7 @@
frameloadedStart = numActions;
}
- statements_opt END {
-- $$ = $<num>2 + $3;
-+ $<num>$ = $<num>2 + $3;
- patchFrameLoaded($3, numActions-frameloadedStart);
- frameloadedStart = -1;
- }
-@@ -963,15 +963,15 @@
+@@ -963,10 +963,10 @@ ifframeloaded
: IFFRAMELOADED INTEGER {
if (frameloadedStart>-1)
yyerror("IfFrameLoaded actions can't be nested");
@@ -277,25 +231,7 @@
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 @@
+@@ -1199,9 +1199,9 @@ opcode
constant_list_opt { $$ = writeConstants(); }
| PUSH {
@@ -307,7 +243,7 @@
}
push_list {
-@@ -1212,10 +1212,10 @@
+@@ -1212,10 +1212,10 @@ opcode
| SWFACTION HEX {
if (xtoi($2)>0xff)
yyerror("Action code out of range");
@@ -320,3 +256,4 @@
}
hexlist_opt {
+
More information about the pkg-flash-devel
mailing list