module-init-tools: Don't cross-build static binaries

When building the native version, I get errors from ld complaining
about not being able to find a static libc.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
This commit is contained in:
Jeff Dike 2010-06-01 12:34:07 -04:00 committed by Richard Purdie
parent 3161c9b15a
commit fe4e6fc997
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,27 @@
# Building a native, statically-linked insmod can result in ld failing because
# it can't find a static libc. A native, static insmod is unnecessary anyway,
# so this patch just removes it.
#
# - jdike@linux.intel.com
Index: module-init-tools-3.2.2/Makefile.am
===================================================================
--- module-init-tools-3.2.2.orig/Makefile.am 2010-05-26 15:43:16.000000000 -0400
+++ module-init-tools-3.2.2/Makefile.am 2010-05-26 16:04:06.232990785 -0400
@@ -5,16 +5,10 @@ rmmod_SOURCES = rmmod.c testing.h
depmod_SOURCES = depmod.c moduleops.c tables.c zlibsupport.c depmod.h moduleops.h tables.h list.h testing.h zlibsupport.h
modinfo_SOURCES = modinfo.c zlibsupport.c testing.h zlibsupport.h
-insmod_static_SOURCES = insmod.c
-insmod_static_LDFLAGS = -static
-# We don't want the $(zlib_flags) here: that makes a dynamic executable
-insmod_static_LDADD =
-
EXTRA_insmod_SOURCES = backwards_compat.c
EXTRA_lsmod_SOURCES = backwards_compat.c
EXTRA_modprobe_SOURCES = backwards_compat.c
EXTRA_rmmod_SOURCES = backwards_compat.c
-EXTRA_insmod_static_SOURCES = backwards_compat.c
EXTRA_depmod_SOURCES = moduleops_core.c
EXTRA_modinfo_SOURCES = backwards_compat.c

View File

@ -1,8 +1,10 @@
require module-init-tools.inc
PR = "r3"
PR = "r4"
inherit cross
PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
SRC_URI += "file://no-static-binaries.patch;patch=1"
EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
do_install_append () {