Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: cmchao <cmchao@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 02/19] dmalloc : convert to autotools infrastructure
Date: Wed, 16 Jun 2010 19:47:04 +0800	[thread overview]
Message-ID: <1276688841-5252-3-git-send-email-cmchao@gmail.com> (raw)
In-Reply-To: <1276688841-5252-1-git-send-email-cmchao@gmail.com>


Signed-off-by: cmchao <cmchao@gmail.com>
---
 package/dmalloc/dmalloc.mk |   95 ++++++++++++--------------------------------
 1 files changed, 26 insertions(+), 69 deletions(-)

diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
index dd83583..bf09868 100644
--- a/package/dmalloc/dmalloc.mk
+++ b/package/dmalloc/dmalloc.mk
@@ -6,100 +6,57 @@
 DMALLOC_VERSION:=5.4.3
 DMALLOC_SOURCE:=dmalloc-$(DMALLOC_VERSION).tgz
 DMALLOC_SITE:=http://dmalloc.com/releases
-DMALLOC_DIR:=$(BUILD_DIR)/dmalloc-$(DMALLOC_VERSION)
-DMALLOC_CAT:=$(ZCAT)
-DMALLOC_BINARY:=dmalloc
 DMALLOC_TARGET_BINARY:=usr/bin/dmalloc
 
