diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-10-07 15:10:20 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-01-10 09:53:31 +0100 |
commit | c40e45b75eb76d79a05c7fa85c1fa9b5c728a12f (patch) | |
tree | ad4f2519067709f00ab98b3c591186c26dc3a21f /libbsd_waf.py | |
parent | userspace-header-gen.py: Simplify program ports (diff) | |
download | rtems-libbsd-c40e45b75eb76d79a05c7fa85c1fa9b5c728a12f.tar.bz2 |
Update to FreeBSD head 2016-08-23
Git mirror commit 9fe7c416e6abb28b1398fd3e5687099846800cfd.
Diffstat (limited to 'libbsd_waf.py')
-rw-r--r-- | libbsd_waf.py | 141 |
1 files changed, 82 insertions, 59 deletions
diff --git a/libbsd_waf.py b/libbsd_waf.py index c440015f..e9b17e7f 100644 --- a/libbsd_waf.py +++ b/libbsd_waf.py @@ -63,8 +63,8 @@ def build(bld): includes += ["%s" % (i[2:].replace("@CPU@", "x86"))] includes += ["rtemsbsd/include"] includes += ["freebsd/sys"] - includes += ["freebsd/sys/contrib/altq"] includes += ["freebsd/sys/contrib/pf"] + includes += ["freebsd/sys/net"] includes += ["freebsd/include"] includes += ["freebsd/lib/libc/include"] includes += ["freebsd/lib/libc/isc/include"] @@ -74,6 +74,7 @@ def build(bld): includes += ["freebsd/lib/libmemstat"] includes += ["freebsd/lib/libipsec"] includes += ["freebsd/contrib/libpcap"] + includes += ["freebsd/contrib/libxo"] includes += ["rtemsbsd/sys"] includes += ["mDNSResponder/mDNSCore"] includes += ["mDNSResponder/mDNSShared"] @@ -195,17 +196,6 @@ def build(bld): source = "freebsd/contrib/libpcap/grammar.c") libbsd_use += ["yacc_pcap"] if bld.env.AUTO_REGEN: - bld(target = "freebsd/contrib/pf/pfctl/parse.c", - source = "freebsd/contrib/pf/pfctl/parse.y", - rule = host_shell + "${YACC} -b pfctly -d -p pfctly ${SRC} && sed -e '/YY_BUF_SIZE/s/16384/1024/' < pfctly.tab.c > ${TGT} && rm -f pfctly.tab.c && mv pfctly.tab.h freebsd/contrib/pf/pfctl/parse.h") - bld.objects(target = "yacc_pfctly", - features = "c", - cflags = cflags, - includes = [] + includes, - defines = defines + [], - source = "freebsd/contrib/pf/pfctl/parse.c") - libbsd_use += ["yacc_pfctly"] - if bld.env.AUTO_REGEN: bld(target = "freebsd/lib/libc/net/nsparser.c", source = "freebsd/lib/libc/net/nsparser.y", rule = host_shell + "${YACC} -b _nsyy -d -p _nsyy ${SRC} && sed -e '/YY_BUF_SIZE/s/16384/1024/' < _nsyy.tab.c > ${TGT} && rm -f _nsyy.tab.c && mv _nsyy.tab.h freebsd/lib/libc/net/nsparser.h") @@ -227,18 +217,22 @@ def build(bld): defines = defines + [], source = "freebsd/lib/libipsec/policy_parse.c") libbsd_use += ["yacc___libipsecyy"] + if bld.env.AUTO_REGEN: + bld(target = "freebsd/sbin/pfctl/parse.c", + source = "freebsd/sbin/pfctl/parse.y", + rule = host_shell + "${YACC} -b pfctly -d -p pfctly ${SRC} && sed -e '/YY_BUF_SIZE/s/16384/1024/' < pfctly.tab.c > ${TGT} && rm -f pfctly.tab.c && mv pfctly.tab.h freebsd/sbin/pfctl/parse.h") + bld.objects(target = "yacc_pfctly", + features = "c", + cflags = cflags, + includes = [] + includes, + defines = defines + [], + source = "freebsd/sbin/pfctl/parse.c") + libbsd_use += ["yacc_pfctly"] # Objects built with different CFLAGS objs01_source = ['freebsd/bin/hostname/hostname.c', - 'freebsd/contrib/pf/pfctl/pf_print_state.c', - 'freebsd/contrib/pf/pfctl/pfctl.c', - 'freebsd/contrib/pf/pfctl/pfctl_altq.c', - 'freebsd/contrib/pf/pfctl/pfctl_optimize.c', - 'freebsd/contrib/pf/pfctl/pfctl_osfp.c', - 'freebsd/contrib/pf/pfctl/pfctl_parser.c', - 'freebsd/contrib/pf/pfctl/pfctl_qstats.c', - 'freebsd/contrib/pf/pfctl/pfctl_radix.c', - 'freebsd/contrib/pf/pfctl/pfctl_table.c', + 'freebsd/contrib/libxo/libxo/libxo.c', + 'freebsd/contrib/libxo/libxo/xo_encoder.c', 'freebsd/lib/libc/gen/err.c', 'freebsd/lib/libc/gen/feature_present.c', 'freebsd/lib/libc/gen/getdomainname.c', @@ -414,7 +408,6 @@ def build(bld): 'freebsd/sbin/ifconfig/af_link.c', 'freebsd/sbin/ifconfig/af_nd6.c', 'freebsd/sbin/ifconfig/ifbridge.c', - 'freebsd/sbin/ifconfig/ifcarp.c', 'freebsd/sbin/ifconfig/ifclone.c', 'freebsd/sbin/ifconfig/ifconfig.c', 'freebsd/sbin/ifconfig/ifgif.c', @@ -425,11 +418,22 @@ def build(bld): 'freebsd/sbin/ifconfig/ifmedia.c', 'freebsd/sbin/ifconfig/ifpfsync.c', 'freebsd/sbin/ifconfig/ifvlan.c', + 'freebsd/sbin/ifconfig/sfp.c', + 'freebsd/sbin/pfctl/pf_print_state.c', + 'freebsd/sbin/pfctl/pfctl.c', + 'freebsd/sbin/pfctl/pfctl_altq.c', + 'freebsd/sbin/pfctl/pfctl_optimize.c', + 'freebsd/sbin/pfctl/pfctl_osfp.c', + 'freebsd/sbin/pfctl/pfctl_parser.c', + 'freebsd/sbin/pfctl/pfctl_qstats.c', + 'freebsd/sbin/pfctl/pfctl_radix.c', + 'freebsd/sbin/pfctl/pfctl_table.c', 'freebsd/sbin/ping/ping.c', 'freebsd/sbin/ping6/ping6.c', 'freebsd/sbin/route/route.c', 'freebsd/sbin/sysctl/sysctl.c', 'freebsd/usr.bin/netstat/bpf.c', + 'freebsd/usr.bin/netstat/flowtable.c', 'freebsd/usr.bin/netstat/if.c', 'freebsd/usr.bin/netstat/inet.c', 'freebsd/usr.bin/netstat/inet6.c', @@ -438,6 +442,7 @@ def build(bld): 'freebsd/usr.bin/netstat/mbuf.c', 'freebsd/usr.bin/netstat/mroute.c', 'freebsd/usr.bin/netstat/mroute6.c', + 'freebsd/usr.bin/netstat/nl_symbols.c', 'freebsd/usr.bin/netstat/pfkey.c', 'freebsd/usr.bin/netstat/route.c', 'freebsd/usr.bin/netstat/sctp.c', @@ -446,7 +451,7 @@ def build(bld): features = "c", cflags = cflags, includes = [] + includes, - defines = defines + ['INET6'], + defines = defines + ['INET', 'INET6'], source = objs01_source) libbsd_use += ["objs01"] @@ -696,25 +701,6 @@ def build(bld): source = ['freebsd/sys/arm/xilinx/zy7_slcr.c', 'freebsd/sys/cam/cam.c', 'freebsd/sys/cam/scsi/scsi_all.c', - 'freebsd/sys/contrib/altq/altq/altq_cbq.c', - 'freebsd/sys/contrib/altq/altq/altq_cdnr.c', - 'freebsd/sys/contrib/altq/altq/altq_hfsc.c', - 'freebsd/sys/contrib/altq/altq/altq_priq.c', - 'freebsd/sys/contrib/altq/altq/altq_red.c', - 'freebsd/sys/contrib/altq/altq/altq_rio.c', - 'freebsd/sys/contrib/altq/altq/altq_rmclass.c', - 'freebsd/sys/contrib/altq/altq/altq_subr.c', - 'freebsd/sys/contrib/pf/net/if_pflog.c', - 'freebsd/sys/contrib/pf/net/if_pfsync.c', - 'freebsd/sys/contrib/pf/net/pf.c', - 'freebsd/sys/contrib/pf/net/pf_if.c', - 'freebsd/sys/contrib/pf/net/pf_ioctl.c', - 'freebsd/sys/contrib/pf/net/pf_lb.c', - 'freebsd/sys/contrib/pf/net/pf_norm.c', - 'freebsd/sys/contrib/pf/net/pf_osfp.c', - 'freebsd/sys/contrib/pf/net/pf_ruleset.c', - 'freebsd/sys/contrib/pf/net/pf_table.c', - 'freebsd/sys/contrib/pf/netinet/in4_cksum.c', 'freebsd/sys/crypto/blowfish/bf_ecb.c', 'freebsd/sys/crypto/blowfish/bf_enc.c', 'freebsd/sys/crypto/blowfish/bf_skey.c', @@ -728,7 +714,11 @@ def build(bld): 'freebsd/sys/crypto/rijndael/rijndael-api-fst.c', 'freebsd/sys/crypto/rijndael/rijndael-api.c', 'freebsd/sys/crypto/sha1.c', - 'freebsd/sys/crypto/sha2/sha2.c', + 'freebsd/sys/crypto/sha2/sha256c.c', + 'freebsd/sys/crypto/sha2/sha512c.c', + 'freebsd/sys/crypto/siphash/siphash.c', + 'freebsd/sys/crypto/skein/skein.c', + 'freebsd/sys/crypto/skein/skein_block.c', 'freebsd/sys/dev/bce/if_bce.c', 'freebsd/sys/dev/bfe/if_bfe.c', 'freebsd/sys/dev/bge/if_bge.c', @@ -774,7 +764,6 @@ def build(bld): 'freebsd/sys/dev/pci/pci.c', 'freebsd/sys/dev/pci/pci_pci.c', 'freebsd/sys/dev/pci/pci_user.c', - 'freebsd/sys/dev/random/harvest.c', 'freebsd/sys/dev/re/if_re.c', 'freebsd/sys/dev/smc/if_smc.c', 'freebsd/sys/dev/tsec/if_tsec.c', @@ -820,14 +809,17 @@ def build(bld): 'freebsd/sys/kern/kern_sysctl.c', 'freebsd/sys/kern/kern_time.c', 'freebsd/sys/kern/kern_timeout.c', + 'freebsd/sys/kern/kern_uuid.c', 'freebsd/sys/kern/subr_bufring.c', 'freebsd/sys/kern/subr_bus.c', + 'freebsd/sys/kern/subr_counter.c', 'freebsd/sys/kern/subr_eventhandler.c', 'freebsd/sys/kern/subr_hash.c', 'freebsd/sys/kern/subr_hints.c', 'freebsd/sys/kern/subr_kobj.c', 'freebsd/sys/kern/subr_lock.c', 'freebsd/sys/kern/subr_module.c', + 'freebsd/sys/kern/subr_pcpu.c', 'freebsd/sys/kern/subr_prf.c', 'freebsd/sys/kern/subr_rman.c', 'freebsd/sys/kern/subr_sbuf.c', @@ -842,15 +834,26 @@ def build(bld): 'freebsd/sys/kern/uipc_domain.c', 'freebsd/sys/kern/uipc_mbuf.c', 'freebsd/sys/kern/uipc_mbuf2.c', + 'freebsd/sys/kern/uipc_mbufhash.c', 'freebsd/sys/kern/uipc_sockbuf.c', 'freebsd/sys/kern/uipc_socket.c', 'freebsd/sys/kern/uipc_syscalls.c', 'freebsd/sys/kern/uipc_usrreq.c', - 'freebsd/sys/libkern/arc4random.c', 'freebsd/sys/libkern/bcd.c', - 'freebsd/sys/libkern/fls.c', 'freebsd/sys/libkern/inet_ntoa.c', + 'freebsd/sys/libkern/jenkins_hash.c', + 'freebsd/sys/libkern/murmur3_32.c', 'freebsd/sys/libkern/random.c', + 'freebsd/sys/net/altq/altq_cbq.c', + 'freebsd/sys/net/altq/altq_cdnr.c', + 'freebsd/sys/net/altq/altq_codel.c', + 'freebsd/sys/net/altq/altq_fairq.c', + 'freebsd/sys/net/altq/altq_hfsc.c', + 'freebsd/sys/net/altq/altq_priq.c', + 'freebsd/sys/net/altq/altq_red.c', + 'freebsd/sys/net/altq/altq_rio.c', + 'freebsd/sys/net/altq/altq_rmclass.c', + 'freebsd/sys/net/altq/altq_subr.c', 'freebsd/sys/net/bpf.c', 'freebsd/sys/net/bpf_buffer.c', 'freebsd/sys/net/bpf_filter.c', @@ -865,11 +868,9 @@ def build(bld): 'freebsd/sys/net/if_dead.c', 'freebsd/sys/net/if_disc.c', 'freebsd/sys/net/if_edsc.c', - 'freebsd/sys/net/if_ef.c', 'freebsd/sys/net/if_enc.c', 'freebsd/sys/net/if_epair.c', 'freebsd/sys/net/if_ethersubr.c', - 'freebsd/sys/net/if_faith.c', 'freebsd/sys/net/if_fddisubr.c', 'freebsd/sys/net/if_fwsubr.c', 'freebsd/sys/net/if_gif.c', @@ -904,6 +905,7 @@ def build(bld): 'freebsd/sys/netinet/if_ether.c', 'freebsd/sys/netinet/igmp.c', 'freebsd/sys/netinet/in.c', + 'freebsd/sys/netinet/in_fib.c', 'freebsd/sys/netinet/in_gif.c', 'freebsd/sys/netinet/in_mcast.c', 'freebsd/sys/netinet/in_pcb.c', @@ -921,6 +923,7 @@ def build(bld): 'freebsd/sys/netinet/ip_mroute.c', 'freebsd/sys/netinet/ip_options.c', 'freebsd/sys/netinet/ip_output.c', + 'freebsd/sys/netinet/ip_reass.c', 'freebsd/sys/netinet/libalias/alias.c', 'freebsd/sys/netinet/libalias/alias_cuseeme.c', 'freebsd/sys/netinet/libalias/alias_db.c', @@ -969,6 +972,7 @@ def build(bld): 'freebsd/sys/netinet6/icmp6.c', 'freebsd/sys/netinet6/in6.c', 'freebsd/sys/netinet6/in6_cksum.c', + 'freebsd/sys/netinet6/in6_fib.c', 'freebsd/sys/netinet6/in6_gif.c', 'freebsd/sys/netinet6/in6_ifattach.c', 'freebsd/sys/netinet6/in6_mcast.c', @@ -990,26 +994,44 @@ def build(bld): 'freebsd/sys/netinet6/scope6.c', 'freebsd/sys/netinet6/sctp6_usrreq.c', 'freebsd/sys/netinet6/udp6_usrreq.c', - 'freebsd/sys/netpfil/ipfw/dn_heap.c', - 'freebsd/sys/netpfil/ipfw/dn_sched_fifo.c', - 'freebsd/sys/netpfil/ipfw/dn_sched_prio.c', - 'freebsd/sys/netpfil/ipfw/dn_sched_qfq.c', - 'freebsd/sys/netpfil/ipfw/dn_sched_rr.c', - 'freebsd/sys/netpfil/ipfw/dn_sched_wf2q.c', - 'freebsd/sys/netpfil/ipfw/ip_dn_glue.c', - 'freebsd/sys/netpfil/ipfw/ip_dn_io.c', - 'freebsd/sys/netpfil/ipfw/ip_dummynet.c', 'freebsd/sys/netpfil/ipfw/ip_fw2.c', + 'freebsd/sys/netpfil/ipfw/ip_fw_bpf.c', + 'freebsd/sys/netpfil/ipfw/ip_fw_dynamic.c', + 'freebsd/sys/netpfil/ipfw/ip_fw_eaction.c', + 'freebsd/sys/netpfil/ipfw/ip_fw_iface.c', 'freebsd/sys/netpfil/ipfw/ip_fw_log.c', 'freebsd/sys/netpfil/ipfw/ip_fw_nat.c', 'freebsd/sys/netpfil/ipfw/ip_fw_pfil.c', 'freebsd/sys/netpfil/ipfw/ip_fw_sockopt.c', 'freebsd/sys/netpfil/ipfw/ip_fw_table.c', + 'freebsd/sys/netpfil/ipfw/ip_fw_table_algo.c', + 'freebsd/sys/netpfil/ipfw/ip_fw_table_value.c', + 'freebsd/sys/netpfil/ipfw/nat64/ip_fw_nat64.c', + 'freebsd/sys/netpfil/ipfw/nat64/nat64_translate.c', + 'freebsd/sys/netpfil/ipfw/nat64/nat64lsn.c', + 'freebsd/sys/netpfil/ipfw/nat64/nat64lsn_control.c', + 'freebsd/sys/netpfil/ipfw/nat64/nat64stl.c', + 'freebsd/sys/netpfil/ipfw/nat64/nat64stl_control.c', + 'freebsd/sys/netpfil/ipfw/nptv6/ip_fw_nptv6.c', + 'freebsd/sys/netpfil/ipfw/nptv6/nptv6.c', + 'freebsd/sys/netpfil/pf/if_pflog.c', + 'freebsd/sys/netpfil/pf/if_pfsync.c', + 'freebsd/sys/netpfil/pf/in4_cksum.c', + 'freebsd/sys/netpfil/pf/pf.c', + 'freebsd/sys/netpfil/pf/pf_if.c', + 'freebsd/sys/netpfil/pf/pf_ioctl.c', + 'freebsd/sys/netpfil/pf/pf_lb.c', + 'freebsd/sys/netpfil/pf/pf_norm.c', + 'freebsd/sys/netpfil/pf/pf_osfp.c', + 'freebsd/sys/netpfil/pf/pf_ruleset.c', + 'freebsd/sys/netpfil/pf/pf_table.c', 'freebsd/sys/opencrypto/cast.c', 'freebsd/sys/opencrypto/criov.c', 'freebsd/sys/opencrypto/crypto.c', + 'freebsd/sys/opencrypto/cryptodeflate.c', 'freebsd/sys/opencrypto/cryptosoft.c', - 'freebsd/sys/opencrypto/deflate.c', + 'freebsd/sys/opencrypto/gfmult.c', + 'freebsd/sys/opencrypto/gmac.c', 'freebsd/sys/opencrypto/rmd160.c', 'freebsd/sys/opencrypto/skipjack.c', 'freebsd/sys/opencrypto/xform.c', @@ -1034,6 +1056,8 @@ def build(bld): 'rtemsbsd/local/bus_if.c', 'rtemsbsd/local/cryptodev_if.c', 'rtemsbsd/local/device_if.c', + 'rtemsbsd/local/gpio_if.c', + 'rtemsbsd/local/if_dwc_if.c', 'rtemsbsd/local/miibus_if.c', 'rtemsbsd/local/mmcbr_if.c', 'rtemsbsd/local/mmcbus_if.c', @@ -1193,7 +1217,6 @@ def build(bld): header_paths = [('rtemsbsd/include', '*.h', ''), ('rtemsbsd/mghttpd', 'mongoose.h', 'mghttpd'), ('freebsd/include', '*.h', ''), - ('freebsd/sys/contrib/altq/altq', '*.h', 'altq'), ('freebsd/sys/bsm', '*.h', 'bsm'), ('freebsd/sys/cam', '*.h', 'cam'), ('freebsd/sys/net', '*.h', 'net'), |