Initial work towards building for UEFI ##build

Author: trufae

Makefile

@@ -14,7 +14,7 @@ else
 BUILDSEC=$(shell date "+__%H:%M:%S")
 endif
 DATADIRS=libr/cons/d libr/flag/d libr/bin/d libr/asm/d libr/syscall/d libr/magic/d libr/anal/d libr/util/d libr/arch/d
-USE_ZIP=YES
+ZIPWINDIST=YES
 ZIP=zip
 
 R2VC=$(shell git rev-list --all --count 2>/dev/null)
@@ -179,7 +179,7 @@ windist:
 	@cp -f doc/hud "${WINDIST}/share/radare2/${VERSION}/hud/main"
 	@mv "${WINDIST}" "radare2-${WINBITS}-${VERSION}"
 	@rm -f "radare2-${WINBITS}-${VERSION}.zip"
-ifneq ($(USE_ZIP),NO)
+ifneq ($(ZIPWINDIST),NO)
 	$(ZIP) -r "${ZIPNAME}" "radare2-${WINBITS}-${VERSION}"
 endif
 

configure

@@ -39,6 +39,7 @@ WITH_CAPSTONE=0
 WITHOUT_SYSCAPSTONE=1
 WITH_SQSH=1
 WITH_SYSLZ4=0
+WANT_ZIP=1
 USE_ZIP=0
 USE_XXHASH=0
 WITH_GPL=1
@@ -232,6 +233,7 @@ Optional Features:
   --without-syscapstone  avoid the system-wide capstone
   --without-sqsh         ensure squashfs support is not included, even if library is found
   --with-syslz4          force to use system's liblz4
+  --without-zip          build without the ZIP/ZLIB support
   --with-syszip          force to use system's libzip and zlib
   --with-sysxxhash       force to use system's xxhash
   --without-gpl          do not build GPL code (grub, cxx, ... )
@@ -323,7 +325,7 @@ echo "LANGS:       c"
 echo "REQUIRED:    libdl"
 echo "OPTIONAL:    libatomic libmagic libz libzip libxxhash libssl liblibuv>=1.0.0"
 echo "PKGCONFIG:   capstone libsqsh liblz4 openssl libuv"
-echo "FLAGS:       --disable-debugger --with-libatomic --with-sysmagic --disable-threads --disable-loadlibs --enable-threadsafety --without-qjs --without-dylink --without-fork --without-ptrace-wrap --without-gperf --without-capstone --with-libr --with-static-themes --with-capstone-next --with-capstone5 --with-capstone4 --with-syscapstone --without-syscapstone --without-sqsh --with-syslz4 --with-syszip --with-sysxxhash --without-gpl --with-ssl --with-ssl-crypto --with-libuv --with-v35 --with-new-abi --with-rpath --with-compiler=gcc --with-ostype=auto --with-libversion=xxx --without-jemalloc --with-checks-level=2 --disable-debug-stuff"
+echo "FLAGS:       --disable-debugger --with-libatomic --with-sysmagic --disable-threads --disable-loadlibs --enable-threadsafety --without-qjs --without-dylink --without-fork --without-ptrace-wrap --without-gperf --without-capstone --with-libr --with-static-themes --with-capstone-next --with-capstone5 --with-capstone4 --with-syscapstone --without-syscapstone --without-sqsh --with-syslz4 --without-zip --with-syszip --with-sysxxhash --without-gpl --with-ssl --with-ssl-crypto --with-libuv --with-v35 --with-new-abi --with-rpath --with-compiler=gcc --with-ostype=auto --with-libversion=xxx --without-jemalloc --with-checks-level=2 --disable-debug-stuff"
 	exit 0
 	;;
 --cache-file)
@@ -396,6 +398,7 @@ echo "FLAGS:       --disable-debugger --with-libatomic --with-sysmagic --disable
 "--without-syscapstone") WITHOUT_SYSCAPSTONE="0"; ;;
 "--without-sqsh") WITH_SQSH="0"; ;;
 "--with-syslz4") WITH_SYSLZ4="1"; ;;
+"--without-zip") WANT_ZIP="0"; ;;
 "--with-syszip") USE_ZIP="1"; ;;
 "--with-sysxxhash") USE_XXHASH="1"; ;;
 "--without-gpl") WITH_GPL="0"; ;;
@@ -428,7 +431,7 @@ parse_options "$1"
 shift
 done
 
