mirror of
https://gitee.com/acl-dev/acl.git
synced 2024-12-15 09:20:52 +08:00
Merge branch 'gitee-master' into gitlab-upstream
This commit is contained in:
commit
9a738ded6f
@ -83,7 +83,7 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
||||
endif
|
||||
has_io_uring=$(HAS_IO_URING)
|
||||
ifeq ($(has_io_uring), yes)
|
||||
SYSLIB += -luring
|
||||
SYSLIB += -luring-ffi
|
||||
endif
|
||||
|
||||
CFLAGS += -DLINUX2 -D_REENTRANT
|
||||
|
@ -83,7 +83,7 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
||||
endif
|
||||
has_io_uring=$(HAS_IO_URING)
|
||||
ifeq ($(has_io_uring), yes)
|
||||
SYSLIB += -luring
|
||||
SYSLIB += -luring-ffi
|
||||
endif
|
||||
|
||||
CFLAGS += -DLINUX2 -D_REENTRANT
|
||||
|
@ -76,10 +76,10 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
||||
# CFLAGS += -DLINUX2
|
||||
SYSLIB += -lcrypt -rdynamic -ldl -lrt
|
||||
ifeq ($(HAS_IO_URING), yes)
|
||||
SYSLIB += -luring
|
||||
SYSLIB += -luring-ffi
|
||||
endif
|
||||
ifeq ($(has_io_uring), yes)
|
||||
SYSLIB += -luring
|
||||
SYSLIB += -luring-ffi
|
||||
endif
|
||||
endif
|
||||
|
||||
|
@ -72,10 +72,10 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
||||
RPATH = linux64
|
||||
endif
|
||||
ifeq ($(HAS_IO_URING), yes)
|
||||
SYSLIB += -luring
|
||||
SYSLIB += -luring-ffi
|
||||
endif
|
||||
ifeq ($(has_io_uring), yes)
|
||||
SYSLIB += -luring
|
||||
SYSLIB += -luring-ffi
|
||||
endif
|
||||
# CFLAGS += -DLINUX2 -D_REENTRANT
|
||||
CFLAGS += -D_REENTRANT
|
||||
|
@ -1,5 +1,5 @@
|
||||
include ../Makefile.in
|
||||
ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
||||
SYSLIB += -luring
|
||||
SYSLIB += -luring-ffi
|
||||
endif
|
||||
PROG = client
|
||||
|
@ -60,10 +60,10 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
||||
RPATH = linux64
|
||||
endif
|
||||
ifeq ($(HAS_IO_URING), yes)
|
||||
SYSLIB += -luring
|
||||
SYSLIB += -luring-ffi
|
||||
endif
|
||||
ifeq ($(has_io_uring), yes)
|
||||
SYSLIB += -luring
|
||||
SYSLIB += -luring-ffi
|
||||
endif
|
||||
# CFLAGS += -DLINUX2 -D_REENTRANT
|
||||
CFLAGS += -D_REENTRANT
|
||||
|
@ -72,10 +72,10 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
||||
RPATH = linux64
|
||||
endif
|
||||
ifeq ($(HAS_IO_URING), yes)
|
||||
SYSLIB += -luring
|
||||
SYSLIB += -luring-ffi
|
||||
endif
|
||||
ifeq ($(has_io_uring), yes)
|
||||
SYSLIB += -luring
|
||||
SYSLIB += -luring-ffi
|
||||
endif
|
||||
# CFLAGS += -DLINUX2 -D_REENTRANT
|
||||
CFLAGS += -D_REENTRANT
|
||||
|
@ -72,10 +72,10 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
||||
RPATH = linux64
|
||||
endif
|
||||
ifeq ($(HAS_IO_URING), yes)
|
||||
SYSLIB += -luring
|
||||
SYSLIB += -luring-ffi
|
||||
endif
|
||||
ifeq ($(has_io_uring), yes)
|
||||
SYSLIB += -luring
|
||||
SYSLIB += -luring-ffi
|
||||
endif
|
||||
# CFLAGS += -DLINUX2 -D_REENTRANT
|
||||
CFLAGS += -D_REENTRANT
|
||||
|
@ -73,10 +73,10 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
||||
RPATH = linux64
|
||||
endif
|
||||
ifeq ($(HAS_IO_URING), yes)
|
||||
SYSLIB += -luring
|
||||
SYSLIB += -luring-ffi
|
||||
endif
|
||||
ifeq ($(has_io_uring), yes)
|
||||
SYSLIB += -luring
|
||||
SYSLIB += -luring-ffi
|
||||
endif
|
||||
# CFLAGS += -DLINUX2 -D_REENTRANT
|
||||
CFLAGS += -D_REENTRANT
|
||||
|
Loading…
Reference in New Issue
Block a user