Skip to content

Commit

Permalink
fix:1.8.3, 修复example中由于没有-ldl导致个别环境链接错误问题
Browse files Browse the repository at this point in the history
  • Loading branch information
@hevake
hevake committed Mar 23, 2024
1 parent 5475d1e commit 4a652bf
Show file tree
Hide file tree
Showing 55 changed files with 55 additions and 19 deletions.
1 change: 1 addition & 0 deletions examples/alarm/cron_alarm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_alarm \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/alarm/oneshot_alarm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_alarm \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/alarm/weekly_alarm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_alarm \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
2 changes: 1 addition & 1 deletion examples/base/assert/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ EXE_NAME := assert
CPP_SRC_FILES := main.cpp

CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS)
LDFLAGS += -ltbox_base
LDFLAGS += -ltbox_base -ldl

include ${TOP_DIR}/tools/exe_common.mk
2 changes: 1 addition & 1 deletion examples/base/object_pool/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ EXE_NAME := object_pool
CPP_SRC_FILES := main.cpp

CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS)
LDFLAGS += -ltbox_base
LDFLAGS += -ltbox_base -ldl

include ${TOP_DIR}/tools/exe_common.mk
2 changes: 1 addition & 1 deletion examples/base/print_log/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ C_SRC_FILES := other.c
CXXFLAGS += -DLOG_MODULE_ID='"demo"'
CFLAGS += -DLOG_MODULE_ID='"demo"'

LDFLAGS += -ltbox_base
LDFLAGS += -ltbox_base -ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/dbus/00-loop/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ LDFLAGS += \
-ltbox_dbus \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/event/01_io/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS)
LDFLAGS += \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/event/02_timer/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS)
LDFLAGS += \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/event/03_signal/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS)
LDFLAGS += \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/event/04_run_in_loop/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_event \
-ltbox_base \
-lpthread \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/event/05_run_next_seq/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS)
LDFLAGS += \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/event/06_stdin_timer_signal/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS)
LDFLAGS += \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/event/07_delay_delete/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS)
LDFLAGS += \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/event/08_calc_game/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ CXXFLAGS := -DLOG_MODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS)
LDFLAGS += \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
2 changes: 1 addition & 1 deletion examples/http/server/async_respond/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ LDFLAGS += \
-ltbox_log \
-ltbox_util \
-ltbox_base \
-lpthread
-lpthread -ldl

include ${TOP_DIR}/tools/exe_common.mk
2 changes: 1 addition & 1 deletion examples/http/server/router/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ LDFLAGS += \
-ltbox_log \
-ltbox_util \
-ltbox_base \
-lpthread
-lpthread -ldl

include ${TOP_DIR}/tools/exe_common.mk
2 changes: 1 addition & 1 deletion examples/http/server/simple/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ LDFLAGS += \
-ltbox_log \
-ltbox_util \
-ltbox_base \
-lpthread
-lpthread -ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/mqtt/conn/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ LDFLAGS += \
-ltbox_base \
-lmosquitto \
-lpthread \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/mqtt/pub/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ LDFLAGS += \
-ltbox_base \
-lmosquitto \
-lpthread \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/mqtt/sub/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ LDFLAGS += \
-ltbox_base \
-lmosquitto \
-lpthread \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/buffered_fd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/stdio_stream/01_stdin_out/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/stdio_stream/02_stdio/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/tcp_acceptor/tcp_echo/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/tcp_acceptor/tcp_nc_server/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/tcp_client/tcp_echo/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/tcp_client/tcp_hex_client/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ LDFLAGS += \
-ltbox_event \
-ltbox_util \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/tcp_client/tcp_nc_client/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/tcp_connector/tcp_echo/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/tcp_connector/tcp_nc_client/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/tcp_server/tcp_echo/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/tcp_server/tcp_nc_server/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/uart/uart_to_uart/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/uart/uart_tool/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/udp_socket/ping_pong/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/udp_socket/recv_only/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/udp_socket/request/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/udp_socket/respond/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/network/udp_socket/send_only/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ LDFLAGS += \
-ltbox_network \
-ltbox_event \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/terminal/tcp_rpc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ LDFLAGS += \
-ltbox_event \
-ltbox_util \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
1 change: 1 addition & 0 deletions examples/terminal/telnetd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ LDFLAGS += \
-ltbox_event \
-ltbox_util \
-ltbox_base \
-ldl

include ${TOP_DIR}/tools/exe_common.mk
2 changes: 1 addition & 1 deletion modules/alarm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ TEST_CPP_SRC_FILES = \
$(CPP_SRC_FILES) \
workday_calendar_test.cpp \

