Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Feb 2011 15:11:07 +0300
From:      Sergey Kandaurov <pluknet@gmail.com>
To:        venom <samflanker@gmail.com>
Cc:        freebsd-hackers@freebsd.org
Subject:   Re: problem with build mcelog
Message-ID:  <AANLkTik0xuH-dF1sVZG=mPdoss_zfBNE-rMDLKgweMmB@mail.gmail.com>
In-Reply-To: <4D5E5476.5010107@gmail.com>
References:  <4D553027.5040606@gmail.com> <201102111531.00915.jhb@freebsd.org> <4D5E5476.5010107@gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On 18 February 2011 14:13, venom <samflanker@gmail.com> wrote:
> On 02/11/2011 11:31 PM, John Baldwin wrote:
>>
>> On Friday, February 11, 2011 7:48:39 am venom wrote:
>>>
>>> Hello.
>>>
>>> i am trying build mcelog
>>>
>>>
>>> FreeBSD XXXX 8.1-RELEASE-p2 FreeBSD 8.1-RELEASE-p2 #0: Fri Jan 14
>>> 04:15:56
>>> UTC 2011 root@freebsd:/usr/obj/usr/src/sys/GENERIC amd64
>>>
>>>
>>> # fetch
>>> http://ftp2.pl.freebsd.org/pub/FreeBSD/distfiles/mcelog-1.0pre2.tar.gz
>>> # tar -xf mcelog-1.0pre2.tar.gz
>>> # cd mcelog-1.0pre2
>>> # fetch http://people.freebsd.org/~jhb/mcelog/mcelog.patch
>>> # fetch http://people.freebsd.org/~jhb/mcelog/memstream.c
>>
>> Oops, I just updated mcelog.patch and it should work fine now.
>>
>
> |--- //depot/vendor/mcelog/tsc.c =A0 =A02010-03-05 20:24:22.000000000 000=
0
> |+++ //depot/projects/mcelog/tsc.c =A0 =A02010-03-05 21:09:24.000000000 0=
000
> --------------------------
> Patching file tsc.c using Plan A...
> Hunk #1 succeeded at 15.
> Hunk #2 succeeded at 52.
> Hunk #3 succeeded at 75.
> Hunk #4 succeeded at 156.
> done
> 12:12:46 ~/temp/MCE/mcelog-1.0pre2
> # gmake FREEBSD=3Dyes
> Makefile:92: .depend: No such file or directory
> cc -MM -I. p4.c k8.c mcelog.c dmi.c tsc.c core2.c bitfield.c intel.c
> nehalem.c dunnington.c tulsa.c config.c memutil.c msg.c eventloop.c
> leaky-bucket.c memdb.c server.c client.c cache.c rbtree.c memstream.c >
> .depend.X && mv .depend.X .depend
> cc -c -g -Os =A0-Wall -Wextra -Wno-missing-field-initializers
> -Wno-unused-parameter -Wstrict-prototypes -Wformat-security
> -Wmissing-declarations -Wdeclaration-after-statement =A0-o mcelog.o mcelo=
g.c
> cc -c -g -Os =A0-Wall -Wextra -Wno-missing-field-initializers
> -Wno-unused-parameter -Wstrict-prototypes -Wformat-security
> -Wmissing-declarations -Wdeclaration-after-statement =A0-o p4.o p4.c
> cc -c -g -Os =A0-Wall -Wextra -Wno-missing-field-initializers
> -Wno-unused-parameter -Wstrict-prototypes -Wformat-security
> -Wmissing-declarations -Wdeclaration-after-statement =A0-o k8.o k8.c
> cc -c -g -Os =A0-Wall -Wextra -Wno-missing-field-initializers
> -Wno-unused-parameter -Wstrict-prototypes -Wformat-security
> -Wmissing-declarations -Wdeclaration-after-statement =A0-o dmi.o dmi.c
> cc -c -g -Os =A0-Wall -Wextra -Wno-missing-field-initializers
> -Wno-unused-parameter -Wstrict-prototypes -Wformat-security
> -Wmissing-declarations -Wdeclaration-after-statement =A0-o tsc.o tsc.c
> cc -c -g -Os =A0-Wall -Wextra -Wno-missing-field-initializers
> -Wno-unused-parameter -Wstrict-prototypes -Wformat-security
> -Wmissing-declarations -Wdeclaration-after-statement =A0-o core2.o core2.=
c
> cc -c -g -Os =A0-Wall -Wextra -Wno-missing-field-initializers
> -Wno-unused-parameter -Wstrict-prototypes -Wformat-security
> -Wmissing-declarations -Wdeclaration-after-statement =A0-o bitfield.o
> bitfield.c
> cc -c -g -Os =A0-Wall -Wextra -Wno-missing-field-initializers
> -Wno-unused-parameter -Wstrict-prototypes -Wformat-security
> -Wmissing-declarations -Wdeclaration-after-statement =A0-o intel.o intel.=
c
> cc -c -g -Os =A0-Wall -Wextra -Wno-missing-field-initializers
> -Wno-unused-parameter -Wstrict-prototypes -Wformat-security
> -Wmissing-declarations -Wdeclaration-after-statement =A0-o nehalem.o neha=
lem.c
> cc -c -g -Os =A0-Wall -Wextra -Wno-missing-field-initializers
> -Wno-unused-parameter -Wstrict-prototypes -Wformat-security
> -Wmissing-declarations -Wdeclaration-after-statement =A0-o dunnington.o
> dunnington.c
> cc -c -g -Os =A0-Wall -Wextra -Wno-missing-field-initializers
> -Wno-unused-parameter -Wstrict-prototypes -Wformat-security
> -Wmissing-declarations -Wdeclaration-after-statement =A0-o tulsa.o tulsa.=
c
> cc -c -g -Os =A0-Wall -Wextra -Wno-missing-field-initializers
> -Wno-unused-parameter -Wstrict-prototypes -Wformat-security
> -Wmissing-declarations -Wdeclaration-after-statement =A0-o config.o confi=
g.c
> config.c:135: error: static declaration of 'getline' follows non-static
> declaration
> /usr/include/stdio.h:370: error: previous declaration of 'getline' was he=
re
> gmake: *** [config.o] Error 1
>

A local getline() needs the FreeBSD version check.

%%%
--- config.c.olg        2011-02-18 14:57:52.000000000 +0300
+++ config.c    2011-02-18 15:07:59.000000000 +0300
@@ -18,6 +18,9 @@
    Author: Andi Kleen
 */
 #define _GNU_SOURCE 1
+#ifdef __FreeBSD__
+# include <sys/param.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -126,7 +129,7 @@
        return s;
 }

-#ifdef __FreeBSD__
+#if (defined __FreeBSD__) && (__FreeBSD_version < 800067)
 /*
  * Newer versions do have getline(), so this should use a version test
  * at some point.
%%%

--=20
wbr,
pluknet



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTik0xuH-dF1sVZG=mPdoss_zfBNE-rMDLKgweMmB>