diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-12-21 01:51:35 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:29:34 -0500 |
| commit | 253c1bec462de467a923f7a8951598f7abbe163e (patch) | |
| tree | cd67da367d3fab5b7df9fc3176836c12c194ef8a | |
| parent | 03b05b9400d65efa2a0ad2a93adc8038df1e59af (diff) | |
| download | samba-253c1bec462de467a923f7a8951598f7abbe163e.tar.gz samba-253c1bec462de467a923f7a8951598f7abbe163e.tar.bz2 samba-253c1bec462de467a923f7a8951598f7abbe163e.zip | |
r20298: Fix pidl tests (missing symlink..).
(This used to be commit ab3d57394630cefc1fefe859c8bd3d56f6e63695)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 14 | ||||
| -rw-r--r-- | source4/build/smb_build/output.pm | 2 | ||||
| -rw-r--r-- | source4/include/includes.h | 2 | ||||
| -rw-r--r-- | source4/pidl/tests/Util.pm | 4 |
4 files changed, 14 insertions, 8 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index b639612fed..a4f03ae1e8 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -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__ ); diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 1451b8bb7d..e90a7fb2a2 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -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}"; diff --git a/source4/include/includes.h b/source4/include/includes.h index a2c8b3472d..f1188e2aaf 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -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" diff --git a/source4/pidl/tests/Util.pm b/source4/pidl/tests/Util.pm index 83651e6073..cbe6283852 100644 --- a/source4/pidl/tests/Util.pm +++ b/source4/pidl/tests/Util.pm @@ -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"; |