Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-10-06 18:13:46 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

* Use OpenSSL (cflags/ldflags) from pkg-config

Browse Source
This commit is contained in:
pancake 2011-07-13 19:22:38 +02:00
parent 188560bf4b
commit 07b5b473c5
15 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
binr/radare2/Makefile
View File

@ -27,5 +27,6 @@ LDFLAGS+=-pthread
endif
ifeq (${HAVE_LIB_SSL},1)
LDFLAGS+=-lssl -lcrypto
CFLAGS+=${SSL_CFLAGS}
LDFLAGS+=${SSL_LDFLAGS}
endif

3
binr/radiff2/Makefile
View File

@ -14,5 +14,6 @@ endif
endif
ifeq (${HAVE_LIB_SSL},1)
LDFLAGS+=-lssl -lcrypto
CFLAGS+=${SSL_CFLAGS}
LDFLAGS+=${SSL_LDFLAGS}
endif

3
binr/rafind2/Makefile
View File

@ -13,5 +13,6 @@ endif
endif
ifeq (${HAVE_LIB_SSL},1)
LDFLAGS+=-lssl -lcrypto
CFLAGS+=${SSL_CFLAGS}
LDFLAGS+=${SSL_LDFLAGS}
endif

5
config-user.mk.acr
View File

@ -34,5 +34,8 @@ WITHNONPIC=@WITHNONPIC@
HAVE_LIB_TCC=@HAVE_LIB_TCC@
HAVE_LIB_GMP=@HAVE_LIB_GMP@
HAVE_LIB_SSL=@HAVE_LIB_SSL@
HAVE_LIB_SSL=@HAVE_OPENSSL@
HAVE_LIB_MAGIC=@HAVE_LIB_MAGIC@
SSL_CFLAGS=@SSL_CFLAGS@
SSL_LDFLAGS=@SSL_LDFLAGS@

23
configure vendored
View File

