PERFORCE change 166953 for review

Gabor Kovesdan gabor at FreeBSD.org
Mon Aug 3 06:04:22 UTC 2009


http://perforce.freebsd.org/chv.cgi?CH=166953

Change 166953 by gabor at gabor_aspire on 2009/08/03 06:03:49

	MFHg:
		- Some nits for the build system

Affected files ...

.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/BIG5/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/DECHanyu/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUC/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUCTW/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUCTW/citrus_euctw.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/GBK2K/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/GBK2K/citrus_gbk2k.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/HZ/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ISO2022/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ISO2022/citrus_iso2022.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/JOHAB/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/MSKanji/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/Makefile.inc#2 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UES/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UES/citrus_ues.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF1632/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF1632/citrus_utf1632.c#7 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF7/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF8/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF8/citrus_utf8.c#7 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/VIQR/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/VIQR/citrus_viqr.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ZW/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ZW/citrus_zw.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_none/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_none/citrus_iconv_none.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_std/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_std/citrus_iconv_std.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_646/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_none/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_parallel/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_serial/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_std/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_zone/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/GB/mapper.dir.GB.src#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/Makefile.part#6 edit

Differences ...

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/Makefile#6 (text+ko) ====

@@ -27,6 +27,6 @@
 		citrus_stdenc.c
 
 CFLAGS+=	--param max-inline-insns-single=128
-WARNS?=		6
+WARNS?=		3
 
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/BIG5/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		BIG5
+SHLIB=		BIG5
 SRCS+=		citrus_big5.c
 
+WARNS?=		2
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/DECHanyu/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		DECHanyu
+SHLIB=		DECHanyu
 SRCS+=		citrus_dechanyu.c
 
+WARNS?=		3
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c#6 (text+ko) ====

@@ -51,7 +51,7 @@
  */
 
 typedef struct {
-	int chlen;
+	size_t chlen;
 	char ch[4];
 } _DECHanyuState;
 
