diff options
| author | Jeff Dike <jdike@linux.intel.com> | 2010-06-01 12:34:07 -0400 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-03 12:28:10 +0100 |
| commit | fe4e6fc997431751968d51e0bd07098ac51ac7cb (patch) | |
| tree | d0c4f02913be337604f865cebebd189f860794eb /meta | |
| parent | 3161c9b15a39e552b383c704851edead8435365c (diff) | |
| download | openembedded-core-fe4e6fc997431751968d51e0bd07098ac51ac7cb.tar.gz openembedded-core-fe4e6fc997431751968d51e0bd07098ac51ac7cb.tar.bz2 openembedded-core-fe4e6fc997431751968d51e0bd07098ac51ac7cb.zip | |
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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/module-init-tools/files/no-static-binaries.patch | 27 | ||||
| -rw-r--r-- | meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb | 4 |
2 files changed, 30 insertions, 1 deletions
diff --git a/meta/packages/module-init-tools/files/no-static-binaries.patch b/meta/packages/module-init-tools/files/no-static-binaries.patch new file mode 100644 index 0000000000..a9fbb27bf6 --- /dev/null +++ b/meta/packages/module-init-tools/files/no-static-binaries.patch @@ -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 + diff --git a/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb b/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb index a86245fde3..02a69193a7 100644 --- a/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb +++ b/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb @@ -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 () { |