Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 69cfb208 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by LuK1337
Browse files

bpfilter: check if $(CC) can link static libc in Kconfig 



On Fedora, linking static glibc requires the glibc-static RPM package,
which is not part of the glibc-devel package.

CONFIG_CC_CAN_LINK does not check the capability of static linking,
so you can enable CONFIG_BPFILTER_UMH, then fail to build:

    HOSTLD  net/bpfilter/bpfilter_umh
  /usr/bin/ld: cannot find -lc
  collect2: error: ld returned 1 exit status

Add CONFIG_CC_CAN_LINK_STATIC, and make CONFIG_BPFILTER_UMH depend
on it.

Reported-by: default avatarValdis Kletnieks <valdis.kletnieks@vt.edu>
Change-Id: I0d2a71e263fccc0b9ffdcbf1ad374db5e85a2d76
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent c81e05c4

init/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -49,6 +49,11 @@ config CC_CAN_LINK 
	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(m64-flag)) if 64BIT

	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(m32-flag))



config CC_CAN_LINK_STATIC

	bool

	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) -static $(m64-flag)) if 64BIT

	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) -static $(m32-flag))



config CC_HAS_ASM_GOTO

	def_bool $(success,$(srctree)/scripts/gcc-goto.sh $(CC))

net/bpfilter/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ menuconfig BPFILTER 
if BPFILTER

config BPFILTER_UMH

	tristate "bpfilter kernel module with user mode helper"

	depends on CC_CAN_LINK

	depends on CC_CAN_LINK_STATIC

	default m

	help

	  This builds bpfilter kernel module with embedded user mode helper