Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] dmalloc: fix static build
Date: Sat, 2 Jul 2016 16:04:25 +0200	[thread overview]
Message-ID: <20160702160425.58b463bf@free-electrons.com> (raw)
In-Reply-To: <20160613060717.GA8502@waldemar-brodkorb.de>

Hello,

On Mon, 13 Jun 2016 08:07:17 +0200, Waldemar Brodkorb wrote:
> 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@openadk.org>
> ---
>  package/dmalloc/dmalloc.mk | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
> index 6eb87c6..18a6fa0 100644
> --- a/package/dmalloc/dmalloc.mk
> +++ b/package/dmalloc/dmalloc.mk
> @@ -58,11 +58,15 @@ define DMALLOC_INSTALL_STAGING_CMDS
>  		-C $(@D) install
>  endef
>  
> -define DMALLOC_INSTALL_TARGET_CMDS
>  ifeq ($(BR2_STATIC_LIBS),)
> +define DMALLOC_INSTALL_TARGET_CMDS
>  	cp -dpf $(STAGING_DIR)/usr/lib/libdmalloc*.so $(TARGET_DIR)/usr/lib
> -endif
>  	cp -dpf $(STAGING_DIR)/usr/bin/dmalloc $(TARGET_DIR)/usr/bin/dmalloc
>  endef
> +else
> +define DMALLOC_INSTALL_TARGET_CMDS
> +	cp -dpf $(STAGING_DIR)/usr/bin/dmalloc $(TARGET_DIR)/usr/bin/dmalloc
> +endef
> +endif

Instead of duplicating the code that installs the program, I've created
a temporary variable that does the library installation, and which only
gets defined if BR2_STATIC_LIBS is empty:

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

Applied with this modification. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

      reply	other threads:[~2016-07-02 14:04 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-13  6:07 [Buildroot] [PATCH] dmalloc: fix static build Waldemar Brodkorb
2016-07-02 14:04 ` Thomas Petazzoni [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160702160425.58b463bf@free-electrons.com \
    --to=thomas.petazzoni@free-electrons.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox