radare2-bindings: backport upstream patch, see https://github.com/radare/radare2-bindings/issues/173

This commit is contained in:
blshkv 2017-08-03 10:12:01 +08:00
parent a0ddaa06e0
commit af33a8280d
No known key found for this signature in database
GPG key ID: 273E3E90D1A6294F
6 changed files with 94 additions and 7 deletions

View file

@ -0,0 +1,54 @@
From b8945c985e146de0a6a3b6bc9c667d081679cd1f Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Wed, 2 Aug 2017 15:52:58 +0200
Subject: [PATCH] Honor configure-langs in libr/lang/p
---
libr/lang/p/Makefile | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/libr/lang/p/Makefile b/libr/lang/p/Makefile
index 493bfcd..42c6c77 100644
--- a/libr/lang/p/Makefile
+++ b/libr/lang/p/Makefile
@@ -2,6 +2,7 @@
include ../../../config.mk
CFLAGS+=$(shell pkg-config --cflags r_core)
+CFLAGS+=-DPREFIX=\"${PREFIX}\"
DUK_CFLAGS+=-Wall -DPREFIX=\"${PREFIX}\" -I. -Iduk
@@ -25,6 +25,8 @@ endif
BINDEPS=
LDFLAGS_LIB=$(shell pkg-config --libs-only-L r_core) -lr_core -lr_io -lr_util -shared
+WANT_LUA=$(grep -q lua ../../../supported.langs && echo 1)
+
LANGS=$(shell ./getlangs.sh ${EXT_SO})
#LANGS=lang_python.${EXT_SO} lang_perl.${EXT_SO}
@@ -32,14 +34,22 @@ LANGS=$(shell ./getlangs.sh ${EXT_SO})
ifeq ($(HAVE_LIB_TCC),1)
LANGS+=lang_tcc.${EXT_SO}
endif
+
+ifeq ($(WANT_LUA),1)
ifeq ($(HAVE_LIB_LUA5_1),1)
LANGS+=lang_lua.${EXT_SO}
endif
+endif
+
+ifeq ($(WANT_CS),1)
LANGS+=lang_csharp.${EXT_SO}
+endif
+ifeq ($(WANT_JS),1)
LANGS+=lang_duktape.$(EXT_SO)
+endif
-all: ${LANGS}
+all: $(LANGS)
@echo "LANG ${LANGS}"
PYVER?=2

View file

@ -31,11 +31,12 @@ RDEPEND="
DEPEND="${RDEPEND}
~dev-util/radare2-${PV}
virtual/pkgconfig
dev-util/valabind
>=dev-util/valabind-1.3.0
dev-lang/swig"
src_prepare(){
epatch "${FILESDIR}/01_use_python_2.7.patch"
epatch "${FILESDIR}/1.6.0-lua.patch"
eapply_user
}

View file

@ -1 +1,2 @@
DIST valabind-0.10.0.tar.gz 51782 SHA256 dbc792b7f7c93cbc1c0187c456f793437ccce980b24484ade95b507e2ca30f25 SHA512 8a1cb5d9c0960df0832d7c72a5204a24ec56f7ced9defe80636670502d6807db63af31fb3d0b0970bb35e27c907455270aa1b898ab1a8818373a271849fb388d WHIRLPOOL c65d978cbb5e2d976aecc486cbb741cdf22348a0e18864542e5ca2ec9a29791f5fcccfbc9f98f663edc4a8cb94fae91da0c5f9797d3559b38f3b11d5ba7930a4
DIST valabind-1.3.0.tar.gz 52267 SHA256 8dd2bc96cfd27103da89b3a2ba2f75746b7fa128404da9a57362179129e649f1 SHA512 54a5c3a90eb95c48179a26b846495efc8e274c868bdb02c28054bc775e9eb788883e720e059efcbadd4e183272a27aadb6cf47aba085a96262dfb38979b3b415 WHIRLPOOL 78e459b0f4b327b0d5a38e12e690e931df70e38c1d4e915cb1b7db2ebb405b55eb2b05b2fef0713e04a33f408fcf96b7c3f328a5cd7b40a90d98fef260e24a32

View file

@ -0,0 +1,35 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
VALA_MIN_API_VERSION=0.32
VALA_USE_DEPEND=vapigen
inherit vala
DESCRIPTION="Valabind is a tool to parse vala or vapi files to transform them into swig files"
HOMEPAGE="https://github.com/radare/valabind"
SRC_URI="https://github.com/radare/valabind/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~amd64"
IUSE=""
RDEPEND="$(vala_depend)"
DEPEND="${RDEPEND}
dev-lang/swig
virtual/pkgconfig"
src_prepare() {
#upstream smoked something here
sed -i -e "s:^GIT_TIP:#GIT_TIP:" Makefile || die
#they don't detect version properly either
sed -i -e "s:=valac:=valac-$(vala_best_api_version):" Makefile || die
sed -i -e "s:\$(shell ./getvv):libvala-$(vala_best_api_version):" Makefile || die
eapply_user
}
src_install() {
emake DESTDIR="${ED}" install
}

View file

@ -15,7 +15,7 @@ dev-util/intel-ocl-sdk
~dev-util/bokken-1.8
~dev-util/pyew-2.0
~dev-util/valabind-0.10.0
~dev-util/valabind-1.3.0
=dev-util/radare2-1.6*
#virtualbox

View file

@ -15,14 +15,10 @@ dev-libs/nss utils
dev-libs/libdnet python
#required by bokken
#lua broken: https://github.com/radare/radare2-bindings/issues/173
dev-libs/radare2-bindings python -lua
dev-libs/radare2-bindings python
# required by gnuradio
dev-libs/Ice python
#https://github.com/radare/radare2-bindings/issues/75
dev-libs/radare2-bindings -ruby
#required by sqlitebrowser
dev-libs/qcustomplot qt5