Date: Mon, 28 Jan 2013 22:47:57 +0100 From: Dimitry Andric <dim@FreeBSD.org> To: Chris Rees <utisoft@gmail.com>, Lev Serebryakov <lev@freebsd.org> Cc: Jeremy Chadwick <jdc@koitsu.org>, FreeBSD <freebsd-stable@freebsd.org>, Ian Smith <smithi@nimnet.asn.au>, Peter Wemm <peter@wemm.org>, Dewayne <dewayne.geraghty@heuristicsystems.com.au>, "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net> Subject: Re: svn - but smaller? Message-ID: <5106F20D.6070604@FreeBSD.org> In-Reply-To: <CADLo83_6ZGsbyza8M29rTE-Yu_yBULJRUVw4m9S3TJ3_qVzK0Q@mail.gmail.com> References: <20130123144050.GG51786@e-Gitt.NET> <20130124093846.5e683474@laptop> <E10EBB96DCC143BE8F14FD2982AD84B7@white> <20130124085717.GA26673@icarus.home.lan> <20130125235425.T76686@sola.nimnet.asn.au> <CADLo83_PmVO8GVZgb8%2B-xn76izPOJbU4t=K5Ff1_u0t3zyW5Cg@mail.gmail.com> <5102CEC4.9010108@FreeBSD.org> <CADLo83_6ZGsbyza8M29rTE-Yu_yBULJRUVw4m9S3TJ3_qVzK0Q@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------060105050400090609020903
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
On 2013-01-25 19:43, Chris Rees wrote:
> On 25 Jan 2013 18:28, "Dimitry Andric" <dim@freebsd.org <mailto:dim@freebsd.org>> wrote:
...
> > Thanks, but the port does not link on head, due to a problem in apr:
> >
> > /usr/local/lib/libapr-1.a(apr_snprintf.o): In function `apr_vformatter':
> > /usr/ports/devel/apr1/work/apr-1.4.6/strings/apr_snprintf.c:1023: undefined reference to `isnan'
> >
> > The issue is that apr-1-config --libs does not list -lm. Any idea how
> > to correct that?
>
> That's a question for Lev really, since it applies equally to devel/subversion.
>
> I'll fix it tomorrow when I'm back at the keyboard unless Lev fixes it first.
I'm currently using the attached patch. The relevant change is that I
changed the check for modf (which is in our libc) to modff (which is in
libm), the others are just standard fixes for clang.
--------------060105050400090609020903
Content-Type: text/x-diff;
name="devel__apr1-2.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="devel__apr1-2.diff"
Index: devel/apr1/files/patch-apr_network.m4
===================================================================
--- devel/apr1/files/patch-apr_network.m4 (revision 0)
+++ devel/apr1/files/patch-apr_network.m4 (working copy)
@@ -0,0 +1,29 @@
+--- apr-1.4.6/build/apr_network.m4.orig 2011-07-31 16:30:56.000000000 +0200
++++ apr-1.4.6/build/apr_network.m4 2011-07-31 16:31:06.000000000 +0200
+@@ -64,7 +64,7 @@
+ #include <sys/socket.h>
+ #endif
+
+-void main(void) {
++int main(void) {
+ struct addrinfo hints, *ai;
+ int error;
+
+@@ -152,7 +152,7 @@
+ #include <netinet/in.h>
+ #endif
+
+-void main(void) {
++int main(void) {
+ struct sockaddr_in sa;
+ char hbuf[256];
+ int error;
+@@ -195,7 +195,7 @@
+ #include <netdb.h>
+ #endif
+
+-void main(void) {
++int main(void) {
+ if (EAI_ADDRFAMILY < 0) {
+ exit(0);
+ }
Index: devel/apr1/files/patch-configure.in
===================================================================
--- devel/apr1/files/patch-configure.in (revision 0)
+++ devel/apr1/files/patch-configure.in (working copy)
@@ -0,0 +1,20 @@
+--- apr-1.4.6/configure.in.orig 2011-05-20 19:39:54.000000000 +0200
++++ apr-1.4.6/configure.in 2013-01-28 22:09:21.000000000 +0100
+@@ -583,7 +583,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+
+-void main(void)
++int main(void)
+ {
+ int fd, ret = 0;
+ struct stat64 st;
+@@ -677,7 +677,7 @@
+ AC_SEARCH_LIBS(socket, socket)
+ AC_SEARCH_LIBS(crypt, crypt ufc)
+ AC_CHECK_LIB(truerand, main)
+- AC_SEARCH_LIBS(modf, m)
++ AC_SEARCH_LIBS(modff, m)
+ ;;
+ esac
+
--------------060105050400090609020903--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5106F20D.6070604>