rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-05-13 22:59:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

freebsd-userspace/Makefile: Resolve conflict so ifconfig and netstat are both here

Browse Source
This commit is contained in:
Joel Sherrill 2012-09-07 13:19:21 -05:00
parent ebbe3cc71f
commit e6fe77ef56
4 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
freebsd-userspace/Makefile
View File

@ -7,6 +7,7 @@ include $(PROJECT_ROOT)/make/leaf.cfg
CFLAGS += -I include CFLAGS += -I include
CFLAGS += -I rtems/include CFLAGS += -I rtems/include
CFLAGS += -I lib/libc/include CFLAGS += -I lib/libc/include
CFLAGS += -I lib/netgraph
CFLAGS += -I sys CFLAGS += -I sys
CFLAGS += -I local CFLAGS += -I local
# XXX hack to find rpc # XXX hack to find rpc
@ -78,6 +79,9 @@ C_FILES += lib/libc/resolv/res_send.c
C_FILES += lib/libc/resolv/res_update.c C_FILES += lib/libc/resolv/res_update.c
C_FILES += lib/libc/string/strsep.c C_FILES += lib/libc/string/strsep.c
C_FILES += lib/libc/isc/ev_streams.c
C_FILES += lib/libc/isc/ev_timers.c
# RTEMS Specific Files # RTEMS Specific Files
# C_FILES += rtems/rtems-net-setup.c # C_FILES += rtems/rtems-net-setup.c
C_FILES += rtems/syslog.c C_FILES += rtems/syslog.c
@ -136,6 +140,29 @@ C_FILES += commands/sbin/ifconfig/ifpfsync.c
# C_FILES += commands/sbin/ifconfig/regdomain.c # C_FILES += commands/sbin/ifconfig/regdomain.c
# C_FILES += commands/sbin/ifconfig/af_ipx.c # C_FILES += commands/sbin/ifconfig/af_ipx.c
ifeq (1,0)
# netstat command sources
# no need to support AppleTalk yet
# C_FILES += commands/usr.bin/netstat/atalk.c
C_FILES += commands/usr.bin/netstat/bpf.c
C_FILES += commands/usr.bin/netstat/if.c
C_FILES += commands/usr.bin/netstat/inet6.c
C_FILES += commands/usr.bin/netstat/inet.c
C_FILES += commands/usr.bin/netstat/ipsec.c
# no need to support IPX yet
# C_FILES += commands/usr.bin/netstat/ipx.c
C_FILES += commands/usr.bin/netstat/main.c
C_FILES += commands/usr.bin/netstat/mbuf.c
C_FILES += commands/usr.bin/netstat/mroute6.c
C_FILES += commands/usr.bin/netstat/mroute.c
# Disable netgraph support - this is a long thread to pull
# C_FILES += commands/usr.bin/netstat/netgraph.c
C_FILES += commands/usr.bin/netstat/pfkey.c
C_FILES += commands/usr.bin/netstat/route.c
C_FILES += commands/usr.bin/netstat/sctp.c
C_FILES += commands/usr.bin/netstat/unix.c
endif
C_O_FILES = $(C_FILES:%.c=%.o) C_O_FILES = $(C_FILES:%.c=%.o)
C_D_FILES = $(C_FILES:%.c=%.d) C_D_FILES = $(C_FILES:%.c=%.d)

4
freebsd-userspace/lib/libc/include/libc_private.h
View File

@ -41,7 +41,11 @@
* or more threads. It is used to avoid calling locking functions * or more threads. It is used to avoid calling locking functions
* when they are not required. * when they are not required.
*/ */
#ifdef __rtems__
#define __isthreaded 1
#else
extern int __isthreaded; extern int __isthreaded;
#endif
/* /*
* libc should use libc_dlopen internally, which respects a global * libc should use libc_dlopen internally, which respects a global

2
freebsd-userspace/rtems/include/namespace.h
View File

@ -53,6 +53,8 @@
#define _getprogname getprogname #define _getprogname getprogname
#define _getsockname getsockname #define _getsockname getsockname
#define _nsdispatch nsdispatch
#endif /* _NAMESPACE_H_ */ #endif /* _NAMESPACE_H_ */

2
testsuite/netshell01/Makefile
View File

@ -12,7 +12,7 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
AM_CPPFLAGS += -I $(INSTALL_BASE)/include AM_CPPFLAGS += -I $(INSTALL_BASE)/include
AM_CPPFLAGS += -I ../init01 AM_CPPFLAGS += -I ../init01
LINK_LIBS += $(INSTALL_BASE)/libbsdc.a LINK_LIBS += $(INSTALL_BASE)/libbsdc.a
LINK_LIBS += $(INSTALL_BASE)/libbsd.a ${REL_ARGS} LINK_LIBS += $(INSTALL_BASE)/libbsd.a -lm ${REL_ARGS}
include $(RTEMS_MAKEFILE_PATH)/Makefile.inc include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
include $(RTEMS_CUSTOM) include $(RTEMS_CUSTOM)