Author: ken Date: 2008-02-19 10:24:22 -0700 (Tue, 19 Feb 2008) New Revision: 1904
Added: trunk/libIDL/ trunk/libIDL/libIDL-0.8.9-flex_fix-1.patch trunk/libpcap/ trunk/libpcap/libpcap-0.9.6-flex_fix-1.patch trunk/lm_sensors/ trunk/lm_sensors/lm_sensors-2.10.4-flex_fix-1.patch trunk/tetex/tetex-src-3.0-flex_fix-1.patch Log: Patches for the packages that confuse flex-2.5.34. Added: trunk/libIDL/libIDL-0.8.9-flex_fix-1.patch =================================================================== --- trunk/libIDL/libIDL-0.8.9-flex_fix-1.patch (rev 0) +++ trunk/libIDL/libIDL-0.8.9-flex_fix-1.patch 2008-02-19 17:24:22 UTC (rev 1904) @@ -0,0 +1,23 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2008-02-19 +Initial Package Version: 0.8.9 +Upstream Status: awaiting response, but arguably a flex issue. +Origin: judeau, from the quoted bug report. +Description: Allows it to compile with flex-2.5.34. + + flex-2.5.34 seems to be more pedantic, and chokes when it encounters %p +http://sourceforge.net/tracker/index.php?func=detail&aid=1860773&group_id=97492&atid=618177 +The info manual apparently used to state that the lex table size declarations +(%p, %n, %a, %e, %k, %o) are silently ignored. + +--- libIDL-0.8.9/lexer.l~ 2007-01-01 23:41:34.000000000 +0000 ++++ libIDL-0.8.9/lexer.l 2008-01-04 19:29:16.000000000 +0000 +@@ -113,7 +113,7 @@ + sqstring \'[^\'\n]*[\'\n] + dqstring \"[^\"\n]*[\"\n] + +-%p 5000 ++/*%p 5000 */ + + %s XP + Added: trunk/libpcap/libpcap-0.9.6-flex_fix-1.patch =================================================================== --- trunk/libpcap/libpcap-0.9.6-flex_fix-1.patch (rev 0) +++ trunk/libpcap/libpcap-0.9.6-flex_fix-1.patch 2008-02-19 17:24:22 UTC (rev 1904) @@ -0,0 +1,30 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2008-02-19 +Initial Package Version: 0.9.6 +Upstream Status: not submitted, arguably a flex issue. +Origin: self +Description: Allows it to compile with flex-2.5.34. + + flex-2.5.34 seems to be more pedantic, and chokes when it encounters %p +http://sourceforge.net/tracker/index.php?func=detail&aid=1860773&group_id=97492&atid=618177 +The info manual apparently used to state that the lex table size declarations +(%p, %n, %a, %e, %k, %o) are silently ignored. + +diff -Naur libpcap-0.9.6.orig/scanner.l libpcap-0.9.6/scanner.l +--- libpcap-0.9.6.orig/scanner.l 2007-06-11 10:52:05.000000000 +0100 ++++ libpcap-0.9.6/scanner.l 2008-02-13 01:25:12.000000000 +0000 +@@ -81,12 +81,14 @@ + B ([0-9A-Fa-f][0-9A-Fa-f]?) + W ([0-9A-Fa-f][0-9A-Fa-f]?[0-9A-Fa-f]?[0-9A-Fa-f]?) + ++/* + %a 18400 + %o 21500 + %e 7600 + %k 4550 + %p 27600 + %n 2000 ++*/ + + V680 {W}:{W}:{W}:{W}:{W}:{W}:{W}:{W} + Added: trunk/lm_sensors/lm_sensors-2.10.4-flex_fix-1.patch =================================================================== --- trunk/lm_sensors/lm_sensors-2.10.4-flex_fix-1.patch (rev 0) +++ trunk/lm_sensors/lm_sensors-2.10.4-flex_fix-1.patch 2008-02-19 17:24:22 UTC (rev 1904) @@ -0,0 +1,52 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2008-02-19 +Initial Package Version: 2.10.4 +Upstream Status: not submitted, arguably a flex issue +Origin: self +Description: Allows it to compile with flex-2.5.34. + +Flex-2.5.34, like some earlier versions, doesn't like comments that start +in the second column, at least in certain parts of the file. + +--- lm_sensors-2.10.4.orig/lib/conf-lex.l 2007-07-17 05:53:06.000000000 +0100 ++++ lm_sensors-2.10.4/lib/conf-lex.l 2008-02-13 22:29:14.000000000 +0000 +@@ -48,33 +48,33 @@ + + %} + +- /* Scanner for configuration files */ ++/* Scanner for configuration files */ + + %option nodefault + %option noyywrap + %option nounput + +- /* All states are exclusive */ ++/* All states are exclusive */ + + %x MIDDLE + %x STRING + %x ERR + +- /* Any whitespace-like character */ ++/* Any whitespace-like character */ + + BLANK [ \f\t\v] + + IDCHAR [[:alnum:]_] + +- /* Note: `10', `10.4' and `.4' are valid, `10.' is not */ ++/* Note: `10', `10.4' and `.4' are valid, `10.' is not */ + + FLOAT [[:digit:]]*\.?[[:digit:]]+ + +- /* Only positive whole numbers are recognized here */ ++/* Only positive whole numbers are recognized here */ + + NUM 0|([1-9][[:digit:]]*) + +- /* Only number between 1 and 255, octally represented. */ ++/* Only number between 1 and 255, octally represented. */ + + OCTESC (1[0-7]{0,2})|([2-7][0-7]?)|(0[1-7][0-7]?)|(00[1-7]) + Added: trunk/tetex/tetex-src-3.0-flex_fix-1.patch =================================================================== --- trunk/tetex/tetex-src-3.0-flex_fix-1.patch (rev 0) +++ trunk/tetex/tetex-src-3.0-flex_fix-1.patch 2008-02-19 17:24:22 UTC (rev 1904) @@ -0,0 +1,27 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2008-02-19 +Initial Package Version: 3.0 +Upstream Status: not submitted, arguably a flex issue. +Origin: self +Description: Allows it to compile with flex-2.5.34. + + flex-2.5.34 seems to be more pedantic, and chokes when it encounters %p +http://sourceforge.net/tracker/index.php?func=detail&aid=1860773&group_id=97492&atid=618177 +The info manual apparently used to state that the lex table size declarations +(%p, %n, %a, %e, %k, %o) are silently ignored. + +diff -Naur tetex-src-3.0.orig/texk/web2c/omegafonts/pl.l tetex-src-3.0/texk/web2c/omegafonts/pl.l +--- tetex-src-3.0.orig/texk/web2c/omegafonts/pl.l 2003-05-06 09:30:52.000000000 +0100 ++++ tetex-src-3.0/texk/web2c/omegafonts/pl.l 2008-02-04 18:04:30.000000000 +0000 +@@ -65,9 +65,10 @@ + + /* For Solaris's lex, to increase tables sizes --RP */ + /* Space before number keeps ancient flex happy. */ ++/* flex-2.5.34 barfs on this + %e 4000 + %p 7000 +-%n 1000 ++%n 1000 */ + + ws [ \t]+ + hexnumber H{ws}[A-F0-9]+ -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
