Re: CVS commit: src/sys

[Takeshi Nakayama <tn%catvmics.ne.jp@localhost>]

>>> Justin Cormack <justin%specialbusservice.com@localhost> wrote

> Er, you can't do that.
> 
> 1. It breaks the rump builds on most platforms
> http://build.myriabit.eu:8012/waterfall as the prototypes dont match
> eg see http://build.myriabit.eu:8012/builders/ppc64-cross/builds/5585/steps/shell_3/logs/stdio

It seems that posix says 2nd arg of iconv(3) is char **, but
NetBSD's one is const char **.

> 2. There is no requirement that rump runs on a platform that has iconv
> anyway, it may be running on bare metal, or non Posix platform.
> 
> Not sure what the intention was though - I am sure we can find a way
> around it...

I would like to include this at least on NetBSD host since we don't
have kernel iconv and then mount_smbfs(8) is useless for filename
conversions.

So is it ok to add a compile-time option as below and define it
somewhere?  Or are there any more appropriate make variables to
detect host OS?

-- Takeshi Nakayama


Index: Makefile
===================================================================
RCS file: /cvsroot/src/sys/rump/dev/lib/libnetsmb/Makefile,v
retrieving revision 1.5
diff -u -d -r1.5 Makefile
--- Makefile	15 Nov 2014 18:49:04 -0000	1.5
+++ Makefile	15 Nov 2014 22:56:53 -0000
@@ -13,8 +13,10 @@
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpvfs
 #CPPFLAGS+=	-DSMB_SOCKET_DEBUG -DSMB_IOD_DEBUG
 
+.if ${RUMP_NETSMB_ICONV:Uno} == "yes"
 SRCS+=	netsmb_iconv.c
 RUMPCOMP_USER_SRCS=	netsmb_user.c
+.endif
 
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>