Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 5 Oct 2018 05:56:39 +0000 (UTC)
From:      =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r481262 - in head/devel/p5-Devel-BeginLift: . files
Message-ID:  <201810050556.w955udFx041039@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: des
Date: Fri Oct  5 05:56:39 2018
New Revision: 481262
URL: https://svnweb.freebsd.org/changeset/ports/481262

Log:
  Unbreak on recent Perl.
  
  Approved by:	maintainer timeout

Added:
  head/devel/p5-Devel-BeginLift/files/
  head/devel/p5-Devel-BeginLift/files/extra-patch-BeginLift.xs   (contents, props changed)
Modified:
  head/devel/p5-Devel-BeginLift/Makefile

Modified: head/devel/p5-Devel-BeginLift/Makefile
==============================================================================
--- head/devel/p5-Devel-BeginLift/Makefile	Fri Oct  5 05:24:46 2018	(r481261)
+++ head/devel/p5-Devel-BeginLift/Makefile	Fri Oct  5 05:56:39 2018	(r481262)
@@ -21,7 +21,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502501
-BROKEN=		Does not build, op_sibling usage. https://rt.cpan.org/Public/Bug/Display.html?id=115272
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-BeginLift.xs
 .endif
 
 .include <bsd.port.post.mk>

Added: head/devel/p5-Devel-BeginLift/files/extra-patch-BeginLift.xs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/p5-Devel-BeginLift/files/extra-patch-BeginLift.xs	Fri Oct  5 05:56:39 2018	(r481262)
@@ -0,0 +1,44 @@
+--- BeginLift.xs.orig	2010-05-11 06:01:00 UTC
++++ BeginLift.xs
+@@ -8,10 +8,6 @@
+ 
+ #include "hook_op_check_entersubforcv.h"
+ 
+-/* lifted from op.c */
+-
+-#define LINKLIST(o) ((o)->op_next ? (o)->op_next : linklist((OP*)o))
+-
+ #ifndef linklist
+ # define linklist(o) THX_linklist(aTHX_ o)
+ STATIC OP *THX_linklist(pTHX_ OP *o) {
+@@ -24,9 +20,9 @@ STATIC OP *THX_linklist(pTHX_ OP *o) {
+     o->op_next = LINKLIST(first);
+     kid = first;
+     for (;;) {
+-      if (kid->op_sibling) {
+-   kid->op_next = LINKLIST(kid->op_sibling);
+-   kid = kid->op_sibling;
++      if (OpHAS_SIBLING(kid)) {
++   kid->op_next = LINKLIST(OpSIBLING(kid));
++   kid = OpSIBLING(kid);
+       } else {
+    kid->op_next = o;
+    break;
+@@ -61,7 +57,7 @@ STATIC OP *lift_cb(pTHX_ OP *o, CV *cv, 
+     PUSHMARK(SP); /* push a mark for the arguments */
+ 
+     /* push an arg for every sibling op */
+-    for ( arg = curop->op_sibling; arg->op_sibling; arg = arg->op_sibling ) {
++    for ( arg = OpSIBLING(arg); OpHAS_SIBLING(arg); arg = OpSIBLING(arg) ) {
+       XPUSHs(sv_bless(newRV_inc(newSViv(PTR2IV(arg))), gv_stashpv("B::LISTOP", 0)));
+     }
+ 
+@@ -96,7 +92,7 @@ STATIC OP *lift_cb(pTHX_ OP *o, CV *cv, 
+ 
+     if (SvROK(sv) && sv_derived_from(sv, "B::OP")) {
+       OP *new = INT2PTR(OP *,SvIV((SV *)SvRV(sv)));
+-      new->op_sibling = NULL;
++      new->op_sibparent = NULL;
+ 
+       /* FIXME this is bullshit */
+       if ( (PL_opargs[new->op_type] & OA_CLASS_MASK) != OA_SVOP ) {

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810050556.w955udFx041039>