svn commit: samba r15318 - in branches/SAMBA_4_0/source: build/smb_build lib/socket_wrapper lib/util

[jelmer at samba.org]

Author: jelmer
Date: 2006-04-29 11:32:54 +0000 (Sat, 29 Apr 2006)
New Revision: 15318

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15318

Log:
Don't create empty static libraries as some hosts have trouble with them.

Modified:
   branches/SAMBA_4_0/source/build/smb_build/TODO
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/build/smb_build/output.pm
   branches/SAMBA_4_0/source/lib/socket_wrapper/config.mk
   branches/SAMBA_4_0/source/lib/util/util_str.c


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/TODO
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/TODO	2006-04-29 09:20:22 UTC (rev 15317)
+++ branches/SAMBA_4_0/source/build/smb_build/TODO	2006-04-29 11:32:54 UTC (rev 15318)
@@ -1,4 +1,3 @@
-- replace StrnCpy() with strlcpy()
 - Add --export-dynamic for each subsystem that has modules
 - let the build system implement some make functions($(patsubst),$(wildcard),...) and use our own implementations where `make' does not support them
 - include extra_flags.txt using Makefile construction if 

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-04-29 09:20:22 UTC (rev 15317)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-04-29 11:32:54 UTC (rev 15318)
@@ -323,6 +323,8 @@
 {
 	my ($self,$ctx) = @_;
 
+	return unless (defined($ctx->{OBJ_FILES}));
+
 	push (@{$self->{static_libs}}, $ctx->{TARGET});
 
 	$self->output("$ctx->{TYPE}_$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");

Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/output.pm	2006-04-29 09:20:22 UTC (rev 15317)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm	2006-04-29 11:32:54 UTC (rev 15318)
@@ -86,7 +86,11 @@
 	push(@{$lib->{LINK_FLAGS}}, "\$($lib->{TYPE}_$lib->{NAME}\_OBJ_LIST)");
 
 	$lib->{TARGET} = "bin/$lib->{LIBRARY_NAME}";
-	$lib->{OUTPUT} = "-l".lc($link_name);
+	if (defined($lib->{OBJ_FILES})) {
+		$lib->{OUTPUT} = $lib->{TARGET};
+	} else {
+		$lib->{OUTPUT} = "";
+	}
 }
 
 sub generate_binary($)

Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/socket_wrapper/config.mk	2006-04-29 09:20:22 UTC (rev 15317)
+++ branches/SAMBA_4_0/source/lib/socket_wrapper/config.mk	2006-04-29 11:32:54 UTC (rev 15318)
@@ -6,5 +6,6 @@
 DESCRIPTION = Wrapper library for testing TCP/IP connections using Unix Sockets
 PUBLIC_HEADERS = socket_wrapper.h
 OBJ_FILES = socket_wrapper.o
+PRIVATE_DEPENDENCIES = EXT_SOCKET
 # End SUBSYSTEM SOCKET_WRAPPER
 ##############################

Modified: branches/SAMBA_4_0/source/lib/util/util_str.c
===================================================================
--- branches/SAMBA_4_0/source/lib/util/util_str.c	2006-04-29 09:20:22 UTC (rev 15317)
+++ branches/SAMBA_4_0/source/lib/util/util_str.c	2006-04-29 11:32:54 UTC (rev 15318)
@@ -775,8 +775,9 @@
 **/
 _PUBLIC_ void string_replace(char *s, char oldc, char newc)
 {
-	for (;s && *s; s++) {
+	while (*s) {
 		if (*s == oldc) *s = newc;
+		s++;
 	}
 }