TEST_LDFLAGS := $(LDFLAGS) -ltbox_event -ltbox_base
TEST_LDFLAGS := $(LDFLAGS) -ltbox_event -ltbox_base -ldl
ENABLE_SHARED_LIB = no

include $(TOP_DIR)/tools/lib_tbox_common.mk
2 changes: 1 addition & 1 deletion modules/coroutine/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ TEST_CPP_SRC_FILES = \
broadcast_test.cpp \
condition_test.cpp \

TEST_LDFLAGS := $(LDFLAGS) -ltbox_event -ltbox_base
TEST_LDFLAGS := $(LDFLAGS) -ltbox_event -ltbox_base -ldl

ENABLE_SHARED_LIB = no

Expand Down
2 changes: 1 addition & 1 deletion modules/crypto/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ TEST_CPP_SRC_FILES = \
md5_test.cpp \
aes_test.cpp \

TEST_LDFLAGS := $(LDFLAGS) -ltbox_util -ltbox_base
TEST_LDFLAGS := $(LDFLAGS) -ltbox_util -ltbox_base -ldl

ENABLE_SHARED_LIB = no

Expand Down
2 changes: 1 addition & 1 deletion modules/event/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ TEST_CPP_SRC_FILES = \

CXXFLAGS := -DLOG_MODULE_ID='"tbox.event"' $(CXXFLAGS)

TEST_LDFLAGS := $(LDFLAGS) -ltbox_base
TEST_LDFLAGS := $(LDFLAGS) -ltbox_base -ldl

ENABLE_SHARED_LIB = no

Expand Down
2 changes: 1 addition & 1 deletion modules/flow/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ TEST_CPP_SRC_FILES = \
actions/succ_fail_action_test.cpp \
to_graphviz_test.cpp \

TEST_LDFLAGS := $(LDFLAGS) -ltbox_flow -ltbox_event -ltbox_util -ltbox_base
TEST_LDFLAGS := $(LDFLAGS) -ltbox_flow -ltbox_event -ltbox_util -ltbox_base -ldl
ENABLE_SHARED_LIB = no

include $(TOP_DIR)/tools/lib_tbox_common.mk
2 changes: 1 addition & 1 deletion modules/http/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ TEST_CPP_SRC_FILES = \
url_test.cpp \
server/request_parser_test.cpp \

TEST_LDFLAGS := $(LDFLAGS) -ltbox_network -ltbox_log -ltbox_event -ltbox_util -ltbox_base
TEST_LDFLAGS := $(LDFLAGS) -ltbox_network -ltbox_log -ltbox_event -ltbox_util -ltbox_base -ldl

ENABLE_SHARED_LIB = no

Expand Down
2 changes: 1 addition & 1 deletion modules/log/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ TEST_CPP_SRC_FILES = \

CXXFLAGS := -DLOG_MODULE_ID='"tbox.log"' $(CXXFLAGS)

TEST_LDFLAGS := $(LDFLAGS) -ltbox_util -ltbox_event -ltbox_base
TEST_LDFLAGS := $(LDFLAGS) -ltbox_util -ltbox_event -ltbox_base -ldl
ENABLE_SHARED_LIB = no

include $(TOP_DIR)/tools/lib_tbox_common.mk
2 changes: 1 addition & 1 deletion modules/main/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ TEST_LDFLAGS := $(LDFLAGS) \
-ltbox_log \
-ltbox_util \
-ltbox_base \
-ldl \
-lpthread -ldl

ENABLE_SHARED_LIB = no

Expand Down
2 changes: 1 addition & 1 deletion modules/main/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,5 @@ LDFLAGS += -L.. \
-ltbox_event \
-ltbox_util \
-ltbox_base \
-lpthread
-lpthread -ldl
```
2 changes: 1 addition & 1 deletion modules/mqtt/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ CXXFLAGS := -DLOG_MODULE_ID='"tbox.mqtt"' $(CXXFLAGS)

TEST_CPP_SRC_FILES = \

TEST_LDFLAGS := $(LDFLAGS) -ltbox_event -ltbox_base -lmosquitto
TEST_LDFLAGS := $(LDFLAGS) -ltbox_event -ltbox_base -lmosquitto -ldl

ENABLE_SHARED_LIB = no

Expand Down
2 changes: 1 addition & 1 deletion modules/network/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ TEST_CPP_SRC_FILES = \
net_if_test.cpp \
dns_request_test.cpp \

TEST_LDFLAGS := $(LDFLAGS) -ltbox_eventx -ltbox_event -ltbox_util -ltbox_base
TEST_LDFLAGS := $(LDFLAGS) -ltbox_eventx -ltbox_event -ltbox_util -ltbox_base -ldl

ENABLE_SHARED_LIB = no

Expand Down
Loading

0 comments on commit 4a652bf

Please sign in to comment.