Changeset 100129 in vbox for trunk/src/VBox/Devices
- Timestamp:
- Jun 8, 2023 5:44:43 PM (18 months ago)
- File:
-
- 1 edited
-
trunk/src/VBox/Devices/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Makefile.kmk
r100128 r100129 784 784 # --- WARNING! SLIRP MESS AHEAD! ;-) --- 785 785 ifndef VBOX_WITH_LIBSLIRP 786 VBOX_SLIRP_SOURCES = \ 787 Network/DrvNAT.cpp \ 788 Network/slirp/bootp.c \ 789 Network/slirp/debug.c \ 790 Network/slirp/ip_icmp.c \ 791 Network/slirp/ip_input.c \ 792 Network/slirp/ip_output.c \ 793 Network/slirp/misc.c \ 794 Network/slirp/sbuf.c \ 795 Network/slirp/slirp.c \ 796 Network/slirp/slirp_dns.c \ 797 Network/slirp/socket.c \ 798 Network/slirp/tcp_input.c \ 799 Network/slirp/tcp_output.c \ 800 Network/slirp/tcp_subr.c \ 801 Network/slirp/tcp_timer.c \ 802 Network/slirp/udp.c \ 803 Network/slirp/hostres.c \ 804 Network/slirp/dnsproxy/hash.c \ 805 Network/slirp/tftp.c \ 806 Network/slirp/dnsproxy/dnsproxy.c 807 808 ifeq ($(KBUILD_TARGET),win) 809 VBOX_SLIRP_SOURCES += Network/slirp/ip_icmpwin.c 810 else ifneq ($(KBUILD_TARGET),darwin) 811 # helper for debugging unprivileged 812 # Network/slirp/ip_icmp.c_DEFS += VBOX_RAWSOCK_DEBUG_HELPER 813 # VBOX_SLIRP_SOURCES += ../NetworkServices/NAT/getrawsock.c 814 endif 815 816 ifneq ($(KBUILD_TARGET),win) 817 VBOX_SLIRP_SOURCES += Network/slirp/resolv_conf_parser.c 818 endif 819 820 VBOX_SLIRP_BSD_ARCH = $(subst x86,i386,$(KBUILD_TARGET_ARCH)) 821 VBOX_SLIRP_BSD_SOURCES += \ 822 Network/slirp/bsd/kern/kern_mbuf.c \ 823 Network/slirp/bsd/kern/uipc_mbuf.c \ 824 Network/slirp/bsd/kern/uipc_mbuf2.c \ 825 Network/slirp/bsd/$(VBOX_SLIRP_BSD_ARCH)/in_cksum.c 826 VBOX_SLIRP_ALIAS_SOURCES = \ 827 Network/slirp/libalias/alias.c \ 828 Network/slirp/libalias/alias_db.c \ 829 Network/slirp/libalias/alias_mod.c \ 830 Network/slirp/libalias/alias_proxy.c \ 831 Network/slirp/libalias/alias_ftp.c \ 832 Network/slirp/libalias/alias_nbt.c \ 833 Network/slirp/libalias/alias_util.c 834 835 # Enable VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER here for a while, then move to 836 # $(file)_DEFS or clean the code disabled with this definition. 837 VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER = 1 838 839 # dump memory related operations. 840 Network/slirp/misc.c_DEFS += $(if $(VBOX_NAT_MEM_DEBUG),VBOX_NAT_MEM_DEBUG,) 841 842 VBoxDD_SOURCES += $(VBOX_SLIRP_SOURCES) 843 define def_vbox_slirp_cflags 844 $(file)_DEFS += \ 845 $(if $(VBOX_WITH_SLIRP_MEMORY_CHECK),RTMEM_WRAP_TO_EF_APIS,) \ 846 $(if $(VBOX_WITH_DEBUG_NAT_SOCKETS),VBOX_WITH_DEBUG_NAT_SOCKETS,) \ 847 $(if $(VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER),VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER,) \ 848 $(if $(VBOX_WITH_NAT_SEND2HOME),VBOX_WITH_NAT_SEND2HOME,) \ 849 $(if $(VBOX_WITH_HIDDEN_TCPTEMPLATE),VBOX_WITH_HIDDEN_TCPTEMPLATE,) \ 850 $(if $(VBOX_WITH_SLIRP_MT),VBOX_WITH_SLIRP_MT,) 851 $(file)_INCS += \ 852 $(1)/slirp/bsd/sys \ 853 $(1)/slirp/bsd/sys/sys \ 854 $(1)/slirp/bsd/$(VBOX_SLIRP_BSD_ARCH)/include \ 855 $(1)/slirp/bsd/netinet \ 856 $(1)/slirp \ 857 $(1)/slirp/libalias 786 VBOX_SLIRP_SOURCES = \ 787 Network/DrvNAT.cpp \ 788 Network/slirp/bootp.c \ 789 Network/slirp/debug.c \ 790 Network/slirp/ip_icmp.c \ 791 Network/slirp/ip_input.c \ 792 Network/slirp/ip_output.c \ 793 Network/slirp/misc.c \ 794 Network/slirp/sbuf.c \ 795 Network/slirp/slirp.c \ 796 Network/slirp/slirp_dns.c \ 797 Network/slirp/socket.c \ 798 Network/slirp/tcp_input.c \ 799 Network/slirp/tcp_output.c \ 800 Network/slirp/tcp_subr.c \ 801 Network/slirp/tcp_timer.c \ 802 Network/slirp/udp.c \ 803 Network/slirp/hostres.c \ 804 Network/slirp/dnsproxy/hash.c \ 805 Network/slirp/tftp.c \ 806 Network/slirp/dnsproxy/dnsproxy.c 807 858 808 ifeq ($(KBUILD_TARGET),win) 859 $(file)_CFLAGS = -wd4018 860 else 861 $(file)_CFLAGS += -Wno-sign-compare -Wno-format -Wno-bad-function-cast 862 endif 863 endef 864 865 $(foreach file,$(VBOX_SLIRP_SOURCES),$(eval $(call def_vbox_slirp_cflags, Network))) 866 867 VBoxDD_SOURCES += $(VBOX_SLIRP_ALIAS_SOURCES) 868 define def_vbox_slirp_alias_cflags 869 $(file)_DEFS += VBOX_SLIRP_ALIAS \ 870 $(if $(VBOX_WITH_DEBUG_LIBALIAS),VBOX_WITH_DEBUG_LIBALIAS,) 871 $(file)_INCS += \ 872 $(1)/slirp/libalias \ 873 $(1)/slirp \ 874 $(1)/slirp/dnsproxy 809 VBOX_SLIRP_SOURCES += Network/slirp/ip_icmpwin.c 810 else ifneq ($(KBUILD_TARGET),darwin) 811 # helper for debugging unprivileged 812 # Network/slirp/ip_icmp.c_DEFS += VBOX_RAWSOCK_DEBUG_HELPER 813 # VBOX_SLIRP_SOURCES += ../NetworkServices/NAT/getrawsock.c 814 endif 815 875 816 ifneq ($(KBUILD_TARGET),win) 876 $(file)_CFLAGS += -Wno-shadow 877 endif 878 endef 879 $(foreach file,$(VBOX_SLIRP_ALIAS_SOURCES),$(eval $(call def_vbox_slirp_cflags, Network))) 880 $(foreach file,$(VBOX_SLIRP_ALIAS_SOURCES),$(eval $(call def_vbox_slirp_alias_cflags, Network))) 881 882 VBOX_SLIRP_BSD_SOURCES += $(VBOX_SLIRP_BSD_SOURCES.${KBUILD_TARGET_ARCH}) 883 VBoxDD_SOURCES += $(VBOX_SLIRP_BSD_SOURCES) 884 define def_vbox_slirp_bsd_cflags 885 $(file)_DEFS += VBOX_SLIRP_BSD 886 $(file)_INCS += $(1)/slirp/dnsproxy 887 endef 888 $(foreach file,$(VBOX_SLIRP_BSD_SOURCES),$(eval $(call def_vbox_slirp_cflags, Network))) 889 $(foreach file,$(VBOX_SLIRP_BSD_SOURCES),$(eval $(call def_vbox_slirp_bsd_cflags, Network))) 817 VBOX_SLIRP_SOURCES += Network/slirp/resolv_conf_parser.c 818 endif 819 820 VBOX_SLIRP_BSD_ARCH = $(subst x86,i386,$(KBUILD_TARGET_ARCH)) 821 VBOX_SLIRP_BSD_SOURCES += \ 822 Network/slirp/bsd/kern/kern_mbuf.c \ 823 Network/slirp/bsd/kern/uipc_mbuf.c \ 824 Network/slirp/bsd/kern/uipc_mbuf2.c \ 825 Network/slirp/bsd/$(VBOX_SLIRP_BSD_ARCH)/in_cksum.c 826 VBOX_SLIRP_ALIAS_SOURCES = \ 827 Network/slirp/libalias/alias.c \ 828 Network/slirp/libalias/alias_db.c \ 829 Network/slirp/libalias/alias_mod.c \ 830 Network/slirp/libalias/alias_proxy.c \ 831 Network/slirp/libalias/alias_ftp.c \ 832 Network/slirp/libalias/alias_nbt.c \ 833 Network/slirp/libalias/alias_util.c 834 835 # Enable VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER here for a while, then move to 836 # $(file)_DEFS or clean the code disabled with this definition. 837 VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER = 1 838 839 # dump memory related operations. 840 Network/slirp/misc.c_DEFS += $(if $(VBOX_NAT_MEM_DEBUG),VBOX_NAT_MEM_DEBUG,) 841 842 VBoxDD_SOURCES += $(VBOX_SLIRP_SOURCES) 843 define def_vbox_slirp_cflags 844 $(file)_DEFS += \ 845 $(if $(VBOX_WITH_SLIRP_MEMORY_CHECK),RTMEM_WRAP_TO_EF_APIS,) \ 846 $(if $(VBOX_WITH_DEBUG_NAT_SOCKETS),VBOX_WITH_DEBUG_NAT_SOCKETS,) \ 847 $(if $(VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER),VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER,) \ 848 $(if $(VBOX_WITH_NAT_SEND2HOME),VBOX_WITH_NAT_SEND2HOME,) \ 849 $(if $(VBOX_WITH_HIDDEN_TCPTEMPLATE),VBOX_WITH_HIDDEN_TCPTEMPLATE,) \ 850 $(if $(VBOX_WITH_SLIRP_MT),VBOX_WITH_SLIRP_MT,) 851 $(file)_INCS += \ 852 $(1)/slirp/bsd/sys \ 853 $(1)/slirp/bsd/sys/sys \ 854 $(1)/slirp/bsd/$(VBOX_SLIRP_BSD_ARCH)/include \ 855 $(1)/slirp/bsd/netinet \ 856 $(1)/slirp \ 857 $(1)/slirp/libalias 858 ifeq ($(KBUILD_TARGET),win) 859 $(file)_CFLAGS = -wd4018 860 else 861 $(file)_CFLAGS += -Wno-sign-compare -Wno-format -Wno-bad-function-cast 862 endif 863 endef 864 865 $(foreach file,$(VBOX_SLIRP_SOURCES),$(eval $(call def_vbox_slirp_cflags, Network))) 866 867 VBoxDD_SOURCES += $(VBOX_SLIRP_ALIAS_SOURCES) 868 define def_vbox_slirp_alias_cflags 869 $(file)_DEFS += VBOX_SLIRP_ALIAS \ 870 $(if $(VBOX_WITH_DEBUG_LIBALIAS),VBOX_WITH_DEBUG_LIBALIAS,) 871 $(file)_INCS += \ 872 $(1)/slirp/libalias \ 873 $(1)/slirp \ 874 $(1)/slirp/dnsproxy 875 ifneq ($(KBUILD_TARGET),win) 876 $(file)_CFLAGS += -Wno-shadow 877 endif 878 endef 879 $(foreach file,$(VBOX_SLIRP_ALIAS_SOURCES),$(eval $(call def_vbox_slirp_cflags, Network))) 880 $(foreach file,$(VBOX_SLIRP_ALIAS_SOURCES),$(eval $(call def_vbox_slirp_alias_cflags, Network))) 881 882 VBOX_SLIRP_BSD_SOURCES += $(VBOX_SLIRP_BSD_SOURCES.${KBUILD_TARGET_ARCH}) 883 VBoxDD_SOURCES += $(VBOX_SLIRP_BSD_SOURCES) 884 define def_vbox_slirp_bsd_cflags 885 $(file)_DEFS += VBOX_SLIRP_BSD 886 $(file)_INCS += $(1)/slirp/dnsproxy 887 endef 888 $(foreach file,$(VBOX_SLIRP_BSD_SOURCES),$(eval $(call def_vbox_slirp_cflags, Network))) 889 $(foreach file,$(VBOX_SLIRP_BSD_SOURCES),$(eval $(call def_vbox_slirp_bsd_cflags, Network))) 890 890 endif 891 891
Note:
See TracChangeset
for help on using the changeset viewer.