-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 CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C DEBUGGER HAVE_LIB_DL DL_LIBS PKGCONFIG R2_BUILDSYSTEM HAVE_PATCH PATCH HAVE_AR AR HAVE_GIT GIT HAVE_GPERF GPERF HAVE_LIB_ATOMIC HAVE_LIB_MAGIC HAVE_LINUX_CAN_H USE_LIB_ATOMIC LIBATOMIC USE_MAGIC USE_LIB_MAGIC LIBMAGIC WANT_THREADS LOADLIBS R_CRITICAL_ENABLED WANT_QJS WANT_DYLINK HAVE_FORK WANT_PTRACE_WRAP WANT_GPERF WANT_CAPSTONE WITH_LIBR WITH_STATIC_THEMES USE_CSNEXT USE_CS5 USE_CS4 WITH_CAPSTONE WITHOUT_SYSCAPSTONE CAPSTONE_CFLAGS CAPSTONE_LDFLAGS HAVE_PKGCFG_CAPSTONE USE_CAPSTONE SQSH_CFLAGS SQSH_LDFLAGS HAVE_PKGCFG_LIBSQSH WITH_SQSH USE_SQSH LZ4_CFLAGS LZ4_LDFLAGS HAVE_PKGCFG_LIBLZ4 WITH_SYSLZ4 USE_SYSLZ4 HAVE_LIB_Z HAVE_LIB_ZIP USE_ZIP USE_LIB_ZIP LIBZIP HAVE_LIB_XXHASH USE_XXHASH USE_LIB_XXHASH LIBXXHASH WITH_GPL HAVE_DECL_ADDR_NO_RANDOMIZE HAVE_DECL___GLIBC__ HAVE_ARC4RANDOM_UNIFORM HAVE_EXPLICIT_BZERO HAVE_EXPLICIT_MEMSET HAVE_CLOCK_NANOSLEEP HAVE___ATOMIC_FETCH_ADD_8 HAVE_SIGACTION HAVE_CLOCK_GETTIME FORCE_LIB_ATOMIC CLOCK_LDFLAGS SUPPORT_GNU99 HAVE_LIB_GMP WANT_SSL WANT_SSL_CRYPTO HAVE_OPENSSL SSL_CFLAGS SSL_LDFLAGS HAVE_LIB_SSL HAVE_PKGCFG_OPENSSL WANT_LIBUV HAVE_LIBUV_VERSION_1_0_0 LIBUV_CFLAGS LIBUV_LDFLAGS HAVE_PKGCFG_LIBUV HAVE_LIBUV WANT_V35 USE_NEW_ABI USE_RPATH USERCC USEROSTYPE LIBVERSION HAVE_JEMALLOC HAVE_PTRACE USE_PTRACE_WRAP R_CHECKS_LEVEL WANT_DEBUGSTUFF"
+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 CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C DEBUGGER HAVE_LIB_DL DL_LIBS PKGCONFIG R2_BUILDSYSTEM HAVE_PATCH PATCH HAVE_AR AR HAVE_GIT GIT HAVE_GPERF GPERF HAVE_LIB_ATOMIC HAVE_LIB_MAGIC HAVE_LINUX_CAN_H USE_LIB_ATOMIC LIBATOMIC USE_MAGIC USE_LIB_MAGIC LIBMAGIC WANT_THREADS LOADLIBS R_CRITICAL_ENABLED WANT_QJS WANT_DYLINK HAVE_FORK WANT_PTRACE_WRAP WANT_GPERF WANT_CAPSTONE WITH_LIBR WITH_STATIC_THEMES USE_CSNEXT USE_CS5 USE_CS4 WITH_CAPSTONE WITHOUT_SYSCAPSTONE CAPSTONE_CFLAGS CAPSTONE_LDFLAGS HAVE_PKGCFG_CAPSTONE USE_CAPSTONE SQSH_CFLAGS SQSH_LDFLAGS HAVE_PKGCFG_LIBSQSH WITH_SQSH USE_SQSH LZ4_CFLAGS LZ4_LDFLAGS HAVE_PKGCFG_LIBLZ4 WITH_SYSLZ4 USE_SYSLZ4 WANT_ZIP HAVE_LIB_Z HAVE_LIB_ZIP USE_ZIP USE_LIB_ZIP LIBZIP HAVE_LIB_XXHASH USE_XXHASH USE_LIB_XXHASH LIBXXHASH WITH_GPL HAVE_DECL_ADDR_NO_RANDOMIZE HAVE_DECL___GLIBC__ HAVE_ARC4RANDOM_UNIFORM HAVE_EXPLICIT_BZERO HAVE_EXPLICIT_MEMSET HAVE_CLOCK_NANOSLEEP HAVE___ATOMIC_FETCH_ADD_8 HAVE_SIGACTION HAVE_CLOCK_GETTIME FORCE_LIB_ATOMIC CLOCK_LDFLAGS SUPPORT_GNU99 HAVE_LIB_GMP WANT_SSL WANT_SSL_CRYPTO HAVE_OPENSSL SSL_CFLAGS SSL_LDFLAGS HAVE_LIB_SSL HAVE_PKGCFG_OPENSSL WANT_LIBUV HAVE_LIBUV_VERSION_1_0_0 LIBUV_CFLAGS LIBUV_LDFLAGS HAVE_PKGCFG_LIBUV HAVE_LIBUV WANT_V35 USE_NEW_ABI USE_RPATH USERCC USEROSTYPE LIBVERSION HAVE_JEMALLOC HAVE_PTRACE USE_PTRACE_WRAP R_CHECKS_LEVEL WANT_DEBUGSTUFF"
 
 create_environ
 
