svn commit: samba r14565 - in branches/SAMBA_4_0/source: .
build/smb_build torture
jelmer at samba.org
jelmer at samba.org
Sun Mar 19 17:24:31 GMT 2006
Author: jelmer
Date: 2006-03-19 17:24:31 +0000 (Sun, 19 Mar 2006)
New Revision: 14565
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14565
Log:
Fix shared library sonames
Modified:
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/dynconfig.mk
branches/SAMBA_4_0/source/torture/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-03-19 16:18:38 UTC (rev 14564)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-03-19 17:24:31 UTC (rev 14565)
@@ -248,12 +248,11 @@
if ($self->{config}->{SONAMEFLAG} ne "" and
defined($ctx->{LIBRARY_SONAME})) {
$soarg = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_SONAME} ";
+ if ($ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
+ $soargdebug = "\tln -fs $ctx->{LIBRARY_REALNAME} $ctx->{DEBUGDIR}/$ctx->{LIBRARY_SONAME}\n";
+ }
}
- if ($self->{config}->{SONAMEFLAG} ne "") {
- $soargdebug = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_REALNAME} ";
- }
-
if ($self->{duplicate_build}) {
$self->output(<< "__EOD__"
#
@@ -262,9 +261,9 @@
\@echo Linking \$\@
\@mkdir -p $ctx->{DEBUGDIR}
\@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\
- \$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soargdebug \\
+ \$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soarg \\
$init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)
-
+$soargdebug
__EOD__
);
}
Modified: branches/SAMBA_4_0/source/dynconfig.mk
===================================================================
--- branches/SAMBA_4_0/source/dynconfig.mk 2006-03-19 16:18:38 UTC (rev 14564)
+++ branches/SAMBA_4_0/source/dynconfig.mk 2006-03-19 17:24:31 UTC (rev 14565)
@@ -1,4 +1,6 @@
[LIBRARY::DYNCONFIG]
+VERSION = 0.0.1
+SO_VERSION = 0
OBJ_FILES = dynconfig.o
PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \
Modified: branches/SAMBA_4_0/source/torture/config.mk
===================================================================
--- branches/SAMBA_4_0/source/torture/config.mk 2006-03-19 16:18:38 UTC (rev 14564)
+++ branches/SAMBA_4_0/source/torture/config.mk 2006-03-19 17:24:31 UTC (rev 14565)
@@ -1,5 +1,7 @@
# TORTURE subsystem
[LIBRARY::torture]
+SO_VERSION = 0
+VERSION = 0.0.1
PUBLIC_HEADERS = torture.h
PUBLIC_PROTO_HEADER = proto.h
OBJ_FILES = \
More information about the samba-cvs
mailing list