mirror of
https://gitee.com/acl-dev/acl.git
synced 2024-12-14 17:00: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
|
endif
|
||||||
has_io_uring=$(HAS_IO_URING)
|
has_io_uring=$(HAS_IO_URING)
|
||||||
ifeq ($(has_io_uring), yes)
|
ifeq ($(has_io_uring), yes)
|
||||||
SYSLIB += -luring
|
SYSLIB += -luring-ffi
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CFLAGS += -DLINUX2 -D_REENTRANT
|
CFLAGS += -DLINUX2 -D_REENTRANT
|
||||||
|
@ -83,7 +83,7 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
|||||||
endif
|
endif
|
||||||
has_io_uring=$(HAS_IO_URING)
|
has_io_uring=$(HAS_IO_URING)
|
||||||
ifeq ($(has_io_uring), yes)
|
ifeq ($(has_io_uring), yes)
|
||||||
SYSLIB += -luring
|
SYSLIB += -luring-ffi
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CFLAGS += -DLINUX2 -D_REENTRANT
|
CFLAGS += -DLINUX2 -D_REENTRANT
|
||||||
|
@ -76,10 +76,10 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
|||||||
# CFLAGS += -DLINUX2
|
# CFLAGS += -DLINUX2
|
||||||
SYSLIB += -lcrypt -rdynamic -ldl -lrt
|
SYSLIB += -lcrypt -rdynamic -ldl -lrt
|
||||||
ifeq ($(HAS_IO_URING), yes)
|
ifeq ($(HAS_IO_URING), yes)
|
||||||
SYSLIB += -luring
|
SYSLIB += -luring-ffi
|
||||||
endif
|
endif
|
||||||
ifeq ($(has_io_uring), yes)
|
ifeq ($(has_io_uring), yes)
|
||||||
SYSLIB += -luring
|
SYSLIB += -luring-ffi
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -72,10 +72,10 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
|||||||
RPATH = linux64
|
RPATH = linux64
|
||||||
endif
|
endif
|
||||||
ifeq ($(HAS_IO_URING), yes)
|
ifeq ($(HAS_IO_URING), yes)
|
||||||
SYSLIB += -luring
|
SYSLIB += -luring-ffi
|
||||||
endif
|
endif
|
||||||
ifeq ($(has_io_uring), yes)
|
ifeq ($(has_io_uring), yes)
|
||||||
SYSLIB += -luring
|
SYSLIB += -luring-ffi
|
||||||
endif
|
endif
|
||||||
# CFLAGS += -DLINUX2 -D_REENTRANT
|
# CFLAGS += -DLINUX2 -D_REENTRANT
|
||||||
CFLAGS += -D_REENTRANT
|
CFLAGS += -D_REENTRANT
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
include ../Makefile.in
|
include ../Makefile.in
|
||||||
ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
||||||
SYSLIB += -luring
|
SYSLIB += -luring-ffi
|
||||||
endif
|
endif
|
||||||
PROG = client
|
PROG = client
|
||||||
|
@ -60,10 +60,10 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
|||||||
RPATH = linux64
|
RPATH = linux64
|
||||||
endif
|
endif
|
||||||
ifeq ($(HAS_IO_URING), yes)
|
ifeq ($(HAS_IO_URING), yes)
|
||||||
SYSLIB += -luring
|
SYSLIB += -luring-ffi
|
||||||
endif
|
endif
|
||||||
ifeq ($(has_io_uring), yes)
|
ifeq ($(has_io_uring), yes)
|
||||||
SYSLIB += -luring
|
SYSLIB += -luring-ffi
|
||||||
endif
|
endif
|
||||||
# CFLAGS += -DLINUX2 -D_REENTRANT
|
# CFLAGS += -DLINUX2 -D_REENTRANT
|
||||||
CFLAGS += -D_REENTRANT
|
CFLAGS += -D_REENTRANT
|
||||||
|
@ -72,10 +72,10 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
|||||||
RPATH = linux64
|
RPATH = linux64
|
||||||
endif
|
endif
|
||||||
ifeq ($(HAS_IO_URING), yes)
|
ifeq ($(HAS_IO_URING), yes)
|
||||||
SYSLIB += -luring
|
SYSLIB += -luring-ffi
|
||||||
endif
|
endif
|
||||||
ifeq ($(has_io_uring), yes)
|
ifeq ($(has_io_uring), yes)
|
||||||
SYSLIB += -luring
|
SYSLIB += -luring-ffi
|
||||||
endif
|
endif
|
||||||
# CFLAGS += -DLINUX2 -D_REENTRANT
|
# CFLAGS += -DLINUX2 -D_REENTRANT
|
||||||
CFLAGS += -D_REENTRANT
|
CFLAGS += -D_REENTRANT
|
||||||
|
@ -72,10 +72,10 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
|||||||
RPATH = linux64
|
RPATH = linux64
|
||||||
endif
|
endif
|
||||||
ifeq ($(HAS_IO_URING), yes)
|
ifeq ($(HAS_IO_URING), yes)
|
||||||
SYSLIB += -luring
|
SYSLIB += -luring-ffi
|
||||||
endif
|
endif
|
||||||
ifeq ($(has_io_uring), yes)
|
ifeq ($(has_io_uring), yes)
|
||||||
SYSLIB += -luring
|
SYSLIB += -luring-ffi
|
||||||
endif
|
endif
|
||||||
# CFLAGS += -DLINUX2 -D_REENTRANT
|
# CFLAGS += -DLINUX2 -D_REENTRANT
|
||||||
CFLAGS += -D_REENTRANT
|
CFLAGS += -D_REENTRANT
|
||||||
|
@ -73,10 +73,10 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
|
|||||||
RPATH = linux64
|
RPATH = linux64
|
||||||
endif
|
endif
|
||||||
ifeq ($(HAS_IO_URING), yes)
|
ifeq ($(HAS_IO_URING), yes)
|
||||||
SYSLIB += -luring
|
SYSLIB += -luring-ffi
|
||||||
endif
|
endif
|
||||||
ifeq ($(has_io_uring), yes)
|
ifeq ($(has_io_uring), yes)
|
||||||
SYSLIB += -luring
|
SYSLIB += -luring-ffi
|
||||||
endif
|
endif
|
||||||
# CFLAGS += -DLINUX2 -D_REENTRANT
|
# CFLAGS += -DLINUX2 -D_REENTRANT
|
||||||
CFLAGS += -D_REENTRANT
|
CFLAGS += -D_REENTRANT
|
||||||
|
Loading…
Reference in New Issue
Block a user