@@ -735,6 +738,8 @@ else
 USE_SYSLZ4="0"; fi
 check_library HAVE_LIB_Z z 0
 check_library HAVE_LIB_ZIP zip 0
+if [ "$WANTZIP" = "0" ]; then
+USE_ZIP="0"; fi
 if [ 11 = "$HAVE_LIB_Z$USE_ZIP" ]; then
 
 if [ "$HAVE_LIB_ZIP" = "1" ]; then
@@ -1025,7 +1030,14 @@ for A in ${ENVWORDS} ; do
 	[ "${A}" = VPATH ] && continue
 	[ "${A}" = srcdir ] && continue
 	eval "VAR=\$${A}"
-	VAR="`echo ${VAR} | sed -e 's/\,/\\\,/g'`"
+	case "" in
+	mingw*|cygwin*|msys*)
+		VAR="`echo ${VAR} | sed -e 's/\\/\\\\/g' -e 's/\,/\\\,/g'`"
+		;;
+	*)
+		VAR="`echo ${VAR} | sed -e 's/\,/\\\,/g'`"
+		;;
+	esac
 	[ $COUNT = 10 ] && COUNT=0 && SEDFLAGS="${SEDFLAGS}' -e '"
 	COUNT=$(($COUNT+1))
 	SEDFLAGS="${SEDFLAGS}s,@${A}@,${VAR},g;"

configure.acr

@@ -105,9 +105,13 @@ IFAND WITH_SYSLZ4 HAVE_PKGCFG_LIBLZ4 {
 }
 
 (( ZIP ))
+ARG_WITHOUT WANT_ZIP zip build without the ZIP/ZLIB support ;
 CHKLIB z
 CHKLIB zip
 ARG_WITH USE_ZIP syszip force to use system's libzip and zlib ;
