Commit 9b34286b authored by cmchao's avatar cmchao Committed by Thomas Petazzoni
Browse files

gzip : convert to autotools infrastructure & bump to 1.4 



Changes by Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

     * Installation to target is the default
     * No installation to staging is the default

Signed-off-by: default avatarcmchao <cmchao@gmail.com>
parent 6e9655a5

package/gzip/gzip-1.3.12-rename-futimens.patch

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
---

 gzip.c        |    2 +-

 lib/utimens.c |    4 ++--

 lib/utimens.h |    2 +-

 3 files changed, 4 insertions(+), 4 deletions(-)



Index: gzip-1.3.12/gzip.c

===================================================================

--- gzip-1.3.12.orig/gzip.c

+++ gzip-1.3.12/gzip.c

@@ -1637,7 +1637,7 @@

 	}

       }

 

-    if (futimens (ofd, ofname, timespec) != 0)

+    if (gz_futimens (ofd, ofname, timespec) != 0)

       {

 	int e = errno;

 	WARN ((stderr, "%s: ", program_name));

Index: gzip-1.3.12/lib/utimens.c

===================================================================

--- gzip-1.3.12.orig/lib/utimens.c

+++ gzip-1.3.12/lib/utimens.c

@@ -75,7 +75,7 @@

    Return 0 on success, -1 (setting errno) on failure.  */

 

 int

-futimens (int fd ATTRIBUTE_UNUSED,

+gz_futimens (int fd ATTRIBUTE_UNUSED,

 	  char const *file, struct timespec const timespec[2])

 {

   /* Some Linux-based NFS clients are buggy, and mishandle time stamps

@@ -185,5 +185,5 @@

 int

 utimens (char const *file, struct timespec const timespec[2])

 {

-  return futimens (-1, file, timespec);

+  return gz_futimens (-1, file, timespec);

 }

Index: gzip-1.3.12/lib/utimens.h

===================================================================

--- gzip-1.3.12.orig/lib/utimens.h

+++ gzip-1.3.12/lib/utimens.h

@@ -1,3 +1,3 @@

 #include <time.h>

-int futimens (int, char const *, struct timespec const [2]);

+int gz_futimens (int, char const *, struct timespec const [2]);

 int utimens (char const *, struct timespec const [2]);

package/gzip/gzip.mk

+2 −53
Original line number Diff line number Diff line
@@ -3,59 +3,8 @@ 
# gzip

#

#############################################################

GZIP_VERSION:=1.3.12

GZIP_VERSION:=1.4

GZIP_SOURCE:=gzip-$(GZIP_VERSION).tar.gz

GZIP_SITE:=$(BR2_GNU_MIRROR)/gzip

GZIP_DIR:=$(BUILD_DIR)/gzip-$(GZIP_VERSION)

GZIP_CAT:=$(ZCAT)

GZIP_BINARY:=$(GZIP_DIR)/gzip

GZIP_TARGET_BINARY:=$(TARGET_DIR)/bin/zmore



$(DL_DIR)/$(GZIP_SOURCE):

	 $(call DOWNLOAD,$(GZIP_SITE),$(GZIP_SOURCE))



gzip-source: $(DL_DIR)/$(GZIP_SOURCE)



$(GZIP_DIR)/.unpacked: $(DL_DIR)/$(GZIP_SOURCE)

	$(GZIP_CAT) $(DL_DIR)/$(GZIP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

	toolchain/patch-kernel.sh $(GZIP_DIR) package/gzip gzip\*.patch

	touch $(GZIP_DIR)/.unpacked



$(GZIP_DIR)/.configured: $(GZIP_DIR)/.unpacked

	(cd $(GZIP_DIR); rm -rf config.cache; \

		$(TARGET_CONFIGURE_OPTS) \

		$(TARGET_CONFIGURE_ARGS) \

		./configure $(QUIET) \

		--target=$(GNU_TARGET_NAME) \

		--host=$(GNU_TARGET_NAME) \

		--build=$(GNU_HOST_NAME) \

		--prefix=/usr \

		--exec-prefix=/ \

		$(DISABLE_NLS) \

		$(DISABLE_LARGEFILE) \

	)

	touch $(GZIP_DIR)/.configured



$(GZIP_BINARY): $(GZIP_DIR)/.configured

	$(MAKE) CC=$(TARGET_CC) -C $(GZIP_DIR)



$(GZIP_TARGET_BINARY): $(GZIP_BINARY)

	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GZIP_DIR) install-strip



gzip: $(GZIP_TARGET_BINARY)



gzip-clean:

	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GZIP_DIR) uninstall

	-$(MAKE) -C $(GZIP_DIR) clean



gzip-dirclean:

	rm -rf $(GZIP_DIR)



#############################################################

#

# Toplevel Makefile options

#

#############################################################

ifeq ($(BR2_PACKAGE_GZIP),y)

TARGETS+=gzip

endif
 
$(eval $(call AUTOTARGETS,package,gzip))