From 2f0898d2a946e2b2acb034cd2f8240e6aaa6de77 Mon Sep 17 00:00:00 2001 From: Tomasz Gajewski Date: Sun, 14 Mar 2021 02:24:54 +0100 Subject: [PATCH] dde_linux: fixes in makefiles Issue #3972 --- repos/dde_linux/lib/import/import-lxip_include.mk | 2 +- repos/dde_linux/lib/mk/lxip.mk | 5 +---- repos/dde_linux/lib/mk/vfs_lxip.mk | 2 +- repos/dde_linux/src/drivers/usb/target.inc | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/repos/dde_linux/lib/import/import-lxip_include.mk b/repos/dde_linux/lib/import/import-lxip_include.mk index 3794facf9a..d15a6f3b1c 100644 --- a/repos/dde_linux/lib/import/import-lxip_include.mk +++ b/repos/dde_linux/lib/import/import-lxip_include.mk @@ -34,5 +34,5 @@ INC_DIR += $(SRC_DIR) \ INC_DIR += $(REP_DIR)/src/include INC_DIR += $(ARCH_SRC_INC_DIR) INC_DIR += $(LXIP_CONTRIB_DIR)/include \ - $(LXIP_CONTRIB_DIR)/include/uapi \ + $(LXIP_CONTRIB_DIR)/include/uapi INC_DIR += $(LIB_CACHE_DIR)/lxip_include/include/include/include diff --git a/repos/dde_linux/lib/mk/lxip.mk b/repos/dde_linux/lib/mk/lxip.mk index e972a17627..f9f8ad2a4a 100644 --- a/repos/dde_linux/lib/mk/lxip.mk +++ b/repos/dde_linux/lib/mk/lxip.mk @@ -23,7 +23,7 @@ CC_C_OPT += -std=gnu89 CC_C_OPT += -Wno-unused-but-set-variable -Wno-pointer-sign CC_C_OPT += -include $(LIB_INC_DIR)/lx_emul.h -CC_CXX_OPT = -fpermissive +CC_CXX_OPT += -fpermissive SRC_CC = dummies.cc lxcc_emul.cc nic_handler.cc \ timer_handler.cc random.cc @@ -42,9 +42,6 @@ SRC_C += lib/checksum.c SRC_C += lib/rhashtable.c SRC_C += drivers/net/loopback.c -# DHCP support -SRC_C += net/ipv4/ipconfig.c - #SRC_C = net/ipv4/inet_connection_sock.c net/ethernet/eth.o: SETUP_SUFFIX="_eth" diff --git a/repos/dde_linux/lib/mk/vfs_lxip.mk b/repos/dde_linux/lib/mk/vfs_lxip.mk index 369a3e0c88..236278946a 100644 --- a/repos/dde_linux/lib/mk/vfs_lxip.mk +++ b/repos/dde_linux/lib/mk/vfs_lxip.mk @@ -18,6 +18,6 @@ CC_OPT += -DCONFIG_INET -DCONFIG_BASE_SMALL=0 -DCONFIG_DEBUG_LOCK_ALLOC \ -DCONFIG_IP_PNP_DHCP CC_C_OPT += -include $(LXIP_DIR)/include/lx_emul.h -CC_CXX_OPT = -fpermissive +CC_CXX_OPT += -fpermissive CC_CXX_WARN_STRICT = diff --git a/repos/dde_linux/src/drivers/usb/target.inc b/repos/dde_linux/src/drivers/usb/target.inc index eeee8fb9bb..93dfb357b6 100644 --- a/repos/dde_linux/src/drivers/usb/target.inc +++ b/repos/dde_linux/src/drivers/usb/target.inc @@ -34,7 +34,7 @@ CC_WARN = -Wall -Wno-unused-variable -Wno-uninitialized \ CC_C_OPT += -std=gnu89 -Wno-unused-but-set-variable -Wno-pointer-sign -Wno-unused-label CC_C_OPT += -include $(LIB_INC_DIR)/lx_emul.h -CC_CXX_OPT = -fpermissive +CC_CXX_OPT += -fpermissive # # Suffix of global 'module_init' function