Deal with the ld.so/linkset brokenness and compile all of libnet
and libnetinet into a big bunch for now. If they were separate libraries, the DOMAIN_DEFINE() in the latter on the linkline would not get noticed at "boot" time because of the abovementioned brokenness. One of these days I'll add code to dlopen() the libraries and resplit them, but this will allow things to work until then.
This commit is contained in:
parent
2690ed220b
commit
a208c2294a
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.1 2008/10/06 00:27:06 pooka Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2008/10/16 19:14:51 pooka Exp $
|
||||
#
|
||||
|
||||
.PATH: ${.CURDIR}/../../../../net
|
||||
|
@ -12,5 +12,7 @@ SRCS= if.c if_loop.c route.c radix.c rtsock.c raw_usrreq.c raw_cb.c \
|
|||
CPPFLAGS+= -I${.CURDIR}/opt -I${.CURDIR}/../libnetinet/opt
|
||||
CFLAGS+= -fno-strict-aliasing # void ** cast in route.c is killing me
|
||||
|
||||
.include "${.CURDIR}/../libnetinet/Makefile.inc"
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
.include <bsd.klinks.mk>
|
||||
|
|
|
@ -1,31 +1,9 @@
|
|||
# $NetBSD: Makefile,v 1.2 2008/10/13 22:24:06 pooka Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2008/10/16 19:14:51 pooka Exp $
|
||||
#
|
||||
|
||||
.PATH: ${.CURDIR}/../../../../netinet
|
||||
|
||||
LIB= rumpnet_netinet
|
||||
|
||||
# IP
|
||||
SRCS+= in_proto.c igmp.c in.c in_offload.c in_pcb.c ip_icmp.c ip_id.c \
|
||||
ip_input.c ip_output.c raw_ip.c in_cksum.c cpu_in_cksum.c \
|
||||
in4_cksum.c ip_encap.c
|
||||
|
||||
# ARP
|
||||
SRCS+= if_arp.c
|
||||
|
||||
# TCP
|
||||
SRCS+= tcp_input.c tcp_output.c tcp_sack.c tcp_subr.c tcp_timer.c \
|
||||
tcp_usrreq.c tcp_congctl.c
|
||||
|
||||
# UDP
|
||||
SRCS+= udp_usrreq.c
|
||||
|
||||
CFLAGS+= -Wno-pointer-sign
|
||||
CPPFLAGS+= -I${.CURDIR}/opt -I${.CURDIR}/../libnet/opt
|
||||
|
||||
# TCP debugging
|
||||
#SRCS+= tcp_debug.c
|
||||
#CPPFLAGS+= -DTCP_DEBUG
|
||||
SRCS= dummy.c
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
.include <bsd.klinks.mk>
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
# $NetBSD: Makefile.inc,v 1.1 2008/10/16 19:14:51 pooka Exp $
|
||||
#
|
||||
|
||||
.PATH: ${.CURDIR}/../../../../netinet
|
||||
|
||||
# IP
|
||||
SRCS+= in_proto.c igmp.c in.c in_offload.c in_pcb.c ip_icmp.c ip_id.c \
|
||||
ip_input.c ip_output.c raw_ip.c in_cksum.c cpu_in_cksum.c \
|
||||
in4_cksum.c ip_encap.c
|
||||
|
||||
# ARP
|
||||
SRCS+= if_arp.c
|
||||
|
||||
# TCP
|
||||
SRCS+= tcp_input.c tcp_output.c tcp_sack.c tcp_subr.c tcp_timer.c \
|
||||
tcp_usrreq.c tcp_congctl.c
|
||||
|
||||
# UDP
|
||||
SRCS+= udp_usrreq.c
|
||||
|
||||
CFLAGS+= -Wno-pointer-sign
|
||||
CPPFLAGS+= -I${.CURDIR}/opt -I${.CURDIR}/../libnet/opt
|
||||
|
||||
# TCP debugging
|
||||
#SRCS+= tcp_debug.c
|
||||
#CPPFLAGS+= -DTCP_DEBUG
|
|
@ -0,0 +1,28 @@
|
|||
/* $NetBSD: dummy.c,v 1.1 2008/10/16 19:14:51 pooka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
|
||||
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
int i_am_nonnondummy;
|
Loading…
Reference in New Issue