@ -1,5 +1,5 @@
#!/bin/sh
# This script was automatically generated by ACR v0.8.4
# This script was automatically generated by ACR v0.8.6
# @author: pancake <youterm.com>
# @url: http://www.nopcode.org
# @repo: hg clone http://hg.youterm.com/acr
@ -177,7 +177,7 @@ take_environ() {
}
show_version() {
echo "radare2-0.8b configuration script done with acr v0.8.4.
echo "radare2-0.8b configuration script done with acr v0.8.6.
The 'Free Software Foundation' message is only for autodetection.
Originally written by pancake <youterm.com>."
exit 0
@ -199,6 +199,7 @@ echo "VERSION: 0.8b"
echo "LANGS: c"
echo "REQUIRED: libdl"
echo "OPTIONAL: libewf"
echo "PKG-CONFIG: openssl"
echo "FLAGS: --without-debugger --without-ewf --without-gmp --without-magic --without-ssl --with-compiler=gcc --with-ostype=auto --without-pic --with-nonpic --with-libversion=xxx"
exit 0
;;
@ -268,7 +269,7 @@ parse_options $1
shift
done
ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS LDFLAGS HAVE_LANG_C DEBUGGER HAVE_LIB_DL DL_LIBS LIL_ENDIAN BIG_ENDIAN BYTEORDER HAVE_LIB_EWF HAVE_EWF HAVE_LIB_GMP HAVE_GMP HAVE_LIB_MAGIC HAVE_MAGIC HAVE_LIB_SSL HAVE_OPENSSL HAVE_LIB_LUA5_1 HAVE_LIB_TCC USERCC USEROSTYPE WITHPIC WITHNONPIC LIBVERSION"
ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS LDFLAGS HAVE_LANG_C DEBUGGER HAVE_LIB_DL DL_LIBS LIL_ENDIAN BIG_ENDIAN BYTEORDER HAVE_LIB_EWF HAVE_EWF HAVE_LIB_GMP HAVE_GMP HAVE_LIB_MAGIC HAVE_MAGIC SSL_CFLAGS SSL_LDFLAGS HAVE_PKGCFG_OPENSSL HAVE_OPENSSL HAVE_LIB_LUA5_1 HAVE_LIB_TCC USERCC USEROSTYPE WITHPIC WITHNONPIC LIBVERSION"
create_environ
@ -359,9 +360,17 @@ HAVE_LIB_GMP="0"; fi
check_library HAVE_LIB_MAGIC magic 0
if [ "$HAVE_MAGIC" = "0" ]; then
HAVE_LIB_MAGIC="0"; fi
check_library HAVE_LIB_SSL ssl 0
if [ "$HAVE_OPENSSL" = "0" ]; then
HAVE_LIB_SSL="0"; fi
printf 'checking pkg-config flags for openssl... '
tmp=`pkg-config --cflags openssl 2>/dev/null`
if [ $? = 1 ]; then echo no ; HAVE_PKGCFG_OPENSSL=0;
else
SSL_CFLAGS=$tmp;
tmp=`pkg-config --libs openssl 2>/dev/null`
if [ ! $? = 1 ]; then
echo yes; HAVE_PKGCFG_OPENSSL=1;
SSL_LDFLAGS=$tmp; fi; fi
if [ "$SSL_LDFLAGS" = "0" ]; then
HAVE_OPENSSL="0"; fi
check_library HAVE_LIB_LUA5_1 lua5.1 0
check_library HAVE_LIB_TCC tcc 0
if [ "$USEROSTYPE" = "auto" ]; then
@ -435,7 +444,7 @@ done
do_remove
echo
echo "Final report:"
for A in PREFIX HAVE_LIB_EWF HAVE_LIB_GMP HAVE_LIB_SSL HAVE_LIB_TCC HAVE_LIB_MAGIC DEBUGGER USERCC USEROSTYPE VERSION LIBVERSION ; do # REPORT
for A in PREFIX HAVE_LIB_EWF HAVE_LIB_GMP HAVE_OPENSSL HAVE_LIB_TCC HAVE_LIB_MAGIC DEBUGGER USERCC USEROSTYPE VERSION LIBVERSION ; do # REPORT
eval VAL="\$${A}"
[ -z "${VAL}" ] && VAL="(null)"
echo " - ${A} = ${VAL}"

6
configure.acr
View File

@ -22,9 +22,9 @@ CHKLIB magic
ARG_WITHOUT HAVE_MAGIC magic disable magic dependency ;
IFNOT HAVE_MAGIC { HAVE_LIB_MAGIC = 0 ; }
CHKLIB ssl
PKGCFG SSL_CFLAGS SSL_LDFLAGS openssl
ARG_WITHOUT HAVE_OPENSSL ssl disable openssl dependency ;
IFNOT HAVE_OPENSSL { HAVE_LIB_SSL = 0 ; }
IFNOT SSL_LDFLAGS { HAVE_OPENSSL = 0 ; }
CHKLIB lua5.1
CHKLIB tcc
@ -70,7 +70,7 @@ IFEQ LIBVERSION xxx ; {
LIBVERSION = $VERSION ;
}
REPORT PREFIX HAVE_LIB_EWF HAVE_LIB_GMP HAVE_LIB_SSL HAVE_LIB_TCC
REPORT PREFIX HAVE_LIB_EWF HAVE_LIB_GMP HAVE_OPENSSL HAVE_LIB_TCC
HAVE_LIB_MAGIC DEBUGGER USERCC USEROSTYPE VERSION LIBVERSION ;
(( deprecated:

3
libr/debug/t/Makefile
View File

@ -5,7 +5,8 @@ BIN=main
BINDEPS=r_lib r_debug r_bp r_io r_reg r_cons r_util r_anal r_socket r_syscall r_diff
LIBS+=${DL_LIBS}
ifeq (${HAVE_LIB_SSL},1)
LIBS+=-lssl -lcrypto
CFLAGS+=${SSL_CFLAGS}
LIBS+=${SSL_LDFLAGS}
endif
include ../../rules.mk

3
libr/hash/t/Makefile
View File

@ -4,7 +4,8 @@ include ../../config.mk
BINDEPS=r_io r_hash r_util r_socket
LIBS=-lm
ifeq (${HAVE_LIB_SSL},1)
LDFLAGS+=-lssl -lcrypto
CFLAGS+=${SSL_CFLAGS}
LDFLAGS+=${SSL_LDFLAGS}
endif
all: hello${EXT_EXE}

2
libr/include/r_userconf.h.acr
View File

@ -14,7 +14,7 @@
#define R2_VERSION "@VERSION@"
#define HAVE_LIB_MAGIC @HAVE_LIB_MAGIC@
#define HAVE_LIB_SSL @HAVE_LIB_SSL@
#define HAVE_LIB_SSL @HAVE_OPENSSL@
#define CPU_ENDIAN @BIG_ENDIAN@

3
libr/io/p/debug.mk
View File

@ -18,7 +18,8 @@ LINKFLAGS+=-L../../util -lr_util
LINKFLAGS+=-L.. -L../../lib -lr_lib -lr_io
endif
ifeq (${HAVE_LIB_SSL},1)
LINKFLAGS+=-lssl -lcrypto
CFLAGS+=${SSL_CFLAGS}
LINKFLAGS+=${SSL_LDFLAGS}
endif
${TARGET_IODBG}: ${OBJ_IODBG}

3
libr/io/p/gdb.mk
View File

@ -32,7 +32,8 @@ LINKFLAGS+=-L../../util -lr_util
LINKFLAGS+=-L.. -L../../lib -lr_lib -lr_io
endif
ifeq (${HAVE_LIB_SSL},1)
LINKFLAGS+=-lssl -lcrypto
CFLAGS+=${SSL_CFLAGS}
LINKFLAGS+=${SSL_LDFLAGS}
endif
# TODO : link against gdbwrapper

4
libr/io/p/haret.mk
View File

@ -16,9 +16,9 @@ LINKFLAGS+=-L../../util -lr_util
LINKFLAGS+=-L.. -L../../lib -lr_lib -lr_io
endif
ifeq (${HAVE_LIB_SSL},1)
LINKFLAGS+=-lssl -lcrypto
CFLAGS+=${SSL_CFLAGS}
LINKFLAGS+=${SSL_LDFLAGS}
endif
${TARGET_HARET}: ${OBJ_HARET}
${CC} -shared ${CFLAGS} -o ${TARGET_HARET} ${OBJ_HARET} ${LINKFLAGS}

3
libr/io/t/Makefile
View File

@ -11,7 +11,8 @@ LDPATH+=../../socket/libr_socket.a
LDPATH+=../../lib/libr_lib.a
endif
ifeq (${HAVE_LIB_SSL},1)
LDPATH+=-lssl -lcrypto
CFLAGS+=${SSL_CFLAGS}
LDPATH+=${SSL_LDFLAGS}
endif
all: map${EXT_EXE} cat${EXT_EXE} read4${EXT_EXE}

3
libr/socket/Makefile
View File

@ -4,7 +4,8 @@ NAME=r_socket
#DEPS=r_util
OBJ=socket.o proc.o http.o
ifeq (${HAVE_LIB_SSL},1)
LDFLAGS+=-lssl -lcrypto
CFLAGS+=${SSL_CFLAGS}
LDFLAGS+=${SSL_LDFLAGS}
endif
# on solaris only

3
libr/socket/t/Makefile
View File

@ -5,7 +5,8 @@ BIN=serverssl
BINDEPS=r_socket
ifeq (${HAVE_LIB_SSL},1)
LDFLAGS+=-lssl -lcrypto
CFLAGS+=${SSL_CFLAGS}
LDFLAGS+=${SSL_LDFLAGS}
endif
include ../../rules.mk