svn commit: r228698 - head/usr.bin/m4

[Doug Barton]

On 12/18/2011 15:54, Dimitry Andric wrote:
> Author: dim
> Date: Sun Dec 18 23:54:32 2011
> New Revision: 228698
> URL: http://svn.freebsd.org/changeset/base/228698
> 
> Log:
>   Repair breakage after r228697: since m4 now uses pow(3), it needs -lm.
>   
>   Pointy hat to:	bapt

Still seems broken to me:

# make cleandir && make obj && make depend && make all
/usr/obj/frontier/svn/head/usr.bin/m4 created for
/frontier/svn/head/usr.bin/m4
yacc -d -o parser.c /frontier/svn/head/usr.bin/m4/parser.y
lex -t  /frontier/svn/head/usr.bin/m4/tokenizer.l > tokenizer.c
rm -f .depend
mkdep -f .depend -a    -DEXTENDED -I/frontier/svn/head/usr.bin/m4/lib
-std=gnu99  /frontier/svn/head/usr.bin/m4/eval.c
/frontier/svn/head/usr.bin/m4/expr.c
/frontier/svn/head/usr.bin/m4/look.c
/frontier/svn/head/usr.bin/m4/main.c
/frontier/svn/head/usr.bin/m4/misc.c
/frontier/svn/head/usr.bin/m4/gnum4.c
/frontier/svn/head/usr.bin/m4/trace.c parser.c tokenizer.c
/frontier/svn/head/usr.bin/m4/lib/ohash_create_entry.c
/frontier/svn/head/usr.bin/m4/lib/ohash_delete.c
/frontier/svn/head/usr.bin/m4/lib/ohash_do.c
/frontier/svn/head/usr.bin/m4/lib/ohash_entries.c
/frontier/svn/head/usr.bin/m4/lib/ohash_enum.c
/frontier/svn/head/usr.bin/m4/lib/ohash_init.c
/frontier/svn/head/usr.bin/m4/lib/ohash_interval.c
/frontier/svn/head/usr.bin/m4/lib/ohash_lookup_interval.c
/frontier/svn/head/usr.bin/m4/lib/ohash_lookup_memory.c
/frontier/svn/head/usr.bin/m4/lib/ohash_qlookup.c
/frontier/svn/head/usr.bin/m4/lib/ohash_qlookupi.c
echo m4: /usr/lib/libc.a  >> .depend
cc -O2 -pipe  -DEXTENDED -I/frontier/svn/head/usr.bin/m4/lib -std=gnu99
-fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W
-Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes
-Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch
-Wshadow -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline
-Wnested-externs -Wredundant-decls -Wold-style-definition
-Wno-pointer-sign -c /frontier/svn/head/usr.bin/m4/eval.c
cc1: warnings being treated as errors
/frontier/svn/head/usr.bin/m4/eval.c: In function 'expand_builtin':
/frontier/svn/head/usr.bin/m4/eval.c:271: warning: suggest explicit
braces to avoid ambiguous 'else'
*** Error code 1

Stop in /frontier/svn/head/usr.bin/m4.

Reverting to r228696 lets it build again.

BTW, there seems to be an "issue" with the svn change:

svn up -r228696
Updating '.':
D    parser.y
A    parser.y
D    tokenizer.l
A    tokenizer.l
U    eval.c
U    Makefile
Updated to revision 228696.

r228697 seems to have included "replacing" those 2 files, which seems
sub-optimal, and may cause problems for the svn2cvs exporter. bapt, what
did you do here?


Doug


> Modified:
>   head/usr.bin/m4/Makefile
> 
> Modified: head/usr.bin/m4/Makefile
> ==============================================================================
> --- head/usr.bin/m4/Makefile	Sun Dec 18 22:04:55 2011	(r228697)
> +++ head/usr.bin/m4/Makefile	Sun Dec 18 23:54:32 2011	(r228698)
> @@ -6,7 +6,7 @@
>  
>  PROG=	m4
>  CFLAGS+=-DEXTENDED -I${.CURDIR}/lib
> -LDADD=	-ly -ll
> +LDADD=	-ly -ll -lm
>  # clang needs 1 while with gcc we can use 2
>  #WARNS=	1
>  
> 



-- 

		[^L]

	Breadth of IT experience, and depth of knowledge in the DNS.
	Yours for the right price.  :)  http://SupersetSolutions.com/