summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Banky <martin.banky@gmail.com>2010-10-08 08:43:03 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-11-05 13:00:00 (GMT)
commitc107a15e92c642ab81737b3faf58345e692feadf (patch)
tree1849a0072d075d0a11f017ae925a04e0233db914
parented720e8825fb028c262bff5bdf9a85eb41df95ae (diff)
downloadbuildroot-c107a15e92c642ab81737b3faf58345e692feadf.tar.gz
buildroot-c107a15e92c642ab81737b3faf58345e692feadf.tar.bz2
sed: convert to autotargets
Signed-off-by: Martin Banky <Martin.Banky@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES2
-rw-r--r--package/sed/sed.mk83
2 files changed, 11 insertions, 74 deletions
diff --git a/CHANGES b/CHANGES
index 1fdca97..7e841aa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -46,7 +46,7 @@
openssl, openvpn, oprofile, pango, patch, pcre, php,
pkg-config, portmap, pppd, pptp-linux, prboom, proftpd, radvd,
rdesktop, readline, rp-pppoe, ruby, qt, quagga, samba, sawman,
- sdl_mixer, sdl_sound, setserial, shared-mime-info, speex,
+ sdl_mixer, sdl_sound, sed, setserial, shared-mime-info, speex,
sqlite, squashfs, startup-notification, strace, sylpheed,
sysstat, taglib, tcpdump, thttpd, tiff, tn5250, torsmo, udev,
udpcast, usbmount, usbutils, vsftpd, vtun, which,
diff --git a/package/sed/sed.mk b/package/sed/sed.mk
index d6f53be..1a313eb 100644
--- a/package/sed/sed.mk
+++ b/package/sed/sed.mk
@@ -3,41 +3,11 @@
# sed
#
#############################################################
-SED_VERSION:=4.2.1
-SED_SOURCE:=sed-$(SED_VERSION).tar.gz
-SED_SITE:=$(BR2_GNU_MIRROR)/sed
-SED_CAT:=$(ZCAT)
-SED_DIR2:=$(BUILD_DIR)/sed-$(SED_VERSION)
-SED_BINARY:=sed/sed
-SED_TARGET_BINARY:=bin/sed
-ifeq ($(BR2_LARGEFILE),y)
-SED_CPPFLAGS=-D_FILE_OFFSET_BITS=64
-endif
+SED_VERSION = 4.2.1
+SED_SOURCE = sed-$(SED_VERSION).tar.gz
+SED_SITE = $(BR2_GNU_MIRROR)/sed
-$(DL_DIR)/$(SED_SOURCE):
- mkdir -p $(DL_DIR)
- $(call DOWNLOAD,$(SED_SITE),$(SED_SOURCE))
-
-sed-source: $(DL_DIR)/$(SED_SOURCE)
-
-$(SED_DIR2)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
- $(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(CONFIG_UPDATE) $(SED_DIR2)/build-aux
- touch $@
-
-$(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked
- (cd $(SED_DIR2); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- CPPFLAGS="$(SED_CPPFLAGS)" \
- ./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 \
+SED_CONF_OPT = --bindir=/usr/bin \
--libdir=/lib \
--libexecdir=/usr/lib \
--sysconfdir=/etc \
@@ -45,45 +15,12 @@ $(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked
--localstatedir=/var \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --include=$(STAGING_DIR)/usr/include \
- $(DISABLE_NLS) \
- )
- touch $@
-
-$(SED_DIR2)/$(SED_BINARY): $(SED_DIR2)/.configured
- $(MAKE) -C $(SED_DIR2)
-
-# This stuff is needed to work around GNU make deficiencies
-sed-target_binary: $(SED_DIR2)/$(SED_BINARY)
- @if [ -L $(TARGET_DIR)/$(SED_TARGET_BINARY) ]; then \
- rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); \
- fi
-
- @if [ ! -f $(SED_DIR2)/$(SED_BINARY) \
- -o $(TARGET_DIR)/$(SED_TARGET_BINARY) \
- -ot $(SED_DIR2)/$(SED_BINARY) ]; then \
- set -x; \
- $(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(SED_DIR2) install; \
- mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/; \
- rm -rf $(TARGET_DIR)/share/locale; \
- rm -rf $(TARGET_DIR)/usr/share/doc; \
- fi
+ --include=$(STAGING_DIR)/usr/include
-sed: sed-target_binary
+define SED_MOVE_BINARY
+ mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/
+endef
-sed-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(SED_DIR2) uninstall
- -$(MAKE) -C $(SED_DIR2) clean
+SED_POST_INSTALL_TARGET_HOOKS = SED_MOVE_BINARY
-sed-dirclean:
- rm -rf $(SED_DIR2)
-
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_SED),y)
-TARGETS+=sed
-endif
+$(eval $(call AUTOTARGETS,package,sed))