+IFNOT WANTZIP {
+	USE_ZIP = 0 ;
+}
 IFAND HAVE_LIB_Z USE_ZIP {
 	IF HAVE_LIB_ZIP {
 		USE_LIB_ZIP = 1 ;

dist/plugins-cfg/plugins.uefi.cfg

@@ -0,0 +1,271 @@
+STATIC="
+anal.null
+anal.a2f
+arch.any_as
+arch.any_vasm
+arch.arc
+arch.arm
+arch.arm_cs
+arch.arm_gnu
+arch.nds32
+arch.arm_v35
+arch.avr
+arch.bf
+arch.bpf
+arch.bpf_cs
+arch.sbpf_cs
+arch.chip8
+arch.cr16
+arch.cris
+arch.dalvik
+arch.dis
+arch.ebc
+arch.evm
+arch.fslsp
+arch.gb
+arch.stm8
+arch.i4004
+arch.i8080
+arch.null
+arch.or1k
+arch.pickle
+arch.pyc
+arch.wasm
+arch.x86_cs
+arch.x86_nasm
+arch.x86_nz
+bin.any
+bin.uf2
+bin.art
+bin.avr
+bin.bf
+bin.bflt
+bin.bios
+bin.bootimg
+bin.cgc
+bin.coff
+bin.dex
+bin.dis
+bin.dmp64
+bin.dol
+bin.dyldcache
+bin.io
+bin.elf
+bin.elf64
+bin.fs
+bin.hunk
+bin.java
+bin.le
+bin.lua
+bin.mach0
+bin.mach064
+bin.mbn
+bin.mdmp
+bin.mclf
+bin.menuet
+bin.pdp11
+bin.msx
+bin.mz
+bin.ne
+bin.nes
+bin.nin3ds
+bin.ninds
+bin.ningb
+bin.ningba
+bin.nro
+bin.nso
+bin.off
+bin.omf
+bin.p9
+bin.pe
+bin.pe64
+bin.pebble
+bin.pef
+bin.pcap
+bin.prg
+bin.psxexe
+bin.pyc
+bin.qnx
+bin.rel
+bin.s390
+bin.sfc
+bin.smd
+bin.sms
+bin.symbols
+bin.te
+bin.tic
+bin.vsf
+bin.wad
+bin.wasm
+bin.xbe
+bin.xcoff64
+bin.xnu_kernelcache
+bin.xtac
+bin.z64
+bin.zimg
+bin_ldr.ldr_linux
+bin_xtr.xtr_dyldcache
+bin_xtr.xtr_fatmach0
+bin_xtr.xtr_pemixed
+bin_xtr.xtr_sep64
+bin_xtr.xtr_xalz
+bp.null
+bp.arm
+bp.bf
+bp.mips
+bp.s390x
+bp.ppc
+bp.riscv
+bp.x86
+core.agD
+core.a2f
+core.writedwarf
+core.prj
+core.java
+core.sixref
+muta.null
+muta.add
+muta.aes
+muta.aes_cbc
+muta.aes_wrap
+muta.base64
+muta.base91
+muta.bech32
+muta.blowfish
+muta.cps2
+muta.des
+muta.ed25519
+muta.entropy
+muta.punycode
+muta.rc2
+muta.rc4
+muta.rc6
+muta.rol
+muta.ror
+muta.rot
+muta.serpent
+muta.sm4
+muta.xor
+muta.strhash
+muta.sip
+muta.charset_pokemon
+debug.bf
+debug.evm
+debug.rv32ima
+debug.bochs
+debug.esil
+debug.gdb
+debug.io
+debug.native
+debug.null
+debug.qnx
+debug.rap
+debug.winkd
+egg.bind
+egg.reverse
+egg.exec
+egg.nullby
+egg.xor
+esil.null
+esil.dummy
+esil.forth
+fs.ext2
+fs.squashfs
+fs.fat
+fs.fb
+fs.hfs
+fs.hfsplus
+fs.io
+fs.iso9660
+fs.jfs
+fs.minix
+fs.ntfs
+fs.posix
+fs.r2
+fs.reiserfs
+fs.sfs
+fs.tar
+fs.udf
+fs.ufs
+fs.xfs
+fs.zip
+io.ar
+io.cyclic
+io.bfdbg
+io.bochs
+io.debug
+io.default
+io.dsc
+io.fd
+io.gdb
+io.gzip
+io.http
+io.ihex
+io.isotp
+io.pvm
+io.mach
+io.malloc
+io.mmap
+io.null
+io.procpid
+io.ptrace
+io.qnx
+io.r2k
+io.r2pipe
+io.r2web
+io.rap
+io.rbuf
+io.reg
+io.self
+io.serial
+io.socket
+io.sparse
+io.tcpslurp
+io.treebuf
+io.w32
+io.w32dbg
+io.winedbg
+io.sysgdb
+io.uf2
+io.winkd
+io.xalz
+io.xattr
+io.zip
+lang.c
+lang.cpipe
+lang.pipe
+lang.rust
+lang.spp
+lang.v
+lang.vala
+lang.zig
+asm.6502
+asm.msp430
+asm.arm
+asm.8051
+asm.att2intel
+asm.avr
+asm.bpf
+asm.chip8
+asm.cosmac
+asm.dalvik
+asm.evm
+asm.gb
+asm.java
+asm.m68k
+asm.mips
+asm.sparc
+asm.null
+asm.pickle
+asm.ppc
+asm.riscv
+asm.sh
+asm.stm8
+asm.tms320
+asm.tricore
+asm.v850
+asm.wasm
+asm.x86
+asm.z80
+"
+SHARED="io.shm"

dist/uefi/Makefile

@@ -0,0 +1,16 @@
+.PHONY: all configure build
+
+CFLAGS += -DR2_UEFI=1
+export CFLAGS
+
+all: build
+
+configure:
+	 rm -rf ../../build-uefi
+	 cd ../.. && meson setup build-uefi --cross-file dist/uefi/cross-uefi.ini -Duse_zip=false -Dstatic_runtime=true -Duse_sys_zlib=false -Duse_sys_magic=false -Duse_sys_openssl=false -Denable_tests=false -Dplugins= -Duse_fork=false -Duse_dylink=false -Ddebugger=false > /dev/null
+
+build: configure
+	 cd ../.. && meson compile -C build-uefi
+
+clean:
+	 cd ../.. && rm -rf build-uefi