diff --git a/common/shlibs b/common/shlibs index f8d77eb7fef..468fe3a63fe 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3197,28 +3197,28 @@ libkdeconnectinterfaces.so.1 kdeconnect-1.2_1 libkdeconnectcore.so.1 kdeconnect-1.2_1 libkpmcore.so.10 kpmcore-4.2.0_1 libpkcs11-helper.so.1 pkcs11-helper-1.22_1 -libr_core.so radare2-2.2.0_1 -libr_config.so radare2-2.2.0_1 -libr_cons.so radare2-2.2.0_1 -libr_util.so radare2-2.2.0_1 -libr_flag.so radare2-2.2.0_1 -libr_asm.so radare2-2.2.0_1 -libr_bin.so radare2-2.2.0_1 -libr_anal.so radare2-2.2.0_1 -libr_lang.so radare2-2.2.0_1 -libr_debug.so radare2-2.2.0_1 -libr_egg.so radare2-2.2.0_1 -libr_bp.so radare2-2.2.0_1 -libr_search.so radare2-2.2.0_1 -libr_io.so radare2-2.2.0_1 -libr_hash.so radare2-2.2.0_1 -libr_socket.so radare2-2.2.0_1 -libr_parse.so radare2-2.2.0_1 -libr_syscall.so radare2-2.2.0_1 -libr_crypto.so radare2-2.2.0_1 -libr_fs.so radare2-2.2.0_1 -libr_magic.so radare2-2.2.0_1 -libr_reg.so radare2-2.2.0_1 +libr_core.so.5.0.0 radare2-5.0.0_1 +libr_config.so.5.0.0 radare2-5.0.0_1 +libr_cons.so.5.0.0 radare2-5.0.0_1 +libr_util.so.5.0.0 radare2-5.0.0_1 +libr_flag.so.5.0.0 radare2-5.0.0_1 +libr_asm.so.5.0.0 radare2-5.0.0_1 +libr_bin.so.5.0.0 radare2-5.0.0_1 +libr_anal.so.5.0.0 radare2-5.0.0_1 +libr_lang.so.5.0.0 radare2-5.0.0_1 +libr_debug.so.5.0.0 radare2-5.0.0_1 +libr_egg.so.5.0.0 radare2-5.0.0_1 +libr_bp.so.5.0.0 radare2-5.0.0_1 +libr_search.so.5.0.0 radare2-5.0.0_1 +libr_io.so.5.0.0 radare2-5.0.0_1 +libr_hash.so.5.0.0 radare2-5.0.0_1 +libr_socket.so.5.0.0 radare2-5.0.0_1 +libr_parse.so.5.0.0 radare2-5.0.0_1 +libr_syscall.so.5.0.0 radare2-5.0.0_1 +libr_crypto.so.5.0.0 radare2-5.0.0_1 +libr_fs.so.5.0.0 radare2-5.0.0_1 +libr_magic.so.5.0.0 radare2-5.0.0_1 +libr_reg.so.5.0.0 radare2-5.0.0_1 libykpiv.so.1 libykpiv-1.5.0_1 libykcs11.so.1 libykcs11-1.5.0_1 libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1 diff --git a/srcpkgs/radare2/patches/trust-cc.patch b/srcpkgs/radare2/patches/trust-cc.patch deleted file mode 100644 index fc9c3c6e355..00000000000 --- a/srcpkgs/radare2/patches/trust-cc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.orig -+++ configure -@@ -330,10 +330,6 @@ - COMPILER=CC - printf "checking for c compiler... " - HAVE_LANG_C=1 --if [ "${CROSSBUILD}" = 1 ]; then -- (command -v ${HOST}-${CC} >/dev/null 2>&1) -- if [ $? = 0 ]; then CC="${HOST}-${CC}"; fi --fi - echo "int main(int argc, char **argv){return 0;}" > test.c - (exec ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c >/dev/null 2>&1) - if [ $? = 0 ]; then echo ${CC}; else diff --git a/srcpkgs/radare2/patches/try.patch b/srcpkgs/radare2/patches/try.patch new file mode 100644 index 00000000000..32ecdb33973 --- /dev/null +++ b/srcpkgs/radare2/patches/try.patch @@ -0,0 +1,20 @@ +--- shlr/Makefile 2020-12-21 09:39:46.000000000 +0100 ++++ shlr/Makefile 2021-01-04 22:13:43.513442861 +0100 +@@ -122,7 +122,7 @@ + SDB_LIBA=sdb/src/libsdb.a + + $(SDB_HOST): +- $(MAKE) sdb-host HOST_CC=$(HOST_CC) CC=$(HOST_CC) ++ $(MAKE) sdb-host HOST_CC=$(HOST_CC) CC=$(HOST_CC) LD=ld + + $(SDB_LIBA): + $(MAKE) sdb-target +@@ -136,7 +136,7 @@ + @echo ">>>>>>>>" + @echo + $(MAKE) -C sdb clean ; rm -f sdb/src/*.o sdb/src/sdb_version.h +- $(MAKE) -C sdb/src "CC=${HOST_CC}" LDFLAGS='${HOST_LDFLAGS}' CPPFLAGS='' CFLAGS='${HOST_CFLAGS} ${PIC}' bin ++ $(MAKE) -C sdb/src "CC=${HOST_CC}" "LD=ld" LDFLAGS='${HOST_LDFLAGS}' CPPFLAGS='' CFLAGS='${HOST_CFLAGS} ${PIC}' bin + cp -f sdb/src/sdb${BUILD_EXT_EXE} sdb/src/.sdb${BUILD_EXT_EXE} + cp -f sdb/src/sdb${BUILD_EXT_EXE} sdb/sdb$(BUILD_EXT_EXE) + -file sdb/sdb$(BUILD_EXT_EXE) diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template index 3046be71cf5..1f4601b46a2 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -1,10 +1,10 @@ # Template file for 'radare2' # cutter needs to be bumped when radare2 is updated pkgname=radare2 -version=4.5.1 +version=5.0.0 revision=1 -build_style=gnu-configure -configure_args="--with-syscapstone" +build_style=meson +configure_args="-Duse_sys_capstone=true -Denable_tests=false" hostmakedepends="pkg-config" makedepends="capstone-devel" short_desc="Advanced command line debugger and hexadecimal editor" @@ -12,7 +12,7 @@ maintainer="Johannes " license="LGPL-3.0-only" homepage="http://www.radare.org" distfiles="https://github.com/radareorg/radare2/archive/${version}.tar.gz" -checksum=4e85b35987bd2ca5881ad9585970b970fe7374814bd383bd1cd62e961a0c228b +checksum=517dd80ebd0569f31498887338eacb92e8cf054bc4625eef8ffe9ea174c1adae case "$XBPS_TARGET_MACHINE" in mips*) CFLAGS="-Os";;