angr-vex's library is dlopen(3)ed py py-pyvex (not py-angr itself), so
register it as proper RDEP in py-pyvex (and only there).

Since all BDEPs are RDEPs, use one in the other for less duplicates.

Spotted after `pkg_add angrop' on a fresh installation where angr-vex
simply wasn't installed;  this was the the case even though the
installed angr had an LDEP on it, but since it does not link against it,
thus our framework did not convert it into an RDEP.

OK?

Index: py-angr//Makefile
===================================================================
RCS file: /cvs/ports/devel/angr/py-angr/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- py-angr//Makefile   15 Sep 2019 13:29:50 -0000      1.2
+++ py-angr//Makefile   22 Oct 2019 18:42:22 -0000
@@ -3,6 +3,7 @@
 COMMENT =      multi-architecture binary analysis toolkit
 
 ANGR_PYTHON_MODULE =   angr
+REVISION =     0
 
 HOMEPAGE =     https://angr.io/
 
@@ -13,8 +14,7 @@ COMPILER =    base-clang ports-gcc
 
 # XXX: py-unicorn ships unicorn.so, but angr links against .1 - why?!
 # Missing lib: libunicorn.so.1 
(/usr/local/lib/python3.7/site-packages/angr/lib/angr_native.so) (NOT REACHABLE)
-LIB_DEPENDS =  devel/angr/vex \
-               devel/py-unicorn${MODPY_FLAVOR}
+LIB_DEPENDS =  devel/py-unicorn${MODPY_FLAVOR}
 
 BUILD_DEPENDS =        devel/angr/py-pyvex>=${MODPY_EGG_VERSION} \
                devel/py-bitstring${MODPY_FLAVOR} \
Index: py-pyvex//Makefile
===================================================================
RCS file: /cvs/ports/devel/angr/py-pyvex/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- py-pyvex//Makefile  23 Jul 2019 19:22:21 -0000      1.1.1.1
+++ py-pyvex//Makefile  22 Oct 2019 18:41:23 -0000
@@ -3,6 +3,7 @@
 COMMENT =              Python interface to libVEX and VEX IR
 
 ANGR_PYTHON_MODULE =   pyvex
+REVISION =             0
 
 USE_GMAKE =            Yes
 CFLAGS +=              -shared -fPIC -I${LOCALBASE}/include/angr-vex/
@@ -13,10 +14,10 @@ BUILD_DEPENDS +=    devel/angr/vex \
                        devel/py-cffi${MODPY_FLAVOR} \
                        devel/py-cparser${MODPY_FLAVOR} \
 
-RUN_DEPENDS +=         devel/angr/py-archinfo>=${MODPY_EGG_VERSION} \
+# dlopen(3)s libpyvex.so
+RUN_DEPENDS +=         ${BUILD_DEPENDS} \
+                       devel/angr/py-archinfo>=${MODPY_EGG_VERSION} \
                        devel/py-bitstring${MODPY_FLAVOR} \
-                       devel/py-cffi${MODPY_FLAVOR} \
-                       devel/py-cparser${MODPY_FLAVOR} \
                        devel/py-future${MODPY_FLAVOR}
 TEST_DEPENDS =         ${RUN_DEPENDS}
 

Reply via email to