portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove Mingw and Cygwin from ACR build

Browse source
This commit is contained in:
Anton Kochkov 2021-01-08 17:25:19 +08:00 committed by Anton Kochkov
parent 236d108ac9
commit fb7d7df1ec
23 changed files with 7 additions and 370 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
configure vendored
View file

@ -702,15 +702,6 @@ HAVE_LIBUV="0"; fi
else
HAVE_LIBUV="0"; fi
if [ "$USEROSTYPE" = "auto" ]; then
if [ "$HOST_OS" = "mingw32_nt-6.2" ]; then
USEROSTYPE="mingw32"
else
if [ "$HOST_OS" = "mingw32_nt" ]; then
USEROSTYPE="mingw32"
else
if [ "$HOST_OS" = "wsl" ]; then
USEROSTYPE="wsl"
else
if [ "$HOST_OS" = "linux" ]; then
USEROSTYPE="gnulinux"
else
@ -738,7 +729,7 @@ if [ "$HOST_OS" = "darwin" ]; then
USEROSTYPE="darwin"
else
if [ "$HOST_OS" = "haiku" ]; then
USEROSTYPE="haiku"; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi
USEROSTYPE="haiku"; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi;
if [ "$LIBVERSION" = "xxx" ]; then
LIBVERSION="$VERSION"; fi
if [ "$USEROSTYPE" = "gnulinux" ]; then
@ -757,10 +748,6 @@ if [ "$USEROSTYPE" = "android" ]; then
HAVE_PTRACE="1"
USE_PTRACE_WRAP="1"
else
if [ "$USEROSTYPE" = "mingw32" ]; then
HAVE_PTRACE="0"
USE_PTRACE_WRAP="0"
else
if [ "$USEROSTYPE" = "solaris" ]; then
HAVE_PTRACE="0"
USE_PTRACE_WRAP="0"
@ -770,7 +757,7 @@ HAVE_PTRACE="0"
USE_PTRACE_WRAP="0"
else
HAVE_PTRACE="1"
USE_PTRACE_WRAP="0"; fi; fi; fi; fi; fi; fi
USE_PTRACE_WRAP="0"; fi; fi; fi; fi; fi
if [ "$DEBUGGER" = "0" ]; then
HAVE_PTRACE="0"; fi
if [ "$WANT_PTRACE_WRAP" = "0" ]; then

14
configure.acr
View file

