svn commit: samba r3769 - in branches/SAMBA_4_0/source/build/smb_build: .

metze at samba.org metze at samba.org
Mon Nov 15 20:25:40 GMT 2004


Author: metze
Date: 2004-11-15 20:25:40 +0000 (Mon, 15 Nov 2004)
New Revision: 3769

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

Log:
fix the build of shared libraries

metze

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/build/smb_build/output.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2004-11-15 19:53:45 UTC (rev 3768)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2004-11-15 20:25:40 UTC (rev 3769)
@@ -340,6 +340,7 @@
 	my $tmpshflag;
 	my $tmprules;
 	my $output;
+	my $outname = $ctx->{OUTPUT};
 
 	$tmpdepend = array2oneperline($ctx->{DEPEND_LIST});
 
@@ -374,11 +375,15 @@
 bin/$ctx->{LIBRARY_NAME}: bin/$ctx->{LIBRARY_SONAME} bin/.dummy
 	\@echo Symlink \$\@
 	\@ln -sf $ctx->{LIBRARY_SONAME} \$\@
-library_$ctx->{NAME}: basics $ctx->{LIBRARY_SONAME}
+";
+		$outname = $ctx->{LIBRARY_NAME};
+	}
+
+	$output .= "
+library_$ctx->{NAME}: basics bin/$outname
 # End Library $ctx->{NAME}
 ###################################
 ";
-	}
 
 	return $output;
 }

Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/output.pm	2004-11-15 19:53:45 UTC (rev 3768)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm	2004-11-15 20:25:40 UTC (rev 3769)
@@ -26,10 +26,11 @@
 	@{$lib->{LINK_LIST}} = ("\$($lib->{TYPE}_$lib->{NAME}\_OBJS)");
 	$lib->{LIBRARY_NAME} = $lib->{NAME}.".so";
 	$lib->{OUTPUT} = "bin/$lib->{LIBRARY_NAME}";
-	if ($lib->{MAJOR_VERSION}) {
+	if (defined($lib->{MAJOR_VERSION})) {
 		$lib->{LIBRARY_SONAME} = $lib->{LIBRARY_NAME}.".$lib->{MAJOR_VERSION}";
 		$lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_SONAME}.".$lib->{MINOR_VERSION}.$lib->{RELEASE_VERSION}";
 		$lib->{OUTPUT} = "bin/$lib->{LIBRARY_REALNAME}";
+		@{$lib->{LINK_FLAGS}} = ("\@SONAMEFLAG\@$lib->{LIBRARY_SONAME}");
 	}
 }
 



More information about the samba-cvs mailing list