@@ -176,7 +176,7 @@
 	_DECHanyuState * __restrict psenc, size_t * __restrict nresult)
 {
 	const char *s0;
-	int ch, i;
+	int ch;
 	wchar_t wc;
 
 	if (*s == NULL) {
@@ -294,7 +294,7 @@
 		ch = wc & 0xFF;
 	} else {
 		if ((uint32_t)wc > 0xFFFF) {
-			if ((wc & ~0xFFFF) != HANYUBIT)
+			if ((wc & ~0xFFFF) != (wchar_t)HANYUBIT)
 				goto ilseq;
 			psenc->ch[psenc->chlen++] = (wc >> 24) & 0xFF;
 			psenc->ch[psenc->chlen++] = (wc >> 16) & 0xFF;
@@ -337,7 +337,7 @@
 	/* XXX: assume wchar_t as int */
 	if ((uint32_t)wc > 0x7F) {
 		if ((uint32_t)wc > 0xFFFF) {
-			if ((wc & ~0xFFFF) != HANYUBIT)
+			if ((wc & ~0xFFFF) != (wchar_t)HANYUBIT)
 				return EILSEQ;
 			plane += 2;
 		}

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUC/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		EUC
+SHLIB=		EUC
 SRCS+=		citrus_euc.c
 
+WARNS?=		3
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUCTW/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		EUCTW
+SHLIB=		EUCTW
 SRCS+=		citrus_euctw.c
 
+WARNS?=		3
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUCTW/citrus_euctw.c#6 (text+ko) ====

@@ -290,7 +290,8 @@
 {
 	wchar_t cs = wc & 0x7f000080;
 	wchar_t v;
-	int i, len, clen, ret;
+	int i, clen, ret;
+	size_t len;
 
 	clen = 1;
 	if (wc & 0x00007f00)

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/GBK2K/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		GBK2K
+SHLIB=		GBK2K
 SRCS+=		citrus_gbk2k.c
 
+WARNS?=		3
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/GBK2K/citrus_gbk2k.c#6 (text+ko) ====

@@ -264,7 +264,8 @@
 			   _GBK2KState * __restrict psenc,
 			   size_t * __restrict nresult)
 {
-	int len, ret;
+	int ret;
+	size_t len;
 
 	if (psenc->chlen != 0) {
 		ret = EINVAL;

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/HZ/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		HZ
+SHLIB=		HZ
 SRCS+=		citrus_hz.c
 
+WARNS?=		2
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ISO2022/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		ISO2022
+SHLIB=		ISO2022
 SRCS+=		citrus_iso2022.c
 
+WARNS?=		3
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ISO2022/citrus_iso2022.c#6 (text+ko) ====

@@ -94,7 +94,7 @@
 		singlegl:3,
 		singlegr:3;
 	char ch[7];	/* longest escape sequence (ESC & V ESC $ ( F) */
-	int chlen;
+	size_t chlen;
 	int flags;
 #define _ISO2022STATE_FLAG_INITIALIZED	1
 } _ISO2022State;
@@ -338,7 +338,8 @@
 {
 	char const *v, *e;
 	char buf[20];
-	int i, len, ret;
+	int i, ret;
+	size_t len;
 
 
 	/*
@@ -499,7 +500,8 @@
 	{ -1, -1, -1, -1, -1,		2, { ESC, 'N', }, },
 	{ -1, -1, -1, -1, -1,		2, { ESC, 'O', }, },
 	/* end of records */
-	{ 0, }
+//	{ 0, }
+	{  0,  0,  0,  0,  0,		0, { ESC,  0, }, }
 };
 
 static int
@@ -509,7 +511,7 @@
 	const int *p;
 
 	p = sp->chars;
-	while (p - sp->chars < n && p - sp->chars < sp->len) {
+	while ((size_t)(p - sp->chars) < n && p - sp->chars < sp->len) {
 		switch (*p) {
 		case ECMA:
 			if (!isecma(*s))
@@ -591,7 +593,7 @@
 		/* look for a perfect match from escape sequences */
 		for (sp = &seqtable[0]; sp->len; sp++) {
 			nmatch = seqmatch(string, n, sp);
-			if (sp->len == nmatch && n >= sp->len)
+			if (sp->len == nmatch && n >= (size_t)(sp->len))
 				break;
 		}
 
@@ -674,8 +676,8 @@
 			 * if we are in the middle of escape sequence,
 			 * we still need to wait for more characters to come
 			 */
-			if (n < sp->len) {
-				if (nmatch == n) {
+			if (n < (size_t)(sp->len)) {
+				if ((size_t)(nmatch) == n) {
 					if (result)
 						*result = string;
 					return (_ISO2022INVALID);
@@ -847,7 +849,7 @@
 	 * if we have something in buffer, use that.
 	 * otherwise, skip here
 	 */
-	if (psenc->chlen < 0 || psenc->chlen > sizeof(psenc->ch)) {
+	if (psenc->chlen > sizeof(psenc->ch)) {
 		/* illgeal state */
 		_citrus_ISO2022_init_state(ei, psenc);
 		goto encoding_error;
@@ -857,7 +859,7 @@
 
 	/* buffer is not empty */
 	p = psenc->ch;
-	while (psenc->chlen < sizeof(psenc->ch) && n >= 0) {
+	while (psenc->chlen < sizeof(psenc->ch)) {
 		if (n > 0) {
 			psenc->ch[psenc->chlen++] = *s0++;
 			n--;
@@ -867,9 +869,9 @@
 					   &result, psenc);
 		c += result - p;
 		if (wchar != _ISO2022INVALID) {
-			if (psenc->chlen > c)
+			if (psenc->chlen > (size_t)c)
 				memmove(psenc->ch, result, psenc->chlen - c);
-			if (psenc->chlen < c)
+			if (psenc->chlen < (size_t)c)
 				psenc->chlen = 0;
 			else
 				psenc->chlen -= c;
@@ -877,7 +879,7 @@
 		}
 
 		if (n == 0) {
-			if ((result - p) == psenc->chlen)
+			if ((size_t)(result - p) == psenc->chlen)
 				/* complete shift sequence. */
 				psenc->chlen = 0;
 			goto restart;
@@ -944,7 +946,8 @@
 recommendation(_ISO2022EncodingInfo * __restrict ei,
 	       _ISO2022Charset * __restrict cs)
 {
-	int i, j;
+	int i;
+	size_t j;
 	_ISO2022Charset *recommend;
 
 	/* first, try a exact match. */

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/JOHAB/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		JOHAB
+SHLIB=		JOHAB
 SRCS+=		citrus_johab.c
 
+WARNS?=		3
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/MSKanji/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		MSKanji
+SHLIB=		MSKanji
 SRCS+=		citrus_mskanji.c
 
+WARNS?=		3
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/Makefile.inc#2 (text+ko) ====

@@ -4,6 +4,7 @@
 
 SHLIB_MAJOR=	4
 CFLAGS+=	-I../../libiconv
+DEBUG_FLAGS=	-g -ggdb
 LIBDIR=		/usr/lib/i18n
 SRCS+=		_iconv.c \
 		citrus_bcs.c \
@@ -26,4 +27,4 @@
 		citrus_prop.c \
 		citrus_stdenc.c
 
-WARNS?=		6
+NO_PROFILE=

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UES/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		UES
+SHLIB=		UES
 SRCS+=		citrus_ues.c
 
+WARNS?=		3
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UES/citrus_ues.c#6 (text+ko) ====

@@ -198,7 +198,7 @@
 	_UESState * __restrict psenc, size_t * __restrict nresult)
 {
 	const char *s0;
-	int ch, head, tail, i, num;
+	int ch, head, tail, num;
 	wchar_t hi, wc;
 
 	if (*s == NULL) {
@@ -347,6 +347,7 @@
 }
 
 /*ARGSUSED*/
+static int
 _citrus_UES_stdenc_wctocs(_UESEncodingInfo * __restrict ei,
 	_csid_t * __restrict csid, _index_t * __restrict idx, wchar_t wc)
 {

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF1632/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		UTF1632
+SHLIB=		UTF1632
 SRCS+=		citrus_utf1632.c
 
+WARNS?=		3
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF1632/citrus_utf1632.c#7 (text+ko) ====

@@ -248,7 +248,6 @@
 			     wchar_t wc, _UTF1632State *psenc,
 			     size_t *nresult)
 {
-	int ret;
 	wchar_t wc2;
 	static const char _bom[4] = {
 	    0x00, 0x00, 0xFE, 0xFF,

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF7/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		UTF7
+SHLIB=		UTF7
 SRCS+=		citrus_utf7.c
 
+WARNS?=		3
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF8/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		UTF8
+SHLIB=		UTF8
 SRCS+=		citrus_utf8.c
 
+WARNS?=		3
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF8/citrus_utf8.c#7 (text+ko) ====

@@ -143,10 +143,10 @@
 #define _ENCODING_IS_STATE_DEPENDENT	0
 #define _STATE_NEEDS_EXPLICIT_INIT(_ps_)	0
 
-static int
+static size_t
 _UTF8_findlen(wchar_t v)
 {
-	int i;
+	size_t i;
 	u_int32_t c;
 
 	c = (u_int32_t)v;	/*XXX*/
@@ -192,7 +192,7 @@
 {
 	wchar_t wchar;
 	const char *s0;
-	int c;
+	uint8_t c;
 	int i;
 
 	s0 = *s;
@@ -254,8 +254,9 @@
 _citrus_UTF8_wcrtomb_priv(_UTF8EncodingInfo *ei, char *s, size_t n, wchar_t wc,
 			  _UTF8State *psenc, size_t *nresult)
 {
-	int cnt, i, ret;
+	int i, ret;
 	wchar_t c;
+	size_t cnt;
 
 	if (_UTF8_surrogate(wc)) {
 		ret = EILSEQ;

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/VIQR/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		VIQR
+SHLIB=		VIQR
 SRCS+=		citrus_viqr.c
 
+WARNS?=		2
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/VIQR/citrus_viqr.c#6 (text+ko) ====

@@ -332,7 +332,7 @@
 	_VIQRState * __restrict psenc, size_t * __restrict nresult)
 {
 	mnemonic_t *m;
-	int ch, escape;
+	int ch;
 	const char *p;
 
 	switch (psenc->chlen) {

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ZW/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		ZW
+SHLIB=		ZW
 SRCS+=		citrus_zw.c
 
+WARNS?=		3
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ZW/citrus_zw.c#6 (text+ko) ====

@@ -422,7 +422,7 @@
 	_csid_t * __restrict csid, _index_t * __restrict idx, wchar_t wc)
 {
 
-	*csid = (_csid_t)(wc <= 0x7FU) ? 0 : 1;
+	*csid = (_csid_t)(wc <= (wchar_t)0x7FU) ? 0 : 1;
 	*idx = (_index_t)wc;
 
 	return 0;

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_none/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		iconv_none
+SHLIB=		iconv_none
 SRCS+=		citrus_iconv_none.c
 
+WARNS?=		3
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_none/citrus_iconv_none.c#6 (text+ko) ====

@@ -84,6 +84,7 @@
 _citrus_iconv_none_iconv_init_context(struct _citrus_iconv *cv)
 {
 	cv->cv_closure = NULL;
+	return (0);
 }
 
 static void

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_std/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		iconv_std
+SHLIB=		iconv_std
 SRCS+=		citrus_iconv_std.c
 
+WARNS?=		3
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_std/citrus_iconv_std.c#6 (text+ko) ====

@@ -415,7 +415,6 @@
 {
 	const struct _citrus_iconv_std_shared *is = cv->cv_shared->ci_closure;
 	struct _citrus_iconv_std_context *sc;
-	int ret;
 	size_t szpssrc, szpsdst, sz;
 	char *ptr;
 
@@ -575,7 +574,6 @@
 err:
 	restore_encoding_state(&sc->sc_src_encoding);
 	restore_encoding_state(&sc->sc_dst_encoding);
-err_norestore:
 	*invalids = inval;
 
 	return ret;

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_646/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		mapper_646
+SHLIB=		mapper_646
 SRCS=		citrus_mapper_646.c
 
+WARNS?=		0
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_none/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		mapper_none
+SHLIB=		mapper_none
 SRCS+=		citrus_mapper_none.c
 
+WARNS?=		3
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_parallel/Makefile#6 (text+ko) ====

@@ -2,7 +2,9 @@
 
 .PATH: ../../libiconv ../mapper_serial
 
-LIB=		mapper_parallel
+SHLIB=		mapper_parallel
 SRCS+=		citrus_mapper_serial.c
 
+WARNS?=		0
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_serial/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		mapper_serial
+SHLIB=		mapper_serial
 SRCS+=		citrus_mapper_serial.c
 
+WARNS?=		0
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_std/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		mapper_std
+SHLIB=		mapper_std
 SRCS+=		citrus_mapper_std.c
 
+WARNS?=		3
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_zone/Makefile#8 (text+ko) ====

@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-LIB=		mapper_zone
+SHLIB=		mapper_zone
 SRCS+=		citrus_mapper_zone.c
 
+WARNS?=		0
+
 .include <bsd.lib.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/GB/mapper.dir.GB.src#8 (text+ko) ====

@@ -30,7 +30,7 @@
 UCS/GB2312:CP936	mapper_parallel	UCS/GB2312GBK,UCS/GB2312EXT
 UCS/GB2312:GBK		mapper_parallel	UCS/GB2312:CP936,UCS/GB2312UDA1
 UCS/GB2312:GB18030	mapper_parallel	UCS/GB2312:GBK,UCS/GB2312UDA2
-UCS/GBK			mapper_parallel	UCS/CP936EXT,UCS/GBKEXT
+UCS/GBK			mapper_parallel	UCS/GBKEXT,UCS/CP936EXT
 UCS/GBK:GB18030		mapper_parallel	UCS/GBK,UCS/GBKUDA
 UCS/GBKUCS		mapper_parallel	UCS:BMP/GB18030
 UCS/ISO-IR-165		mapper_parallel	UCS/ISO-IR-165EXT,UCS/GB2312

==== //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/Makefile.part#6 (text+ko) ====

@@ -2,7 +2,9 @@
 
 ESUBDIR?=	${CODE}
 PARTFILE?=	${CODE}.part
+.if exists(${PARTFILE})
 PART!=		sed '/^\#/d;/^$$/d;' ${PARTFILE}
+.endif
 TABLENAME?=	${CODE}-%%PART%%%UCS
 RTABLENAME?=	UCS%${CODE}-%%PART%%
 


More information about the p4-projects mailing list