summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-29 11:32:54 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:12 -0500
commita3b8cfbc8f5b18a342dee79fd9928cbcc2fbb025 (patch)
treed9698ad3cdc88b9b841afad5e4d87848a454deb8
parent26259ce98b20e6ae797afdfe9d3b8cf43cf01702 (diff)
downloadsamba-a3b8cfbc8f5b18a342dee79fd9928cbcc2fbb025.tar.gz
samba-a3b8cfbc8f5b18a342dee79fd9928cbcc2fbb025.tar.bz2
samba-a3b8cfbc8f5b18a342dee79fd9928cbcc2fbb025.zip
r15318: Don't create empty static libraries as some hosts have trouble with them.
(This used to be commit 1505d7c6001f8a35e728a14af2885b813c32ebe7)
-rw-r--r--source4/build/smb_build/TODO1
-rw-r--r--source4/build/smb_build/makefile.pm2
-rw-r--r--source4/build/smb_build/output.pm6
-rw-r--r--source4/lib/socket_wrapper/config.mk1
-rw-r--r--source4/lib/util/util_str.c3
5 files changed, 10 insertions, 3 deletions
diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index cc15e9099a..148abd6eda 100644
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -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
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index e6865d5e60..8313044bc9 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -323,6 +323,8 @@ sub StaticLibrary($$)
{
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");
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 85c78cf3b4..e6cbcc0036 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -86,7 +86,11 @@ sub generate_static_library($)
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($)
diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk
index baa11b4675..9e194230dc 100644
--- a/source4/lib/socket_wrapper/config.mk
+++ b/source4/lib/socket_wrapper/config.mk
@@ -6,5 +6,6 @@ SO_VERSION = 0
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
##############################
diff --git a/source4/lib/util/util_str.c b/source4/lib/util/util_str.c
index df9fd44cd6..ec6a1cbbea 100644
--- a/source4/lib/util/util_str.c
+++ b/source4/lib/util/util_str.c
@@ -775,8 +775,9 @@ _PUBLIC_ int strwicmp(const char *psz1, const char *psz2)
**/
_PUBLIC_ void string_replace(char *s, char oldc, char newc)
{
- for (;s && *s; s++) {
+ while (*s) {
if (*s == oldc) *s = newc;
+ s++;
}
}