Remove a bunch of conflicting plugins for the static build

- Will be re-enabled when fixed the visibility of common symbols

libr/Makefile

@@ -40,8 +40,9 @@ libr.${EXT_SO}:
 	rm -rf .libr/tcc # WHY
 	$(CC) $(LDFLAGS) -shared -dynamic -arch arm64 -o libr.${EXT_SO} .libr/*/*.o ../shlr/gdb/lib/libgdbr.a
 
-#libr.${EXT_AR}: $(wildcard */libr_*.${EXT_AR}) $(shell find ../shlr -name '*.${EXT_AR}')
-#libr.${EXT_AR}: $(wildcard */libr_*.${EXT_AR}) $(shell find ../shlr -name '*.${EXT_AR}') ../shlr/libr_shlr.${EXT_AR}
+../shlr/libr_shlr.${EXT_AR}:
+	$(MAKE) -C ../shlr libr_shlr.${EXT_AR}
+
 libr.${EXT_AR}: $(wildcard */libr_*.${EXT_AR}) ../shlr/libr_shlr.${EXT_AR}
 	rm -rf .libr
 	mkdir .libr

libr/socket/run.c

@@ -293,16 +293,19 @@ static int handle_redirection_proc(const char *cmd, bool in, bool out, bool err)
 	int fdm, pid = forkpty (&fdm, NULL, NULL, NULL);
 	if (pid == -1) {
 		close (saved_stdin);
+		close (saved_stdout);
 		return -1;
 	}
 	const char *tn = ttyname (fdm);
 	if (!tn) {
 		close (saved_stdin);
+		close (saved_stdout);
 		return -1;
 	}
 	int fds = open (tn, O_RDWR);
 	if (fds == -1) {
 		close (saved_stdin);
+		close (saved_stdout);
 		return -1;
 	}
 	if (pid == 0) {

plugins.static.cfg

@@ -0,0 +1,225 @@
+# same as default, but removing some plugins to avoid dupped symbols (use diff)
+# this file should be removed as soon as those 2 plugins get built properly
+STATIC="anal.8051
+anal.arc
+anal.arm_cs
+anal.arm_gnu
+anal.avr
+anal.i4004
+anal.bf
+anal.chip8
+anal.cris
+anal.dalvik
+anal.gb
+anal.i8080
+anal.java
+anal.m68k_cs
+anal.malbolge
+anal.mips_cs
+anal.mips_gnu
+anal.nios2
+anal.null
+anal.ppc_gnu
+anal.sh
+anal.sparc_cs
+anal.sparc_gnu
+anal.sysz
+anal.ws
+anal.xap
+anal.x86_cs
+anal.xcore_cs
+anal.z80
+anal.vax
+anal.6502
+anal.snes
+anal.riscv
+anal.pic
+asm.6502
+asm.8051
+asm.arc
+asm.arm_cs
+asm.arm_gnu
+asm.avr
+asm.bf
+asm.chip8
+asm.cris_gnu
+asm.dalvik
+asm.dcpu16
+asm.gb
+asm.hppa_gnu
+asm.i4004
+asm.i8080
+asm.java
+asm.lm32
+asm.tricore
+asm.m68k_cs
+asm.malbolge
+asm.mips_cs
+asm.mips_gnu
+asm.nios2
+asm.ppc_gnu
+asm.propeller
+asm.riscv
+asm.lanai_gnu
+asm.sh
+asm.snes
+asm.sparc_cs
+asm.sparc_gnu
+asm.spc700
+asm.sysz
+asm.ws
+asm.xap
+asm.arm_as
+asm.x86_as
+asm.x86_cs
+asm.x86_nz
+asm.x86_nasm
+asm.xcore_cs
+asm.z80
+asm.lh5801
+asm.vax
+asm.mcs96
+asm.pic
+bin.any
+bin.nro
+bin.nso
+bin.art
+bin.bf
+bin.bflt
+bin.bios
+bin.bootimg
+bin.cgc
+bin.coff
+bin.dex
+bin.dol
+bin.elf
+bin.elf64
+bin.fs
+bin.java
+bin.menuet
+bin.mach0
+bin.mach064
+bin.mbn
+bin.mdmp
+bin.mz
+bin.nes
+bin.nin3ds
+bin.ninds
+bin.ningb
+bin.ningba
+bin.omf
+bin.p9
+bin.pe
+bin.pe64
+bin.pebble
+bin.smd
+bin.sms
+bin.avr
+bin.sfc
+bin.spc700
+bin.te
+bin.vsf
+bin.xbe
+bin.z64
+bin.dyldcache
+bin_xtr.xtr_dyldcache
+bin_xtr.xtr_fatmach0
+bin_ldr.ldr_linux
+bin.zimg
+bin.psxexe
+bp.arm
+bp.bf
+bp.mips
+bp.ppc
+bp.x86
+core.anal
+core.java
+crypto.aes
+crypto.des
+crypto.rc4
+crypto.cps2
+crypto.xor
+crypto.blowfish
+crypto.rc2
+crypto.rot
+crypto.rol
+crypto.ror
+crypto.base64
+crypto.base91
+crypto.aes_cbc
+crypto.punycode
+crypto.rc6
+crypto.serpent
+debug.bf
+debug.io
+debug.esil
+debug.gdb
+debug.qnx
+debug.native
+debug.rap
+debug.windbg
+debug.bochs
+debug.null
+egg.exec
+egg.xor
+fs.io
+fs.r2
+fs.ext2
+fs.fat
+fs.fb
+fs.hfs
+fs.hfsplus
+fs.iso9660
+fs.jfs
+fs.minix
+fs.ntfs
+fs.posix
+fs.reiserfs
+fs.sfs
+fs.tar
+fs.udf
+fs.ufs
+fs.xfs
+io.null
+io.bfdbg
+io.bochs
+io.debug
+io.default
+io.gdb
+io.qnx
+io.r2pipe
+io.gzip
+io.http
+io.tcp
+io.r2web
+io.ihex
+io.mach
+io.malloc
+io.sparse
+io.mmap
+io.procpid
+io.ptrace
+io.rap
+io.self
+io.shm
+io.w32
+io.w32dbg
+io.windbg
+io.zip
+io.r2k
+io.ar
+io.rbuf
+lang.vala
+parse.6502_pseudo
+parse.arm_pseudo
+parse.att2intel
+parse.dalvik_pseudo
+parse.m68k_pseudo
+parse.mips_pseudo
+parse.mreplace
+parse.ppc_pseudo
+parse.sh_pseudo
+parse.avr_pseudo
+parse.x86_pseudo
+parse.z80_pseudo"
+SHARED="io.shm"

sys/static.sh

@@ -19,17 +19,19 @@ if [ $? = 0 ]; then
 	CC="ccache ${CC}"
 	export CC
 fi
-PREFIX=/usr
 if [ -n "$1" ]; then
 	PREFIX="$1"
+else
+	PREFIX=/usr
 fi
-DOBUILD=1
-if [ 1 = "${DOBUILD}" ]; then
+DOCFG=1
+if [ 1 = "${DOCFG}" ]; then
 	# build
 	if [ -f config-user.mk ]; then
 		${MAKE} mrproper > /dev/null 2>&1
 	fi
 	export CFLAGS="-fPIC"
+	cp -f plugins.static.cfg plugins.cfg
 #-D__ANDROID__=1"
 	./configure-plugins || exit 1
 	./configure --prefix="$PREFIX" --with-nonpic --without-pic --disable-loadlibs || exit 1
@@ -42,11 +44,35 @@ for a in ${BINS} ; do
 	cd binr/$a
 	${MAKE} clean
 	#LDFLAGS=-static ${MAKE} -j2
-	${MAKE} -j2 || exit 1
+	${MAKE} -j4 || exit 1
 	${STRIP} $a
 )
 done
 
 rm -rf r2-static
 mkdir r2-static || exit 1
-exec ${MAKE} install DESTDIR="${PWD}/r2-static"
+${MAKE} install DESTDIR="${PWD}/r2-static" || exit 1
+
+# testing installation
+cat > .test.c <<EOF
+#include <r_core.h>
+int main() {
+	RCore *core = r_core_new ();
+	r_core_free (core);
+}
+EOF
+cat .test.c
+if [ -z "${CC}" ]; then
+	CC=gcc
+fi
+${CC} .test.c \
+	-I r2-static/usr/include/libr \
+	r2-static/usr/lib/libr.a
+res=$?
+if [ $? = 0 ]; then
+	echo SUCCESS
+else
+	echo FAILURE
+fi
+
+exit $res