Fix build

radareorg · Mar 13, 2017 · 8d5b1b5 · 8d5b1b5
1 parent 19ab070
commit 8d5b1b5
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/binr/ragg2/Makefile b/binr/ragg2/Makefile
@@ -2,7 +2,7 @@ BIN=ragg2
 BINDEPS=r_egg r_bin r_syscall r_asm
 BINDEPS+=r_io r_socket
 BINDEPS+=r_lang r_parse r_anal r_reg r_flag
-BINDEPS+=r_magic r_cons r_util
+BINDEPS+=r_magic r_cons r_util r_search
 
 include ../rules.mk
 include ../../libr/socket/deps.mk

diff --git a/binr/rahash2/Makefile b/binr/rahash2/Makefile
@@ -3,6 +3,7 @@ BIN=rahash2
 BINDEPS=r_io r_hash r_socket r_asm r_cons
 BINDEPS+=r_anal r_syscall r_reg r_parse
 BINDEPS+=r_flag r_lang r_crypto r_util
+BINDEPS+=r_search
 
 include ../rules.mk
 

diff --git a/binr/rasign2/Makefile b/binr/rasign2/Makefile
@@ -1,5 +1,5 @@
 BIN=rasign2
-BINDEPS=r_anal r_util
+BINDEPS=r_anal r_util r_search
 
 include ../rules.mk
 #include ../../libr/socket/deps.mk

diff --git a/binr/rasign2/rasign2.c b/binr/rasign2/rasign2.c
@@ -23,7 +23,7 @@ int main(int argc, char **argv) {
 	int action = 0;
 	int rad = 0;
 	int json = 0;
-	RSign *sig = r_sign_new ();
+	//RSign *sig = r_sign_new ();
 
 	while ((c=getopt (argc, argv, "o:hrsj:iV")) !=-1) {
 		switch (c) {
@@ -51,7 +51,7 @@ int main(int argc, char **argv) {
 	if (argv[optind]==NULL)
 		return rasign_show_help ();
 
-	r_sign_list (sig, rad, json);
+	//r_sign_list (sig, rad, json);
 
 	switch (action) {
 	case 's':
@@ -64,7 +64,7 @@ int main(int argc, char **argv) {
 		break;
 	}
 
-	r_sign_free (sig);
+	//r_sign_free (sig);
 
 	return 0;
 }
diff --git a/binr/rasm2/Makefile b/binr/rasm2/Makefile
@@ -1,4 +1,4 @@
 BIN=rasm2
 BINDEPS=r_asm r_parse r_syscall r_anal r_reg
-BINDEPS+=r_flag r_cons r_lang r_util
+BINDEPS+=r_flag r_cons r_lang r_util r_search
 include ../rules.mk
diff --git a/libr/search/keyword.c b/libr/search/keyword.c
@@ -18,7 +18,7 @@ R_API RSearchKeyword* r_search_keyword_new(const ut8 *kwbuf, int kwlen, const ut
 	kw = R_NEW0 (RSearchKeyword);
 	if (!kw) return NULL;
 	kw->type = R_SEARCH_KEYWORD_TYPE_BINARY;
-	kw->data = data;
+	kw->data = (void *) data;
 	kw->keyword_length = kwlen;
 	kw->bin_keyword = malloc (kwlen);
 	if (!kw->bin_keyword) {
@@ -208,7 +208,7 @@ R_API RSearchKeyword *r_search_keyword_new_regexp (const char *str, const char *
 	memcpy(kw->bin_keyword, str + start, length);
 	kw->keyword_length = length;
 	kw->type = R_SEARCH_KEYWORD_TYPE_STRING;
-	kw->data = data;
+	kw->data = (void *) data;
 
 	/* Parse the options */
 	for (; str[i]; i++) {

diff --git a/pkgcfg/r_anal.pc.acr b/pkgcfg/r_anal.pc.acr
@@ -7,5 +7,5 @@ Name: r_anal
 Description: radare foundation libraries
 Version: @VERSION@
 Requires:
-Libs: -L${libdir} -lr_anal -lr_util -lr_reg -lr_syscall
+Libs: -L${libdir} -lr_anal -lr_util -lr_reg -lr_syscall -lr_search
 Cflags: -I${includedir}/libr