Date: Thu, 6 Aug 2009 23:06:17 GMT From: Xin LI <delphij@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 167077 for review Message-ID: <200908062306.n76N6Hm2016750@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=167077 Change 167077 by delphij@charlie on 2009/08/06 23:05:56 - Make usr.bin/ build after a 'make obj'. - While I'm there, remove dependency to libroken, the only reference to it seems to be 'estrdup', which is being handled by code after it. Affected files ... .. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/Makefile#5 edit .. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/iconv.c#5 edit .. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkcsmapper/Makefile#5 edit .. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkesdb/Makefile#5 edit Differences ... ==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/Makefile#5 (text+ko) ==== @@ -2,7 +2,7 @@ .include <bsd.own.mk> -.PATH: ../../lib/libiconv +.PATH: ${.CURDIR}/../../lib/libiconv PROG= iconv SRCS= iconv.c \ @@ -19,12 +19,12 @@ citrus_bcs.c \ citrus_bcs_strtol.c \ citrus_db_hash.c -CFLAGS+= -I. -I${.CURDIR} -I../../lib/libiconv +CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../lib/libiconv MAN= iconv.1 WARNS?= 6 -LDADD+=-lroken -lcrypt -DPADD+=${LIBROKEN} ${LIBCRYPT} +LDADD+= -lcrypt +DPADD+= ${LIBCRYPT} .include <bsd.prog.mk> ==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/iconv.c#5 (text+ko) ==== @@ -32,7 +32,6 @@ #include <errno.h> #include <langinfo.h> #include <locale.h> -#include <roken.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -186,11 +185,11 @@ break; case 'f': /* from */ - opt_f = estrdup(optarg); + opt_f = strdup(optarg); break; case 't': /* to */ - opt_t = estrdup(optarg); + opt_t = strdup(optarg); break; default: usage(); ==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkcsmapper/Makefile#5 (text+ko) ==== @@ -1,12 +1,12 @@ # $NetBSD: Makefile,v 1.6 2009/04/20 16:05:30 drochner Exp $ -.PATH: ../../lib/libiconv ../../lib/libiconv_modules/mapper_std +.PATH: ${.CURDIR}/../../lib/libiconv ${.CURDIR}/../../lib/libiconv_modules/mapper_std PROG= mkcsmapper SRCS= yacc.y lex.l \ citrus_db_factory.c citrus_bcs.c citrus_db_hash.c \ citrus_lookup_factory.c citrus_pivot_factory.c -CFLAGS+= -I. -I../../lib/libiconv -I../../lib/libiconv_modules/mapper_std +CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libiconv -I${.CURDIR}/../../lib/libiconv_modules/mapper_std NO_MAN= yes WARNS?= 6 ==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkesdb/Makefile#5 (text+ko) ==== @@ -1,12 +1,12 @@ # $NetBSD: Makefile,v 1.6 2009/04/20 16:05:30 drochner Exp $ -.PATH: ../../lib/libiconv +.PATH: ${.CURDIR}/../../lib/libiconv PROG= mkesdb SRCS= yacc.y lex.l \ citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \ citrus_lookup_factory.c -CFLAGS+= -I. -I../../lib/libiconv +CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libiconv NO_MAN= yes WARNS?= 6
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908062306.n76N6Hm2016750>