sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

r20298: Fix pidl tests (missing symlink..).

Browse Source 
(This used to be commit ab3d57394630cefc1fefe859c8bd3d56f6e63695)
This commit is contained in:
Jelmer Vernooij 2006-12-21 01:51:35 +00:00 committed by Gerald (Jerry) Carter
parent 03b05b9400
commit 253c1bec46
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source4/build/smb_build/makefile.pm
View File

@ -264,20 +264,22 @@ __EOD__
}
my $soarg = "";
my $soargdebug = "";
my $lns = "";
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 = "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
$lns .= "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
}
}
my $singlesoarg = "";
if ($self->{config}->{SONAMEFLAG} ne "" and
defined($ctx->{LIBRARY_SONAME}) and
$ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
$singlesoarg = "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
$lns .= "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
}
if (defined($ctx->{LIBRARY_SONAME})) {
$lns .= "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_DEBUGNAME}";
}
$self->output(<< "__EOD__"
@ -290,7 +292,7 @@ $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_
\$($ctx->{TYPE}_$ctx->{NAME}\_FULL_OBJ_LIST) \\
\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $extraflags \\
$soarg \\
$init_obj $singlesoarg$soargdebug
$init_obj $lns
__EOD__
);

2
source4/build/smb_build/output.pm
View File

@ -65,6 +65,8 @@ sub generate_shared_library($)
}
}
$lib->{LIBRARY_DEBUGNAME} = $lib->{LIBRARY_REALNAME};
if (defined($lib->{VERSION})) {
$lib->{LIBRARY_SONAME} = "$lib->{LIBRARY_REALNAME}.$lib->{SO_VERSION}";
$lib->{LIBRARY_REALNAME} = "$lib->{LIBRARY_REALNAME}.$lib->{VERSION}";

2
source4/include/includes.h
View File

@ -77,7 +77,9 @@ _PUBLIC_ void smb_panic(const char *why) NORETURN_ATTRIBUTE;
#include "system/time.h"
#include "system/wait.h"
#ifndef _PRINTF_ATTRIBUTE
#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
#endif
/* Lists, trees, caching, database... */
#include "talloc/talloc.h"

4
source4/pidl/tests/Util.pm
View File

@ -46,9 +46,9 @@ SKIP: {
$outfile = "test-$name";
}
my $cflags = `pkg-config --libs --cflags ndr`;
my $flags = `pkg-config --libs --cflags ndr samba-config`;
open CC, "|cc -x c - -o $outfile $cflags";
open CC, "|cc -x c - -o $outfile $flags";
print CC "#define uint_t unsigned int\n";
print CC "#define _GNU_SOURCE\n";
print CC "#include <stdint.h>\n";