Re: [PATCH] BUILD: trace: include tools.h
On 09/25/2020 05:59 PM, Willy Tarreau wrote: Git uses the "---" marker as an end of commit message, to put your comments to committers below. So when I applied your patch, it dropped this part. I've reintroduced it, but I thought you would like to know in order not to get caught by accident on another patch if you're used to use this :-) Oh and by the way it also drops lines starting with "#" which tends to annoy me as I get caught once in a while when referencing a github issue at the beginning of a line! Hello Willy, thank you for the info, I made a comment for commit with 'git commit --amend' so I could add those lines with '---'. When I got the patch with 'git format-patch -1' I was a little surprised by those multiple lines with '---' but I didn't remove it. -- Zaga What can change the nature of a man?
Re: [PATCH] BUILD: trace: include tools.h
Hi Miroslav, On Thu, Sep 24, 2020 at 09:43:56AM +0200, Miroslav Zagorac wrote: > Hello, > > haproxy cannot be compiled on debian 9.13 if the TRACE option is used. Thanks, applied! Note below: > --- > src/calltrace.o: In function `make_line': > .../src/calltrace.c:204: undefined reference to `rdtsc' > src/calltrace.o: In function `calltrace': > .../src/calltrace.c:277: undefined reference to `rdtsc' > collect2: error: ld returned 1 exit status > Makefile:866: recipe for target 'haproxy' failed > --- Git uses the "---" marker as an end of commit message, to put your comments to committers below. So when I applied your patch, it dropped this part. I've reintroduced it, but I thought you would like to know in order not to get caught by accident on another patch if you're used to use this :-) Oh and by the way it also drops lines starting with "#" which tends to annoy me as I get caught once in a while when referencing a github issue at the beginning of a line! Cheers, Willy
[PATCH] BUILD: trace: include tools.h
Hello, haproxy cannot be compiled on debian 9.13 if the TRACE option is used. -- Zaga What can change the nature of a man? >From 97fee9d468d5bd52716fa0352a5ce9b4522730fc Mon Sep 17 00:00:00 2001 From: Miroslav Zagorac Date: Thu, 24 Sep 2020 09:15:46 +0200 Subject: [PATCH] BUILD: trace: include tools.h If the TRACE option is used when compiling the haproxy source, the following error occurs: --- src/calltrace.o: In function `make_line': .../src/calltrace.c:204: undefined reference to `rdtsc' src/calltrace.o: In function `calltrace': .../src/calltrace.c:277: undefined reference to `rdtsc' collect2: error: ld returned 1 exit status Makefile:866: recipe for target 'haproxy' failed --- --- src/calltrace.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/calltrace.c b/src/calltrace.c index 2208ca11b..551e8a01f 100644 --- a/src/calltrace.c +++ b/src/calltrace.c @@ -49,6 +49,7 @@ #include #include #include +#include static FILE *log; static int level; -- 2.20.1
