From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Original-To: caml-list@yquem.inria.fr Delivered-To: caml-list@yquem.inria.fr Received: from mail2-relais-roc.national.inria.fr (mail2-relais-roc.national.inria.fr [192.134.164.83]) by yquem.inria.fr (Postfix) with ESMTP id DC6E5BC57 for ; Thu, 2 Sep 2010 00:59:39 +0200 (CEST) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApQFAJJ3fkw+lQkY/2dsb2JhbACTTo4UwTKFOQSEOYVbhU4 X-IronPort-AV: E=Sophos;i="4.56,306,1280700000"; d="scan'208";a="58306830" Received: from dragon.cc.colocall.com (HELO dragon.mykola.org) ([62.149.9.24]) by mail2-smtp-roc.national.inria.fr with ESMTP/TLS/DHE-RSA-AES256-SHA; 02 Sep 2010 00:59:39 +0200 Received: from [192.168.0.182] (SOL-FTTB.57.78.27.94.sovam.net.ua [94.27.78.57] (may be forged)) (authenticated bits=0) by dragon.mykola.org (8.14.3/8.14.3) with ESMTP id o81MxbFP094695 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO) for ; Thu, 2 Sep 2010 01:59:37 +0300 (EEST) (envelope-from nick@mykola.org) From: =?utf-8?B?0JzQuNC60L7Qu9CwINCh0YLRgNGU0LHQutC+0LI=?= Content-Type: multipart/mixed; boundary=Apple-Mail-19-132094351 Subject: annexlib and FreeBSD Date: Thu, 2 Sep 2010 01:59:32 +0300 Message-Id: <00E41D05-F0B6-485F-9E7E-2523E6C837D3@mykola.org> To: caml-list@inria.fr Mime-Version: 1.0 (Apple Message framework v1081) X-Mailer: Apple Mail (2.1081) X-Spam: no; 0.00; gmake:01 usr:01 gmake:01 usr:01 ocamlc:01 gcc:01 -fpic:01 -dpic:01 -fpic:01 -dpic:01 -wall:01 -wno-unused:01 util:01 stubs:01 util:01 X-Attachments: type="application/octet-stream" name="annexlib.patch" name="annexlib.patch" --Apple-Mail-19-132094351 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii Hi, While trying to build annexlib-0.13.5 from godi_console on my FreeBSD = machine I'm getting the following error: = --------------------------------------------------------------------------= ---------------------------------------------------------- gmake[8]: Leaving directory = `/usr/home/nick/godi/build/godi/godi-annexlib/work/annexlib-0.13.5' gmake[8]: Entering directory = `/usr/home/nick/godi/build/godi/godi-annexlib/work/annexlib-0.13.5' ocamlc -c -cc "gcc" -ccopt "-fPIC -DPIC -fPIC -DPIC -Wall -Wno-unused \ -o util_stubs.o " util_stubs.c=20 util_stubs.c: In function 'stew_sendfile': util_stubs.c:473: warning: implicit declaration of function 'sendfile' util_stubs.c:484: error: expected ';' before '}' token util_stubs.c: In function 'alloc_service_entry': util_stubs.c:500: warning: implicit declaration of function 'ntohs' gmake[8]: *** [util_stubs.o] Error 2 gmake[8]: Leaving directory = `/usr/home/nick/godi/build/godi/godi-annexlib/work/annexlib-0.13.5' gmake[7]: *** [byte-code-library] Error 2 gmake[7]: Leaving directory = `/usr/home/nick/godi/build/godi/godi-annexlib/work/annexlib-0.13.5' Error: Exec error: File = /usr/home/nick/godi/build/godi/godi-annexlib/./../../mk/bsd.pkg.mk, line = 1039: Command returned with non-zero exit code Error: Exec error: File = /usr/home/nick/godi/build/godi/godi-annexlib/./../../mk/bsd.pkg.mk, line = 1378: Command returned with non-zero exit code = --------------------------------------------------------------------------= ---------------------------------------------------------- Prerequisites: $ uname -sr FreeBSD 8.0-STABLE $ gcc -v Using built-in specs. Target: amd64-undermydesk-freebsd Configured with: FreeBSD/amd64 system compiler Thread model: posix gcc version 4.2.1 20070719 [FreeBSD] The problem is in the minor typo in FreeBSD-specific code. So, to deal = with this error and those warnings I propose the attached patch. Also, it would be great if somebody could point me to more specific way = to propose patches to godi packages :-) --=20 Mykola Stryebkov Public key: http://mykola.org/pubkey.txt fpr: 0226 54EE C1FF 8636 36EF 2AC9 BCE9 CFC7 9CF4 6747 --Apple-Mail-19-132094351 Content-Disposition: attachment; filename=annexlib.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="annexlib.patch" Content-Transfer-Encoding: 7bit Common subdirectories: annexlib.orig/doc and annexlib.patched/doc Common subdirectories: annexlib.orig/tests and annexlib.patched/tests diff -du annexlib.orig/util_stubs.c annexlib.patched/util_stubs.c --- annexlib.orig/util_stubs.c 2010-09-02 01:39:36.000000000 +0300 +++ annexlib.patched/util_stubs.c 2010-09-02 01:43:54.000000000 +0300 @@ -42,6 +42,13 @@ #include #include +#ifdef __FreeBSD__ +#include +#include +#include +#include +#endif + #ifdef HAVE_SYS_SENDFILE_H #include #endif @@ -476,7 +483,7 @@ if (len == 0) return Val_int(wrote); else - uerror("sendfile", Nothing) + uerror("sendfile", Nothing); #else failwith("sendfile unimplemented!"); #endif --Apple-Mail-19-132094351--