external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-13 19:52:20 +00:00
Code Issues Releases Wiki Activity

libast: Revert conf.sh changes (re: 2e839d87, 3aa01a95)

Browse source 
These caused a compilation failure in the generated conftab.c
file while compiling on Solaris with gcc.
This commit is contained in:
Martijn Dekker 2021-01-16 18:32:37 +01:00
parent 68a6f9a6e2
commit 1554ec2cdd
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/lib/libast/comp/conf.sh
View file

@ -833,10 +833,7 @@ unsigned int conf[] = {
[ -f $tmp.1.e ] || cp $tmp.e $tmp.1.e [ -f $tmp.1.e ] || cp $tmp.e $tmp.1.e
snl='\ snl='\
' '
# Extract failing identifiers. Try to isolate compiler errors while eliminating suggestions. sed "s/[^_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789][^_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789]*/${snl}/g" $tmp.e |
# As of 2021, known to work on: gcc, clang, Solaris Studio cc
sed -n 's/[Dd]id you mean.*//; /[Ww]arning:/ d; /[Ee]rror:/ p; /[Ll]ine [0-9][0-9]*:/ p' $tmp.e |
sed "s/[^_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789][^_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789]*/${snl}/g" |
grep '^[_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz][_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789]*$' | grep '^[_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz][_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789]*$' |
sort -u > $tmp.n sort -u > $tmp.n
cmp -s $tmp.n $tmp.p && break cmp -s $tmp.n $tmp.p && break