diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-09 02:32:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:00 -0500 |
| commit | e7f2d247e40218ce3320e288780ad745bc38f6a2 (patch) | |
| tree | db4b0908828d4f4f8f863f9bcbc21dbdd8d29776 | |
| parent | c2387587cb9c43c5f642554be9f08cc4ab0badc9 (diff) | |
| download | samba-e7f2d247e40218ce3320e288780ad745bc38f6a2.tar.gz samba-e7f2d247e40218ce3320e288780ad745bc38f6a2.tar.bz2 samba-e7f2d247e40218ce3320e288780ad745bc38f6a2.zip | |
r18281: a workaround for an infinite dependency loop in the dependency
generation for smbreadline.d. The problem was caused by
extra_flags.txt having ./lib/smbreadline/smbreadline.o but the build
using lib/smbreadline/smbreadline.o, which means cflags.pl didn't
match the target.
Hopefully the workaround can be removed when metze or jelmer wake up
and give me a hint on how to make SMB_SUBSYSTEM() not add the ./
prefix :-)
(This used to be commit 826cd304a7cf54ab60ea41b6ecf00ca7b89f2b39)
| -rw-r--r-- | source4/lib/smbreadline/smbreadline.c | 6 | ||||
| -rwxr-xr-x | source4/script/cflags.pl | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source4/lib/smbreadline/smbreadline.c b/source4/lib/smbreadline/smbreadline.c index 6b8e54e1e3..a1fa5d7df3 100644 --- a/source4/lib/smbreadline/smbreadline.c +++ b/source4/lib/smbreadline/smbreadline.c @@ -21,9 +21,9 @@ #include "includes.h" #include "pstring.h" -#include "lib/replace/system/filesys.h" -#include "lib/replace/system/select.h" -#include "lib/replace/system/readline.h" +#include "system/filesys.h" +#include "system/select.h" +#include "system/readline.h" /******************************************************************* Similar to sys_select() but catch EINTR and continue. diff --git a/source4/script/cflags.pl b/source4/script/cflags.pl index 7ca8f12404..f98ed9f611 100755 --- a/source4/script/cflags.pl +++ b/source4/script/cflags.pl @@ -7,13 +7,15 @@ use strict; my $target = shift; +my $target2 = "./$target"; sub check_flags($) { my ($name)=@_; open (IN, "extra_cflags.txt"); while (<IN> =~ /^([^:]+): (.*)$/) { - next unless (grep(/^$target$/, (split / /, $1))); + next unless (grep(/^$target$/, (split / /, $1)) || + grep(/^$target2$/, (split / /, $1))); $_ = $2; s/^CFLAGS\+=//; print "$_ "; |