@ -163,12 +163,6 @@ ARG_WITH USEROSTYPE=auto ostype Choose OS type ( gnulinux windows darwin haiku )
(( TODO: throw error if unknown ostype ))
(( TODO: handle BSD os as different ostype? ))
IFEQ USEROSTYPE auto ; {
IFEQ HOST_OS mingw32_nt-6.2 ; {
USEROSTYPE = mingw32 ;
}{
IFEQ HOST_OS mingw32_nt ; {
USEROSTYPE = mingw32 ;
}{
IFEQ HOST_OS wsl ; {
USEROSTYPE = wsl ;
}{
@ -201,7 +195,7 @@ IFEQ USEROSTYPE auto ; {
}{
IFEQ HOST_OS haiku ; {
USEROSTYPE = haiku ;
} } } } } } } } } } } }
} } } } } } } } } }
}
(( this hack is required for openbsd ports ))
@ -228,10 +222,6 @@ IFEQ USEROSTYPE android ; {
HAVE_PTRACE = 1 ;
USE_PTRACE_WRAP = 1 ;
}{
IFEQ USEROSTYPE mingw32 ; {
HAVE_PTRACE = 0 ;
USE_PTRACE_WRAP = 0 ;
}{
IFEQ USEROSTYPE solaris ; {
HAVE_PTRACE = 0 ;
USE_PTRACE_WRAP = 0 ;
@ -242,7 +232,7 @@ IFEQ USEROSTYPE haiku ; {
}{
HAVE_PTRACE = 1 ;
USE_PTRACE_WRAP = 0 ;
} } } } } }
} } } } }
IFNOT DEBUGGER {
HAVE_PTRACE = 0 ;

1
doc/gprobe.md
View file

@ -29,7 +29,6 @@ TODOs
What is tested?
---------------
- building with sys/user.sh and sys/mingw32.sh on linux
- running rizin on Linux and Windows
- communication via FTDI USB serial adaptor
- communication via DDC2Bi3

2
librz/config.mk.tail
View file

@ -41,9 +41,7 @@ endif
# CC CFLAGS CC_LIB CC_AR LINK
# Debug
ifneq ($(OSTYPE),mingw32)
CFLAGS+=-g
endif
CFLAGS+=-Wall
# libgmp

2
librz/io/p/rzk.mk
View file

@ -2,7 +2,7 @@ OBJ_RZK = io_rzk.o
ifeq ($(OSTYPE),$(filter $(OSTYPE),gnulinux android))
OBJ_RZK += io_rzk_linux.o
endif
ifeq (${OSTYPE},$(filter $(OSTYPE),windows mingw32 mingw64 cygwin))
ifeq (${OSTYPE},$(filter $(OSTYPE),windows))
OBJ_RZK += io_rzk_windows.o
endif

4
librz/socket/deps.mk
View file

@ -21,12 +21,8 @@ LDFLAGS+=-lwsock32
#LDFLAGS+=-lws2_32
endif
ifneq (,$(findstring mingw32,$(OSTYPE))$(findstring mingw64,$(OSTYPE)))
LDFLAGS+=-lws2_32
else
# no libutil for android
#ifneq (,$(findstring linux,$(OSTYPE))$(findstring android,$(OSTYPE))$(findstring bsd,$(OSTYPE)))
ifneq (,$(findstring linux,$(OSTYPE))$(findstring bsd,$(OSTYPE)))
LDFLAGS+=-lutil
endif
endif

5
librz/util/regex/Makefile
View file

@ -1,11 +1,10 @@
#CC=i386-mingw32-gcc
SRC= regcomp.c regerror.c regexec.c
SRC= regcomp.c regerror.c regexec.c
CFLAGS+=-I. -Wall
CFLAGS+=-I../../include
#CFLAGS+=-Wall
#CFLAGS+=`pkg-config --cflags --libs rz_util`
# implicit engine.c
# implicit engine.c
all:
${CC} ${CFLAGS} test.c ${SRC}

24
mk/i386-mingw32-gcc.mk
View file

@ -1,24 +0,0 @@
ifeq (${_INCLUDE_MK_GCC_},)
_INCLUDE_MK_GCC_=1
CROSS=i386-mingw32-
CC=${CROSS}gcc
RANLIB=${CROSS}ranlib
OSTYPE=windows
ONELIB=0
LINK+=-shared
AR=${CROSS}ar
CC_AR=${AR} -r ${LIBAR}
PARTIALLD=${CROSS}ld -r --whole-archive
PICFLAGS=
CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
CC_LIB=${CC} -shared -o
CFLAGS_INCLUDE=-I
LDFLAGS+=-static-libgcc
LDFLAGS_LINK=-l
LDFLAGS_LINKPATH=-L
CFLAGS_OPT0=-O0
CFLAGS_OPT1=-O1
CFLAGS_OPT2=-O2
CFLAGS_OPT3=-O3
CFLAGS_DEBUG=-g
endif

24
mk/i486-mingw32-gcc.mk
View file

@ -1,24 +0,0 @@
ifeq (${_INCLUDE_MK_GCC_},)
_INCLUDE_MK_GCC_=1
CROSS=i486-mingw32-
CC=${CROSS}gcc
RANLIB=${CROSS}ranlib
OSTYPE=windows
ONELIB=0
LINK=-shared
AR=${CROSS}ar
CC_AR=${AR} -r ${LIBAR}
PARTIALLD=${CROSS}ld -r --whole-archive
PICFLAGS=
CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
CC_LIB=${CC} -shared -o
CFLAGS_INCLUDE=-I
LDFLAGS+=-static-libgcc
LDFLAGS_LINK=-l
LDFLAGS_LINKPATH=-L
CFLAGS_OPT0=-O0
CFLAGS_OPT1=-O1
CFLAGS_OPT2=-O2
CFLAGS_OPT3=-O3
CFLAGS_DEBUG=-g
endif

24
mk/i586-mingw32-gcc.mk
View file

@ -1,24 +0,0 @@
ifeq (${_INCLUDE_MK_GCC_},)
_INCLUDE_MK_GCC_=1
CROSS=i586-mingw32-
CC=${CROSS}gcc
RANLIB=${CROSS}ranlib
ONELIB=0
OSTYPE=windows
LINK=-shared
AR=${CROSS}ar
CC_AR=${AR} -r ${LIBAR}
PARTIALLD=${CROSS}ld -r --whole-archive
PICFLAGS=
CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
CC_LIB=${CC} -shared -o
CFLAGS_INCLUDE=-I
LDFLAGS+=-static-libgcc
LDFLAGS_LINK=-l
LDFLAGS_LINKPATH=-L
CFLAGS_OPT0=-O0
CFLAGS_OPT1=-O1
CFLAGS_OPT2=-O2
CFLAGS_OPT3=-O3
CFLAGS_DEBUG=-g
endif

23
mk/i586-mingw32msvc-gcc.mk
View file

@ -1,23 +0,0 @@
ifeq (${_INCLUDE_MK_GCC_},)
_INCLUDE_MK_GCC_=1
CROSS=i586-mingw32msvc-
CC=${CROSS}gcc
RANLIB=${CROSS}ranlib
OSTYPE=windows
LINK=
AR=${CROSS}ar
CC_AR=${AR} -r ${LIBAR}
PARTIALLD=${CROSS}ld -r --whole-archive
PICFLAGS=
CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
CC_LIB=${CC} -shared -o
CFLAGS_INCLUDE=-I
LDFLAGS+=-static-libgcc
LDFLAGS_LINK=-l
LDFLAGS_LINKPATH=-L
CFLAGS_OPT0=-O0
CFLAGS_OPT1=-O1
CFLAGS_OPT2=-O2
CFLAGS_OPT3=-O3
CFLAGS_DEBUG=-g
endif

23
mk/i686-pc-mingw32-gcc.mk
View file

@ -1,23 +0,0 @@
ifeq (${_INCLUDE_MK_GCC_},)
_INCLUDE_MK_GCC_=1
CROSS=i686-pc-mingw32-
CC=${CROSS}gcc
RANLIB=${CROSS}ranlib
OSTYPE=windows
LINK=
AR=${CROSS}ar
CC_AR=${AR} -r ${LIBAR}
PARTIALLD=${CROSS}ld -r --whole-archive
PICFLAGS=
CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
CC_LIB=${CC} -shared -o
CFLAGS_INCLUDE=-I
LDFLAGS+=-static-libgcc
LDFLAGS_LINK=-l
LDFLAGS_LINKPATH=-L
CFLAGS_OPT0=-O0
CFLAGS_OPT1=-O1
CFLAGS_OPT2=-O2
CFLAGS_OPT3=-O3
CFLAGS_DEBUG=-g
endif

24
mk/i686-unknown-mingw32_nt-6.2-gnu.mk
View file

@ -1,24 +0,0 @@
# AppVeyor
ifeq (${_INCLUDE_MK_GCC_},)
_INCLUDE_MK_GCC_=1
CC=gcc
RANLIB=ranlib
ONELIB=0
OSTYPE=windows
LINK=
AR=ar
CC_AR=${AR} -r ${LIBAR}
PARTIALLD=ld -r --whole-archive
PICFLAGS=
CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
CC_LIB=${CC} -shared -o
CFLAGS_INCLUDE=-I
LDFLAGS+=-static-libgcc
LDFLAGS_LINK=-l
LDFLAGS_LINKPATH=-L
CFLAGS_OPT0=-O0
CFLAGS_OPT1=-O1
CFLAGS_OPT2=-O2
CFLAGS_OPT3=-O3
CFLAGS_DEBUG=-g
endif

24
mk/i686-w64-mingw32-gcc.mk
View file

@ -1,24 +0,0 @@
ifeq (${_INCLUDE_MK_GCC_},)
_INCLUDE_MK_GCC_=1
CROSS=i686-w64-mingw32-
CC=${CROSS}gcc
RANLIB=${CROSS}ranlib
ONELIB=0
OSTYPE=windows
LINK=
AR=${CROSS}ar
CC_AR=${AR} -r ${LIBAR}
PARTIALLD=${CROSS}ld -r --whole-archive
PICFLAGS=
CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
CC_LIB=${CC} -shared -o
CFLAGS_INCLUDE=-I
LDFLAGS+=-static-libgcc
LDFLAGS_LINK=-l
LDFLAGS_LINKPATH=-L
CFLAGS_OPT0=-O0
CFLAGS_OPT1=-O1
CFLAGS_OPT2=-O2
CFLAGS_OPT3=-O3
CFLAGS_DEBUG=-g
endif

24
mk/i686-w64-mingw32.static-gcc.mk
View file

@ -1,24 +0,0 @@
ifeq (${_INCLUDE_MK_GCC_},)
_INCLUDE_MK_GCC_=1
CROSS=i686-w64-mingw32.static-
CC=${CROSS}gcc
RANLIB=${CROSS}ranlib
ONELIB=0
OSTYPE=windows
LINK=
AR=${CROSS}ar
CC_AR=${AR} -r ${LIBAR}
PARTIALLD=${CROSS}ld -r --whole-archive
PICFLAGS=
CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
CC_LIB=${CC} -shared -o
CFLAGS_INCLUDE=-I
LDFLAGS+=-static-libgcc
LDFLAGS_LINK=-l
LDFLAGS_LINKPATH=-L
CFLAGS_OPT0=-O0
CFLAGS_OPT1=-O1
CFLAGS_OPT2=-O2
CFLAGS_OPT3=-O3
CFLAGS_DEBUG=-g
endif

24
mk/mingw32-gcc-5.3.0.mk
View file

@ -1,24 +0,0 @@
ifeq (${_INCLUDE_MK_GCC_},)
_INCLUDE_MK_GCC_=1
CC=mingw32-gcc-5.3.0
RANLIB=mingw32-gcc-ranlib
OSTYPE=windows
ONELIB=0
LINK=-shared
AR=mingw32-gcc-ar
CC_AR=${AR} ${LIBAR}
PARTIALLD=mingw32-gcc-ld -r --whole-archive
PICFLAGS=
#CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
CFLAGS+=${PICFLAGS} -D__WINDOWS__=1
CC_LIB=${CC} -shared -o
CFLAGS_INCLUDE=-I
LDFLAGS+=-static-libgcc
LDFLAGS_LINK=-l
LDFLAGS_LINKPATH=-L
CFLAGS_OPT0=-O0
CFLAGS_OPT1=-O1
CFLAGS_OPT2=-O2
CFLAGS_OPT3=-O3
CFLAGS_DEBUG=-g
endif

25
mk/platform.mk
View file

@ -1,34 +1,9 @@
ifeq ($(OSTYPE),auto)
OSTYPE=$(shell uname | tr 'A-Z' 'a-z')
endif
ifneq (,$(findstring cygwin,${OSTYPE}))
PIC_CFLAGS=
CFLAGS+=-DUNICODE -D_UNICODE
else
ifneq (,$(findstring mingw32,${OSTYPE}))
PIC_CFLAGS=
CFLAGS+=-DUNICODE -D_UNICODE
else
ifneq (,$(findstring mingw64,${OSTYPE}))
PIC_CFLAGS=
CFLAGS+=-DUNICODE -D_UNICODE
else
ifneq (,$(findstring msys,${OSTYPE}))
PIC_CFLAGS=
CFLAGS+=-DUNICODE -D_UNICODE
else
ifneq (,$(findstring windows,${OSTYPE}))
PIC_CFLAGS=
CFLAGS+=-DUNICODE -D_UNICODE
else
ifeq ($(CC),cccl)
PIC_CFLAGS=
CFLAGS+=-DUNICODE -D_UNICODE
else
PIC_CFLAGS=-fPIC
endif
endif
endif
endif
endif
endif

20
mk/x86_64-w64-mingw32-gcc.mk
View file

@ -1,20 +0,0 @@
CROSS=x86_64-w64-mingw32-
CC=${CROSS}gcc
RANLIB=${CROSS}ranlib
ONELIB=0
OSTYPE=windows
LINK=
AR=${CROSS}ar
CC_AR=${AR} -r ${LIBAR}
PARTIALLD=${CROSS}ld -r --whole-archive
PICFLAGS=
CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
CC_LIB=${CC} -shared -o
CFLAGS_INCLUDE=-I
LDFLAGS_LINK=-l
LDFLAGS_LINKPATH=-L
CFLAGS_OPT0=-O0
CFLAGS_OPT1=-O1
CFLAGS_OPT2=-O2
CFLAGS_OPT3=-O3
CFLAGS_DEBUG=-g

20
mk/x86_64-w64-mingw32.static-gcc.mk
View file

@ -1,20 +0,0 @@
PREFIX=/usr/src/mxe/usr/
CROSS=x86_64-w64-mingw32.static-
CC=${CROSS}gcc
RANLIB=${CROSS}ranlib
ONELIB=0
OSTYPE=windows
AR=${CROSS}ar
CC_AR=${AR} -r ${LIBAR}
PARTIALLD=${CROSS}ld -r --whole-archive
PICFLAGS=
CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
CC_LIB=${CC} -shared -o
CFLAGS_INCLUDE=-I
LDFLAGS_LINK=-l
LDFLAGS_LINKPATH=-L
CFLAGS_OPT0=-O0
CFLAGS_OPT1=-O1
CFLAGS_OPT2=-O2
CFLAGS_OPT3=-O3
CFLAGS_DEBUG=-g

18
shlr/ar/Makefile
View file

@ -5,26 +5,8 @@ include ../../mk/${COMPILER}.mk
CFLAGS+=${PIC_CFLAGS}
ifneq (,$(findstring cygwin,${OSTYPE}))
CFLAGS+=-D__CYGWIN__=1
EXT_SO=dll
SOVER=${EXT_SO}
LDFLAGS+=-shared
LDFLAGS_SHARED?=-shared
else
ifneq (,$(findstring mingw32,${OSTYPE}))
CFLAGS+=-DMINGW32=1
EXT_SO=dll
SOVER=${EXT_SO}
LDFLAGS+=-shared
LDFLAGS_SHARED?=-shared
else
ifneq (,$(findstring mingw64,${OSTYPE})$(findstring msys,${OSTYPE}))
LDFLAGS+=-shared
LFDLAGS_SHARE?=-shared
endif
endif
endif
CFLAGS+=-I../../librz/include
LIBAR=librz_ar.${EXT_AR}

3
shlr/java/Makefile
View file

@ -23,9 +23,6 @@ all:
endif
CFLAGS+=${PIC_CFLAGS}
ifneq (,$(findstring mingw32,${OSTYPE}))
CFLAGS+=-DMINGW32=1
endif
CFLAGS+=-g
CFLAGS+=-I../../librz/include

16
shlr/zip/zip/Makefile
View file

@ -3,23 +3,7 @@ include ../../../librz/config.mk
include ../../../mk/platform.mk
include ../../../mk/${COMPILER}.mk
ifneq (,$(findstring cygwin,${OSTYPE}))
CFLAGS+=-D__CYGWIN__=1
EXT_SO=dll
SOVER=${EXT_SO}
LDFLAGS+=-shared
LDFLAGS_SHARED?=-shared
else
ifneq (,$(findstring mingw,${OSTYPE})$(findstring msys,${OSTYPE}))
CFLAGS+=-DMINGW32=1
EXT_SO=dll
SOVER=${EXT_SO}
LDFLAGS+=-shared
LDFLAGS_SHARED?=-shared
else
CFLAGS+=-fPIC
endif
endif
ifeq (${OSTYPE},windows)
EXT_SO=dll
CFLAGS+=-D_WIN32=1

16
shlr/zip/zlib/Makefile
View file

@ -5,23 +5,7 @@ include ../../../mk/${COMPILER}.mk
CFLAGS+=${PIC_CFLAGS}
ifneq (,$(findstring cygwin,${OSTYPE}))
CFLAGS+=-D__CYGWIN__=1
EXT_SO=dll
SOVER=${EXT_SO}
LDFLAGS+=-shared
LDFLAGS_SHARED=-shared
else
ifneq (,$(findstring mingw32,${OSTYPE}))
CFLAGS+=-DMINGW32=1
EXT_SO=dll
SOVER=${EXT_SO}
LDFLAGS+=-shared
LDFLAGS_SHARED?=-shared
else
LDFLAGS_SHARED=-shared
endif
endif
ifeq (${OSTYPE},windows)
EXT_SO=dll
SOVER=${EXT_SO}