diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9743573..0a16874d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ name: ci env: - R2V: 5.8.2 + R2V: 5.8.4 on: push: diff --git a/configure b/configure index 5c59bd2b..a00b5814 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #!/bin/sh -# This script was automatically generated by ACR v2.0.0 +# This script was automatically generated by ACR v2.1.1 # @author: pancake # @url: http://www.nopcode.org # @repo: git clone https://github.com/radare/acr @@ -83,6 +83,7 @@ HOST="${BUILD}" TARGET="${HOST}" ETCDIR="/etc" SYSCONFDIR="" +DESCRIPTION="" create_environ() { : ${EPREFIX:="${PREFIX}"} @@ -91,6 +92,8 @@ create_environ() { : ${SBINDIR:="${PREFIX}/sbin"} : ${ETCDIR:="${SPREFIX}/etc"} : ${LIBDIR:="${SPREFIX}/lib"} +: ${PKGCFG_LIBDIR:="\${exec_prefix}/lib"} +: ${PKGCFG_INCDIR:="\${prefix}/include"} : ${LIBEXECDIR:="${SPREFIX}/libexec"} : ${INCLUDEDIR:="${SPREFIX}/include"} : ${DATADIR:="${SPREFIX}/share"} @@ -109,12 +112,12 @@ done : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s} : ${INSTALL_MAN:=${INSTALL} -m 444} : ${INSTALL_LIB:=${INSTALL} -m 755 -c} - PKGNAME='r2ghidra' ; VERSION='5.8.2' ; VERSION_MAJOR=5; VERSION_MINOR=8; VERSION_PATCH=2; VERSION_NUMBER=50802; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; + PKGNAME='r2ghidra' ; VERSION='5.8.4' ; VERSION_MAJOR=5; VERSION_MINOR=8; VERSION_PATCH=4; VERSION_NUMBER=50804; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; } show_usage() { cat <." exit 0 @@ -217,10 +220,12 @@ case $flag in -V|-version|--version) show_version ; ;; -r|--r|--report) -echo "PKGNAME: r2ghidra" -echo "VERSION: 5.8.2" -echo "LANGS: c++" -echo "PKG-CONFIG: r_core r_asm r_anal" +echo "PKGNAME: r2ghidra" +echo "VERSION: 5.8.4" +echo "AUTHOR: pancake" +echo "EMAIL: pancake@nopcode.org" +echo "LANGS: c++" +echo "PKGCONFIG: r_core r_asm r_anal" exit 0 ;; --cache-file) @@ -260,10 +265,12 @@ echo "PKG-CONFIG: r_core r_asm r_anal" --localstatedir) LOCALSTATEDIR="$value"; ;; --libdir) - LIBDIR="$value"; ;; + LIBDIR="$value" + PKGCFG_LIBDIR="$value"; ;; --libpath) LDFLAGS="${LDFLAGS} ${LIBPATH}$value"; ;; --includedir) + PKGCFG_INCDIR="$value" INCLUDEDIR="$value"; CFLAGS="${CFLAGS} -I$value"; ;; --infodir) INFODIR="$value"; ;; @@ -287,7 +294,7 @@ parse_options "$1" shift done -ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR ETCDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU VERSION VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_NUMBER PKGNAME VPATH CONTACT CONTACT_NAME CONTACT_MAIL CXX CXXFLAGS LDFLAGS HAVE_LANG_CXX CPP HAVE_GIT GIT PKGCONFIG R2_CFLAGS R2_LDFLAGS HAVE_PKGCFG_R_CORE R2ASM_CFLAGS R2ASM_LDFLAGS HAVE_PKGCFG_R_ASM R2ANAL_CFLAGS R2ANAL_LDFLAGS HAVE_PKGCFG_R_ANAL HAVE_R2 R2 HAVE_BISON BISON HAVE_FLEX FLEX R2_PREFIX R2_USER_PLUGINS R2_LIBR_PLUGINS" +ENVWORDS="MANDIR DESCRIPTION INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR ETCDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU VERSION VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_NUMBER PKGCFG_LIBDIR PKGCFG_INCDIR PKGNAME VPATH CONTACT CONTACT_NAME CONTACT_MAIL CXX CXXFLAGS LDFLAGS HAVE_LANG_CXX CPP HAVE_GIT GIT PKGCONFIG R2_CFLAGS R2_LDFLAGS HAVE_PKGCFG_R_CORE R2ASM_CFLAGS R2ASM_LDFLAGS HAVE_PKGCFG_R_ASM R2ANAL_CFLAGS R2ANAL_LDFLAGS HAVE_PKGCFG_R_ANAL HAVE_R2 R2 HAVE_BISON BISON HAVE_FLEX FLEX R2_PREFIX R2_USER_PLUGINS R2_LIBR_PLUGINS" create_environ @@ -302,8 +309,6 @@ ocho "checking for working directories... ${WODIS}" ocho "using prefix '${PREFIX}'" ACR_RMFILES=" test.c test.cxx a.out a.exe" - - COMPILER=CXX HAVE_LANG_CXX=1 ochof "checking for c++ compiler... " diff --git a/configure.acr b/configure.acr index 2c9d47ab..1ee96a1c 100644 --- a/configure.acr +++ b/configure.acr @@ -1,5 +1,5 @@ PKGNAME r2ghidra -VERSION 5.8.2 +VERSION 5.8.4 CONTACT pancake ; pancake@nopcode.org LANG_CXX! diff --git a/meson.build b/meson.build index 91158888..da683390 100644 --- a/meson.build +++ b/meson.build @@ -3,7 +3,7 @@ project( ['c', 'cpp'], license : 'LGPL3', meson_version : '>=0.50.1', -version : '5.8.2', +version : '5.8.4', default_options : ['c_std=c11', 'cpp_std=c++11'] )