summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-11-18 21:50:25 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2010-11-18 21:50:25 +0100
commitadb0dfff6fb7da35b4ea79008da2aa1e7b8aadbe (patch)
tree7d7ac15714e7e5db47127be3b97dda048e5ac873
parenta417003749a4a9c9a4c6a78b7b962f79f1003278 (diff)
downloadbuildroot-novena-adb0dfff6fb7da35b4ea79008da2aa1e7b8aadbe.tar.gz
buildroot-novena-adb0dfff6fb7da35b4ea79008da2aa1e7b8aadbe.zip
mtd-utils: ensure libmtd.a always gets built
Closes #2785 If only ubi* is selected, libmtd.a wouldn't get built breaking the build. Based on patch by Patrick Ziegler <patrick.ziegler@fh-kl.de> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES4
-rw-r--r--package/mtd/mtd.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index e07c798eb..c73fdbf54 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,11 +2,13 @@
Fixes all over the tree.
- Updated/fixed packages: libglib2, module-init-tools, qt
+ Updated/fixed packages: libglib2, module-init-tools,
+ mtd-utils, qt
Issues resolved (http://bugs.uclibc.org):
#2479: host-module-init-tools 3.11 fails to build
+ #2785: mtd-utils build fails due to missing libmtd
#2809: failed to compile libglib2
#2821: [PATCH] Patch for JavaScriptCore in QtWebKit module
#2827: qt-4.7.0-pthread_getattr_np.patch invalid for qt 4.6...
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index ae2d433de..ec8c663d0 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -68,14 +68,12 @@ MTD_MAKE_COMMON_FLAGS = \
$(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \
WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1
-ifneq ($(MTD_TARGETS_y),)
define MTD_TARGETS_BUILD
$(MAKE1) $(MTD_MAKE_COMMON_FLAGS) \
BUILDDIR=$(@D) \
-C $(@D) \
- $(addprefix $(@D)/, $(MTD_TARGETS_y))
+ $(addprefix $(@D)/, lib/libmtd.a $(MTD_TARGETS_y))
endef
-endif
ifneq ($(MTD_TARGETS_UBI_y),)
define MTD_TARGETS_UBI_BUILD