Date: Fri, 24 Apr 2015 13:15:01 +0000 (UTC) From: Jimmy Olgeni <olgeni@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384637 - in head/lang: erlang erlang-runtime15 erlang-runtime15/files erlang-runtime16 erlang-runtime16/files erlang-runtime17 erlang-runtime17/files erlang/files Message-ID: <201504241315.t3ODF1Tl080283@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olgeni Date: Fri Apr 24 13:15:00 2015 New Revision: 384637 URL: https://svnweb.freebsd.org/changeset/ports/384637 Log: Fix implementation of sendfile function on FreeBSD. Also, replace USE_AUTOTOOLS with USES=autoreconf while I'm here. PR: 199649 Submitted by: Stefan Grundmann Added: head/lang/erlang-runtime16/files/patch-erts_emulator_drivers_common_efile__drv.c (contents, props changed) head/lang/erlang-runtime17/files/patch-erts_emulator_drivers_common_efile__drv.c (contents, props changed) head/lang/erlang/files/patch-erts_emulator_drivers_common_efile__drv.c (contents, props changed) Modified: head/lang/erlang-runtime15/Makefile head/lang/erlang-runtime15/files/patch-erts_emulator_drivers_common_efile__drv.c head/lang/erlang-runtime16/Makefile head/lang/erlang-runtime17/Makefile head/lang/erlang/Makefile Modified: head/lang/erlang-runtime15/Makefile ============================================================================== --- head/lang/erlang-runtime15/Makefile Fri Apr 24 12:57:01 2015 (r384636) +++ head/lang/erlang-runtime15/Makefile Fri Apr 24 13:15:00 2015 (r384637) @@ -3,7 +3,7 @@ PORTNAME= erlang PORTVERSION= 15.b.03.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ http://erlang.stacken.kth.se/download/:erlangorg \ @@ -43,8 +43,7 @@ OPTIONS_EXCLUDE_DragonFly= SCTP ERL_RELEASE= R${PORTVERSION:S/.//g:tu:S/1$/-1/} -USES= gmake perl5 -USE_AUTOTOOLS= autoconf:env +USES= autoreconf gmake perl5 USE_PERL5= build GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib Modified: head/lang/erlang-runtime15/files/patch-erts_emulator_drivers_common_efile__drv.c ============================================================================== --- head/lang/erlang-runtime15/files/patch-erts_emulator_drivers_common_efile__drv.c Fri Apr 24 12:57:01 2015 (r384636) +++ head/lang/erlang-runtime15/files/patch-erts_emulator_drivers_common_efile__drv.c Fri Apr 24 13:15:00 2015 (r384637) @@ -285,7 +285,14 @@ $FreeBSD$ DTRACE_INVOKE_RETURN(FILE_FADVISE); } -@@ -1906,6 +1968,7 @@ +@@ -1901,11 +1963,14 @@ + d->result_ok = 1; + if (d->c.sendfile.nbytes != 0) + d->c.sendfile.nbytes -= nbytes; ++ } else if (nbytes == 0 && d->c.sendfile.nbytes == 0) { ++ d->result_ok = 1; + } else + d->result_ok = 0; } else { d->result_ok = -1; } @@ -293,7 +300,7 @@ $FreeBSD$ } static void free_sendfile(void *data) { -@@ -2023,6 +2086,21 @@ +@@ -2023,6 +2088,21 @@ return; TRACE_F(("x%i", (int) d->command)); d->again = sys_info.async_threads == 0; @@ -315,7 +322,7 @@ $FreeBSD$ DRIVER_ASYNC(d->level, desc, d->invoke, void_ptr=d, d->free); } -@@ -2247,6 +2325,8 @@ +@@ -2247,6 +2327,8 @@ return; } @@ -324,7 +331,7 @@ $FreeBSD$ switch (d->command) { case FILE_READ: -@@ -2375,6 +2455,10 @@ +@@ -2375,6 +2457,10 @@ } else { desc->fd = d->fd; desc->flags = d->flags; Modified: head/lang/erlang-runtime16/Makefile ============================================================================== --- head/lang/erlang-runtime16/Makefile Fri Apr 24 12:57:01 2015 (r384636) +++ head/lang/erlang-runtime16/Makefile Fri Apr 24 13:15:00 2015 (r384637) @@ -3,7 +3,7 @@ PORTNAME= erlang PORTVERSION= 16.b.03.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ http://erlang.stacken.kth.se/download/:erlangorg \ @@ -43,8 +43,7 @@ OPTIONS_EXCLUDE_DragonFly= SCTP ERL_RELEASE= R${PORTVERSION:S/.//g:tu:S/1$/-1/} -USES= gmake perl5 -USE_AUTOTOOLS= autoconf:env +USES= autoreconf gmake perl5 USE_PERL5= build GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib Added: head/lang/erlang-runtime16/files/patch-erts_emulator_drivers_common_efile__drv.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/erlang-runtime16/files/patch-erts_emulator_drivers_common_efile__drv.c Fri Apr 24 13:15:00 2015 (r384637) @@ -0,0 +1,11 @@ +--- erts/emulator/drivers/common/efile_drv.c.orig ++++ erts/emulator/drivers/common/efile_drv.c +@@ -1938,6 +1938,8 @@ + d->result_ok = 1; + if (d->c.sendfile.nbytes != 0) + d->c.sendfile.nbytes -= nbytes; ++ } else if (nbytes == 0 && d->c.sendfile.nbytes == 0) { ++ d->result_ok = 1; + } else + d->result_ok = 0; + } else { Modified: head/lang/erlang-runtime17/Makefile ============================================================================== --- head/lang/erlang-runtime17/Makefile Fri Apr 24 12:57:01 2015 (r384636) +++ head/lang/erlang-runtime17/Makefile Fri Apr 24 13:15:00 2015 (r384637) @@ -3,7 +3,7 @@ PORTNAME= erlang PORTVERSION= 17.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ http://erlang.stacken.kth.se/download/:erlangorg \ @@ -43,8 +43,7 @@ OPTIONS_EXCLUDE_DragonFly= SCTP ERL_RELEASE= 17.5 -USES= gmake perl5 -USE_AUTOTOOLS= autoconf:env +USES= autoreconf gmake perl5 USE_PERL5= build GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib Added: head/lang/erlang-runtime17/files/patch-erts_emulator_drivers_common_efile__drv.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/erlang-runtime17/files/patch-erts_emulator_drivers_common_efile__drv.c Fri Apr 24 13:15:00 2015 (r384637) @@ -0,0 +1,11 @@ +--- erts/emulator/drivers/common/efile_drv.c.orig ++++ erts/emulator/drivers/common/efile_drv.c +@@ -1938,6 +1938,8 @@ + d->result_ok = 1; + if (d->c.sendfile.nbytes != 0) + d->c.sendfile.nbytes -= nbytes; ++ } else if (nbytes == 0 && d->c.sendfile.nbytes == 0) { ++ d->result_ok = 1; + } else + d->result_ok = 0; + } else { Modified: head/lang/erlang/Makefile ============================================================================== --- head/lang/erlang/Makefile Fri Apr 24 12:57:01 2015 (r384636) +++ head/lang/erlang/Makefile Fri Apr 24 13:15:00 2015 (r384637) @@ -3,6 +3,7 @@ PORTNAME= erlang PORTVERSION= 17.5.2 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ @@ -47,8 +48,7 @@ OPTIONS_EXCLUDE_DragonFly= SCTP ERL_RELEASE= 17.5 -USES= gmake perl5 -USE_AUTOTOOLS= autoconf:env +USES= autoreconf gmake perl5 USE_PERL5= build USE_RC_SUBR= epmd GNU_CONFIGURE= yes Added: head/lang/erlang/files/patch-erts_emulator_drivers_common_efile__drv.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/erlang/files/patch-erts_emulator_drivers_common_efile__drv.c Fri Apr 24 13:15:00 2015 (r384637) @@ -0,0 +1,11 @@ +--- erts/emulator/drivers/common/efile_drv.c.orig ++++ erts/emulator/drivers/common/efile_drv.c +@@ -1938,6 +1938,8 @@ + d->result_ok = 1; + if (d->c.sendfile.nbytes != 0) + d->c.sendfile.nbytes -= nbytes; ++ } else if (nbytes == 0 && d->c.sendfile.nbytes == 0) { ++ d->result_ok = 1; + } else + d->result_ok = 0; + } else {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504241315.t3ODF1Tl080283>