bsdiff: convert to gentargets

[Peter: cleanup build, install and uninstall targets]
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Martin Banky 2010-09-26 00:13:55 -07:00 committed by Peter Korsgaard
parent 85fac9e0c8
commit d4f1332110
2 changed files with 33 additions and 56 deletions

24
CHANGES
View File

@ -18,18 +18,18 @@
New packages: xz New packages: xz
Updated/fixed packages: alsa-lib, at, avahi, berkeleydb, bind, Updated/fixed packages: alsa-lib, at, avahi, berkeleydb, bind,
bmon, boa, bridge-utils, busybox, dbus, dmraid, docker, dropbear, bmon, boa, bridge-utils, bsdiff, busybox, dbus, dmraid,
e2fsprogs, expat, ezxml, fbset, freetype, gawk, gvfs, haserl, docker, dropbear, e2fsprogs, expat, ezxml, fbset, freetype,
hostapd, ifplugd, iperf, iproute2, iptables, jpeg, kexec, gawk, gvfs, haserl, hostapd, ifplugd, iperf, iproute2,
kismet, less, libcurl, libdnet, libevent, libglade, libgtk2, iptables, jpeg, kexec, kismet, less, libcurl, libdnet,
libiconv, libidn, libmms, libnl, liboil, libpcap, libpng, libevent, libglade, libgtk2, libiconv, libidn, libmms, libnl,
libungif, libxml2, libxslt, lighttpd, lite, m4, mdadm, liboil, libpcap, libpng, libungif, libxml2, libxslt, lighttpd,
metacity, mtd-utils, mysql_client, nano, nbd, ncftp, neon, lite, m4, mdadm, metacity, mtd-utils, mysql_client, nano, nbd,
netperf, ntfsprogs, ntp, openntpd, openssh, openvpn, oprofile, ncftp, neon, netperf, ntfsprogs, ntp, openntpd, openssh,
pango, pcre, php, prboom, radvd, qt, samba, sdl_mixer, openvpn, oprofile, pango, pcre, php, prboom, radvd, qt, samba,
sdl_sound, shared-mime-info, speex, sqlite, squashfs, strace, sdl_mixer, sdl_sound, shared-mime-info, speex, sqlite,
taglib, tcpdump, tiff, tn5250, udev, udpcast, usbmount, squashfs, strace, taglib, tcpdump, tiff, tn5250, udev,
usbutils, which, xlib_libX11, zlib udpcast, usbmount, usbutils, which, xlib_libX11, zlib
Deprecated packages: lzma Deprecated packages: lzma

View File

@ -3,52 +3,29 @@
# bsdiff # bsdiff
# #
############################################################# #############################################################
BSDIFF_VERSION:=4.3 BSDIFF_VERSION = 4.3
BSDIFF_SOURCE:=bsdiff-$(BSDIFF_VERSION).tar.gz BSDIFF_SOURCE = bsdiff-$(BSDIFF_VERSION).tar.gz
BSDIFF_SITE:=http://www.daemonology.net/bsdiff BSDIFF_SITE = http://www.daemonology.net/bsdiff
BSDIFF_DIR:=$(BUILD_DIR)/bsdiff-$(BSDIFF_VERSION) BSDIFF_DEPENDENCIES = bzip2
BSDIFF_BINARY:=bsdiff
BSDIFF_TARGET_BINARY:=usr/bin/bsdiff
BSDIFF_ZCAT=$(ZCAT)
$(DL_DIR)/$(BSDIFF_SOURCE): define BSDIFF_BUILD_CMDS
$(call DOWNLOAD,$(BSDIFF_SITE),$(BSDIFF_SOURCE)) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -lbz2 \
$(@D)/bsdiff.c -o $(@D)/bsdiff
$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -lbz2 \
$(@D)/bspatch.c -o $(@D)/bspatch
endef
$(BSDIFF_DIR)/.source: $(DL_DIR)/$(BSDIFF_SOURCE) define BSDIFF_INSTALL_TARGET_CMDS
$(BSDIFF_ZCAT) $(DL_DIR)/$(BSDIFF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - install -D -m 755 $(@D)/bsdiff $(TARGET_DIR)/usr/bin/bsdiff
touch $(BSDIFF_DIR)/.source install -D -m 755 $(@D)/bspatch $(TARGET_DIR)/usr/bin/bspatch
endef
$(BSDIFF_DIR)/$(BSDIFF_BINARY): $(BSDIFF_DIR)/.source define BSDIFF_UNINSTALL_TARGET_CMDS
(cd $(BSDIFF_DIR); \ rm -f $(TARGET_DIR)/usr/bin/bsdiff $(TARGET_DIR)/usr/bin/bspatch
$(TARGET_CONFIGURE_ARGS) \ endef
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CC) -L $(STAGING_DIR)/lib -lbz2 \
$(TARGET_CFLAGS) bsdiff.c -o bsdiff; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CC) -L $(STAGING_DIR)/lib -lbz2 \
$(TARGET_CFLAGS) bspatch.c -o bspatch; \
)
$(TARGET_DIR)/$(BSDIFF_TARGET_BINARY): $(BSDIFF_DIR)/$(BSDIFF_BINARY) define BSDIFF_CLEAN_CMDS
cp -dpf $(BSDIFF_DIR)/bsdiff $(TARGET_DIR)/usr/bin/. rm -f $(@D)/bsdiff $(@D)/bspatch
cp -dpf $(BSDIFF_DIR)/bspatch $(TARGET_DIR)/usr/bin/. endef
bsdiff: bzip2 $(TARGET_DIR)/$(BSDIFF_TARGET_BINARY) $(eval $(call GENTARGETS,package,bsdiff))
bsdiff-source: $(DL_DIR)/$(BSDIFF_SOURCE)
bsdiff-clean:
-rm $(TARGET_DIR)/usr/bin/{bsdiff,bspatch}
-rm $(BSDIFF_DIR)/{bsdiff,bspatch}
bsdiff-dirclean:
rm -rf $(BSDIFF_DIR)
#############################################################
#
# Toplevel Makefile options
#
#############################################################
ifeq ($(BR2_PACKAGE_BSDIFF),y)
TARGETS+=bsdiff
endif