-$(DL_DIR)/$(DMALLOC_SOURCE):
-	 $(call DOWNLOAD,$(DMALLOC_SITE),$(DMALLOC_SOURCE))
-
-dmalloc-source: $(DL_DIR)/$(DMALLOC_SOURCE)
-
-$(DMALLOC_DIR)/.unpacked: $(DL_DIR)/$(DMALLOC_SOURCE)
-	$(DMALLOC_CAT) $(DL_DIR)/$(DMALLOC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(DMALLOC_DIR) package/dmalloc dmalloc\*.patch
-	$(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(DMALLOC_DIR)/configure
-	$(SED) 's/(ld -/($${LD-ld} -/' $(DMALLOC_DIR)/configure
-	$(SED) 's/'\''ld -/"$${LD-ld}"'\'' -/' $(DMALLOC_DIR)/configure
-	-$(SED) 's/ar cr/$$(AR) cr/' $(DMALLOC_DIR)/Makefile.in
-	touch $@
+DMALLOC_INSTALL_STAGING = YES
+DMALLOC_INSTALL_TARGET = YES
+DMALLOC_CONF_OPT:= --enable-shlib
 
 ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
-DMALLOC_CONFIG_ARGS:=--enable-cxx
+DMALLOC_CONF_OPT+=--enable-cxx
 else
-DMALLOC_CONFIG_ARGS:=--disable-cxx
+DMALLOC_CONF_OPT+=--disable-cxx
 endif
 
 ifeq ($(BR2_PTHREADS_NONE),y)
-DMALLOC_CONFIG_ARGS+=--disable-threads
+DMALLOC_CONF_OPT+=--disable-threads
 else
-DMALLOC_CONFIG_ARGS+=--enable-threads
+DMALLOC_CONF_OPT+=--enable-threads
 endif
 
+define DMALLOC_POST_PATCH
+	$(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure
+	$(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure
+	$(SED) 's/'\''ld -/"$${LD-ld}"'\'' -/' $(@D)/configure
+	$(SED) 's/ar cr/$$(AR) cr/' $(@D)/Makefile.in
+endef
 
+DMALLOC_POST_PATCH_HOOKS += DMALLOC_POST_PATCH
 
-$(DMALLOC_DIR)/.configured: $(DMALLOC_DIR)/.unpacked
-	(cd $(DMALLOC_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		CFLAGS="-g" \
-		LDFLAGS="-g" \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--includedir=/usr/include \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		--enable-shlib \
-		$(DMALLOC_CONFIG_ARGS) \
-	)
-	touch $@
-
-$(DMALLOC_DIR)/$(DMALLOC_BINARY): $(DMALLOC_DIR)/.configured
-	$(MAKE) -C $(DMALLOC_DIR)
-
-$(TARGET_DIR)/$(DMALLOC_TARGET_BINARY): $(DMALLOC_DIR)/$(DMALLOC_BINARY)
-	# both DESTDIR and PREFIX are ignored..
+# both DESTDIR and PREFIX are ignored..
+define DMALLOC_INSTALL_STAGING_CMDS
 	$(MAKE) includedir="$(STAGING_DIR)/usr/include" \
 		bindir="$(STAGING_DIR)/usr/bin" \
 		libdir="$(STAGING_DIR)/usr/lib" \
 		shlibdir="$(STAGING_DIR)/usr/lib" \
 		includedir="$(STAGING_DIR)/usr/share/info/" \
-		-C $(DMALLOC_DIR) install
-	(cd $(STAGING_DIR)/usr/lib; \
-		mv libdmalloc*.so $(TARGET_DIR)/usr/lib)
-	cp -dpf $(STAGING_DIR)/usr/bin/dmalloc $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
+		-C $(@D) install
+endef
+
+define DMALLOC_INSTALL_TARGET_CMDS
+	mv $(STAGING_DIR)/usr/lib/libdmalloc*.so $(TARGET_DIR)/usr/lib
+	cp -dpf $(STAGING_DIR)/$(DMALLOC_TARGET_BINARY) $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
 	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
+endef
 
-dmalloc: $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
 
-dmalloc-clean:
+define DMALLOC_CLEAN_CMDS
 	-rm -f $(TARGET_DIR)/usr/lib/libdmalloc*
 	-rm -f $(STAGING_DIR)/usr/lib/libdmalloc*
 	rm -f $(STAGING_DIR)/usr/include/dmalloc.h
 	rm -f $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
 	-$(MAKE) -C $(DMALLOC_DIR) clean
-
-dmalloc-dirclean:
-	rm -rf $(DMALLOC_DIR)
+endef
 
 
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_DMALLOC),y)
-TARGETS+=dmalloc
-endif
+$(eval $(call AUTOTARGETS,package,dmalloc))
-- 
1.7.0.4

  parent reply	other threads:[~2010-06-16 11:47 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 01/19] distcc : convert to autotools infrastructure & bump to 1.1-20100428 cmchao
2010-06-16 11:47 ` cmchao [this message]
2010-06-16 11:47 ` [Buildroot] [PATCH 03/19] fbv : convert to autotools infrastructure cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 04/19] links : convert to autotools infrastructure & bump to 1.01pre1-no-ssl cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 05/19] dialog : convert to autotools infrastructure & bump to 1.1-20100428 cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 06/19] berkeleydb : convert to autotools infrastructure & bump to 4.4.20 cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 07/19] dash : convert to autotools infrastructure & bump to 0.5.5.1 cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 08/19] diffutils : convert to autotools infrastructure cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 09/19] libfuse : convert to autotools infrastructure & bump to 2.8.4 cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 10/19] gzip : convert to autotools infrastructure & bump to 1.4 cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 11/19] make : convert to autotools infrastructure cmchao
2010-06-16 12:58   ` Paulius Zaleckas
2010-06-16 11:47 ` [Buildroot] [PATCH 12/19] quagga : convert to autotools infrastructure & bump to 0.99.12 cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 13/19] sdl_mixer : convert to autotools infrastructure & bump to 1.2.11 cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 14/19] sdl_ttf : convert to autotools infrastructure cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 15/19] sdl : convert to autotools infrastructure & bump to 1.2.14 cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 16/19] gmp : convert to autotools infrastructure & bump to 5.0.1 cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 17/19] libgpg-error : convert to autotools infrastructure & bump to 1.8 cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 18/19] liblockfile : convert to autotools infrastructure & bump to 1.08-4 cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 19/19] lrzsz : convert to autotools infrastructure cmchao
2010-06-16 17:13   ` Thomas Petazzoni
2010-06-16 20:43   ` Peter Korsgaard
2010-06-20 15:02 ` [Buildroot] [PATCH 00/19] Convert packages to new autotools Thomas Petazzoni

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=1276688841-5252-3-git-send-email-cmchao@gmail.com \
    --to=cmchao@gmail.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