- add and use BR2_BZCAT config option.

[buildroot-mgba.git] / package / strace / strace.mk

diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index cae5463b8eb0d3a686829febca429da7f32a9bf5..f4e8dfb9f24e47d35fc2fe6eb80b8de395012302 100644 (file)
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -3,10 +3,10 @@
 # strace
 #
 #############################################################
-STRACE_VER:=4.5.7
+STRACE_VER:=4.5.14
 STRACE_SOURCE:=strace-$(STRACE_VER).tar.bz2
-STRACE_SITE:=http://aleron.dl.sourceforge.net/sourceforge/strace
-STRACE_CAT:=bzcat
+STRACE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/strace
+STRACE_CAT:=$(BZCAT)
 STRACE_DIR:=$(BUILD_DIR)/strace-$(STRACE_VER)
 
 
@@ -16,16 +16,18 @@ $(DL_DIR)/$(STRACE_SOURCE):
 strace-source: $(DL_DIR)/$(STRACE_SOURCE)
 
 $(STRACE_DIR)/.unpacked: $(DL_DIR)/$(STRACE_SOURCE)
-       $(STRACE_CAT) $(DL_DIR)/$(STRACE_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+       $(STRACE_CAT) $(DL_DIR)/$(STRACE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+       toolchain/patch-kernel.sh $(STRACE_DIR) package/strace strace\*.patch
        touch $(STRACE_DIR)/.unpacked
 
 $(STRACE_DIR)/.configured: $(STRACE_DIR)/.unpacked
        (cd $(STRACE_DIR); rm -rf config.cache; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
+               aaa_ac_cv_header_linux_if_packet_h=yes \
                ./configure \
-               --target=$(GNU_TARGET_NAME) \
-               --host=$(GNU_TARGET_NAME) \
+               --target=$(REAL_GNU_TARGET_NAME) \
+               --host=$(REAL_GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \
                --prefix=/usr \
                --exec-prefix=/usr \
@@ -40,7 +42,7 @@ $(STRACE_DIR)/.configured: $(STRACE_DIR)/.unpacked
                $(DISABLE_NLS) \
                $(DISABLE_LARGEFILE) \
        );
-       touch  $(STRACE_DIR)/.configured
+       touch $(STRACE_DIR)/.configured
 
 $(STRACE_DIR)/strace: $(STRACE_DIR)/.configured
        $(MAKE) CC=$(TARGET_CC) -C $(STRACE_DIR)
@@ -48,6 +50,11 @@ $(STRACE_DIR)/strace: $(STRACE_DIR)/.configured
 $(TARGET_DIR)/usr/bin/strace: $(STRACE_DIR)/strace
        install -c $(STRACE_DIR)/strace $(TARGET_DIR)/usr/bin/strace
        $(STRIP) $(TARGET_DIR)/usr/bin/strace > /dev/null 2>&1
+ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y)
+       mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
+       install -c $(TARGET_DIR)/usr/bin/strace \
+               $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/strace
+endif
 
 strace: uclibc $(TARGET_DIR)/usr/bin/strace 
 
@@ -58,3 +65,11 @@ strace-dirclean:
        rm -rf $(STRACE_DIR) 
 
 
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_STRACE)),y)
+TARGETS+=strace
+endif