From: Martin Banky <martin.banky@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 04/18] bsdiff: convert to gentargets
Date: Sun, 26 Sep 2010 00:13:55 -0700 [thread overview]
Message-ID: <1285485249-29212-4-git-send-email-Martin.Banky@gmail.com> (raw)
In-Reply-To: <1285485249-29212-1-git-send-email-Martin.Banky@gmail.com>
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/bsdiff/bsdiff.mk | 51 +++++++++++++--------------------------------
1 files changed, 15 insertions(+), 36 deletions(-)
diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk
index 62608e9..d450083 100644
--- a/package/bsdiff/bsdiff.mk
+++ b/package/bsdiff/bsdiff.mk
@@ -3,23 +3,13 @@
# bsdiff
#
#############################################################
-BSDIFF_VERSION:=4.3
-BSDIFF_SOURCE:=bsdiff-$(BSDIFF_VERSION).tar.gz
-BSDIFF_SITE:=http://www.daemonology.net/bsdiff
-BSDIFF_DIR:=$(BUILD_DIR)/bsdiff-$(BSDIFF_VERSION)
-BSDIFF_BINARY:=bsdiff
-BSDIFF_TARGET_BINARY:=usr/bin/bsdiff
-BSDIFF_ZCAT=$(ZCAT)
+BSDIFF_VERSION = 4.3
+BSDIFF_SOURCE = bsdiff-$(BSDIFF_VERSION).tar.gz
+BSDIFF_SITE = http://www.daemonology.net/bsdiff
+BSDIFF_DEPENDENCIES = bzip2
-$(DL_DIR)/$(BSDIFF_SOURCE):
- $(call DOWNLOAD,$(BSDIFF_SITE),$(BSDIFF_SOURCE))
-
-$(BSDIFF_DIR)/.source: $(DL_DIR)/$(BSDIFF_SOURCE)
- $(BSDIFF_ZCAT) $(DL_DIR)/$(BSDIFF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(BSDIFF_DIR)/.source
-
-$(BSDIFF_DIR)/$(BSDIFF_BINARY): $(BSDIFF_DIR)/.source
- (cd $(BSDIFF_DIR); \
+define BSDIFF_BUILD_CMDS
+ (cd $(@D); \
$(TARGET_CONFIGURE_ARGS) \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CC) -L $(STAGING_DIR)/lib -lbz2 \
@@ -28,27 +18,16 @@ $(BSDIFF_DIR)/$(BSDIFF_BINARY): $(BSDIFF_DIR)/.source
$(TARGET_CC) -L $(STAGING_DIR)/lib -lbz2 \
$(TARGET_CFLAGS) bspatch.c -o bspatch; \
)
+endef
-$(TARGET_DIR)/$(BSDIFF_TARGET_BINARY): $(BSDIFF_DIR)/$(BSDIFF_BINARY)
- cp -dpf $(BSDIFF_DIR)/bsdiff $(TARGET_DIR)/usr/bin/.
- cp -dpf $(BSDIFF_DIR)/bspatch $(TARGET_DIR)/usr/bin/.
-
-bsdiff: bzip2 $(TARGET_DIR)/$(BSDIFF_TARGET_BINARY)
+define BSDIFF_INSTALL_TARGET_CMDS
+ cp -dpf $(@D)/bsdiff $(TARGET_DIR)/usr/bin/bsdiff
+ cp -dpf $(@D)/bspatch $(TARGET_DIR)/usr/bin/bspatch
+endef
-bsdiff-source: $(DL_DIR)/$(BSDIFF_SOURCE)
-
-bsdiff-clean:
+define BSDIFF_CLEAN_CMDS
-rm $(TARGET_DIR)/usr/bin/{bsdiff,bspatch}
- -rm $(BSDIFF_DIR)/{bsdiff,bspatch}
-
-bsdiff-dirclean:
- rm -rf $(BSDIFF_DIR)
+ -rm $(@D)/{bsdiff,bspatch}
+endef
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_BSDIFF),y)
-TARGETS+=bsdiff
-endif
+$(eval $(call GENTARGETS,package,bsdiff))
--
1.7.3
next prev parent reply other threads:[~2010-09-26 7:13 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-26 7:13 [Buildroot] [PATCH 01/18] acpid: convert to gentargets and bump to 2.0.6 Martin Banky
2010-09-26 7:13 ` [Buildroot] [PATCH 02/18] axel: convert to gentargets and bump to 2.4 Martin Banky
2010-09-26 21:12 ` Peter Korsgaard
2010-09-26 7:13 ` [Buildroot] [PATCH 03/18] boa: convert to gentargets Martin Banky
2010-09-26 19:21 ` Peter Korsgaard
2010-09-26 7:13 ` Martin Banky [this message]
2010-09-26 19:54 ` [Buildroot] [PATCH 04/18] bsdiff: " Peter Korsgaard
2010-09-26 7:13 ` [Buildroot] [PATCH 05/18] boa: convert to autotargets Martin Banky
2010-09-26 19:55 ` Peter Korsgaard
2010-09-26 21:22 ` Martin Banky
2010-09-26 22:04 ` Peter Korsgaard
2010-09-26 7:13 ` [Buildroot] [PATCH 06/18] cvs: " Martin Banky
2010-09-30 12:34 ` Peter Korsgaard
2010-09-26 7:13 ` [Buildroot] [PATCH 07/18] dosfstools: convert to gentargets and bump to 3.0.10 Martin Banky
2010-09-26 20:26 ` Peter Korsgaard
2010-09-26 7:13 ` [Buildroot] [PATCH 08/18] ezxml: convert to gentargets Martin Banky
2010-09-26 12:35 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 09/18] fbset: " Martin Banky
2010-09-26 18:55 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 10/18] fconfig: convert to gentargets and bump to 20080329 Martin Banky
2010-09-29 20:15 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 11/18] gadgets-test: convert to gentargets Martin Banky
2010-09-29 20:27 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 12/18] hotplug: " Martin Banky
2010-09-26 20:14 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 13/18] hdparm: convert to gentargets and bump to 9.32 Martin Banky
2010-09-27 21:20 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 14/18] hwdata: convert to gentargets and bump to 0.230 Martin Banky
2010-09-26 20:35 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 15/18] liberation: convert to gentargets and bump to 1.06.0.20100721 Martin Banky
2010-09-29 20:30 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 16/18] lm-sensors: convert to gentargets and bump to 3.1.2 Martin Banky
2010-09-27 20:48 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 17/18] lockfile-progs: convert to gentargets and bump to 0.1.15 Martin Banky
2010-09-29 20:41 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 18/18] logrotate: convert to gentargets and bump to 3.7.9 Martin Banky
2010-09-26 20:54 ` Peter Korsgaard
2010-09-29 20:55 ` [Buildroot] [PATCH 01/18] acpid: convert to gentargets and bump to 2.0.6 Peter Korsgaard
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=1285485249-29212-4-git-send-email-Martin.Banky@gmail.com \
--to=martin.banky@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