From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ivanoab7.miniserver.com ([37.128.132.42] helo=www.kot-begemot.co.uk) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iKe81-0003dD-2E for linux-um@lists.infradead.org; Wed, 16 Oct 2019 07:53:54 +0000 From: Anton Ivanov Subject: [PATCH] um: Fix pcap and vde driver builds Date: Wed, 16 Oct 2019 08:53:43 +0100 Message-Id: <20191016075343.28564-2-anton.ivanov@cambridgegreys.com> In-Reply-To: <20191016075343.28564-1-anton.ivanov@cambridgegreys.com> References: <20191016075343.28564-1-anton.ivanov@cambridgegreys.com> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-um" Errors-To: linux-um-bounces+geert=linux-m68k.org@lists.infradead.org To: linux-um@lists.infradead.org Cc: richard@nod.at, Anton Ivanov , 938962@bugs.debian.org Signed-off-by: Anton Ivanov --- arch/um/drivers/Makefile | 8 ++++++++ scripts/link-vmlinux.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile index 693319839f69..34355057ec85 100644 --- a/arch/um/drivers/Makefile +++ b/arch/um/drivers/Makefile @@ -24,6 +24,14 @@ LDFLAGS_vde.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libvdeplug.a) targets := pcap_kern.o pcap_user.o vde_kern.o vde_user.o +ifeq ($(CONFIG_UML_NET_PCAP),y) + export UML_EXTRA_LIBS += -lpcap +endif +ifeq ($(CONFIG_UML_NET_VDE),y) + export UML_EXTRA_LIBS += -lvde -lvdeplug +endif + + $(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o $(LD) -r -dp -o $@ $^ $(ld_flags) diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 915775eb2921..d3e6a6cdfc13 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -86,7 +86,7 @@ vmlinux_link() ${CC} ${CFLAGS_vmlinux} -o ${2} \ -Wl,-T,${lds} \ ${objects} \ - -lutil -lrt -lpthread + -lutil -lrt -lpthread ${UML_EXTRA_LIBS} rm -f linux fi } -- 2.20.1 _______________________________________________ linux-um mailing list linux-um@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-um