[Buildroot] [git commit] dmalloc: fix static build

Thomas Petazzoni thomas.petazzoni at free-electrons.com
Sat Jul 2 13:54:43 UTC 2016


commit: https://git.buildroot.net/buildroot/commit/?id=b851be9bdcd85c22b380a66e5ffa19d02a360c4b
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

For example coldfire uses FLAT binaries, which are statically
build. Fixes following autobuild failure:
http://autobuild.buildroot.net/results/cc4233a4c3f92275a4071c172330c920c35219ca/

Signed-off-by: Waldemar Brodkorb <wbx at openadk.org>
[Thomas: use an intermediate variable rather than duplicating code.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
---
 package/dmalloc/dmalloc.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
index f87ae17..ffa9a39 100644
--- a/package/dmalloc/dmalloc.mk
+++ b/package/dmalloc/dmalloc.mk
@@ -56,8 +56,14 @@ define DMALLOC_INSTALL_STAGING_CMDS
 		-C $(@D) install
 endef
 
-define DMALLOC_INSTALL_TARGET_CMDS
+ifeq ($(BR2_STATIC_LIBS),)
+define DMALLOC_INSTALL_SHARED_LIB
 	cp -dpf $(STAGING_DIR)/usr/lib/libdmalloc*.so $(TARGET_DIR)/usr/lib
+endef
+endif
+
+define DMALLOC_INSTALL_TARGET_CMDS
+	$(DMALLOC_INSTALL_SHARED_LIB)
 	cp -dpf $(STAGING_DIR)/usr/bin/dmalloc $(TARGET_DIR)/usr/bin/dmalloc
 endef
 


More information about the buildroot mailing list