diff options
| -rw-r--r-- | patches/hexedit-1.2.12/0001-Makefile.in-use-CPPFLAGS.patch | 46 | ||||
| -rw-r--r-- | patches/hexedit-1.2.12/0002-Makefile.in-add-DESTDIR-support.patch | 35 | ||||
| -rw-r--r-- | patches/hexedit-1.2.12/series | 2 | ||||
| l--------- | patches/hexedit-1.4.2/autogen.sh | 1 | ||||
| -rw-r--r-- | rules/hexedit.make | 13 |
5 files changed, 9 insertions, 88 deletions
diff --git a/patches/hexedit-1.2.12/0001-Makefile.in-use-CPPFLAGS.patch b/patches/hexedit-1.2.12/0001-Makefile.in-use-CPPFLAGS.patch deleted file mode 100644 index f96f521bb..000000000 --- a/patches/hexedit-1.2.12/0001-Makefile.in-use-CPPFLAGS.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3a07e5675909bcd1e204fef8dc8239cac4564c23 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Mon, 27 Jul 2009 22:10:55 +0200 -Subject: [PATCH 1/3] [Makefile.in] use CPPFLAGS - -Preprocessor flags should use CPPFLAGS, not CFLAGS (which are for the c -compiler). The patch below helps (cross)build systems to feed the right -options to the makefiles. - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- -# 20091228 rsc: mailed to pixel@rigaux.org - - Makefile.in | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index a87d441..ede5e1a 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -7,6 +7,7 @@ SHELL = /bin/sh - - CC = @CC@ - CFLAGS = @CFLAGS@ -+CPPFLAGS = @CPPFLAGS@ - - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ -@@ -26,12 +27,12 @@ OBJS = $(SRCS:.c=.o) - .SUFFIXES: .c .o - - .c.o: -- $(CC) $(DEFS) $(CFLAGS) -c $< -+ $(CC) $(DEFS) $(CFLAGS) $(CPPFLAGS) -c $< - - all: $(PRODUCT) - - $(PRODUCT): $(OBJS) -- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - clean: - rm -rf *~ *.o core *.cache config.status config.log $(PRODUCT) --- -1.6.3.3 - diff --git a/patches/hexedit-1.2.12/0002-Makefile.in-add-DESTDIR-support.patch b/patches/hexedit-1.2.12/0002-Makefile.in-add-DESTDIR-support.patch deleted file mode 100644 index 3b34d1710..000000000 --- a/patches/hexedit-1.2.12/0002-Makefile.in-add-DESTDIR-support.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7d42b8aa8baa9828e6511a694086e175cc6caf79 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Mon, 27 Jul 2009 22:15:31 +0200 -Subject: [PATCH 2/3] [Makefile.in] add DESTDIR support - -Distributions usually use DESTDIR to specify that 'make install' shall -install into a temporary directory. Add DESTDIR support to the -makefiles. - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- -# 20091228 rsc: mailed to pixel@rigaux.org - - Makefile.in | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index ede5e1a..5a61be8 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -41,7 +41,7 @@ distclean: clean - rm -f Makefile config.h - - install: $(PRODUCT) -- $(INSTALL) -d -m 755 $(bindir) -- $(INSTALL) -s -m 755 $(PRODUCT) $(bindir) -- $(INSTALL) -d -m 755 $(mandir)/man1 -- $(INSTALL) -m 644 $(PRODUCT).1 $(mandir)/man1 -+ $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) -+ $(INSTALL) -s -m 755 $(PRODUCT) $(DESTDIR)$(bindir) -+ $(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1 -+ $(INSTALL) -m 644 $(PRODUCT).1 $(DESTDIR)$(mandir)/man1 --- -1.6.3.3 - diff --git a/patches/hexedit-1.2.12/series b/patches/hexedit-1.2.12/series deleted file mode 100644 index 299a9d82f..000000000 --- a/patches/hexedit-1.2.12/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-Makefile.in-use-CPPFLAGS.patch -0002-Makefile.in-add-DESTDIR-support.patch diff --git a/patches/hexedit-1.4.2/autogen.sh b/patches/hexedit-1.4.2/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/hexedit-1.4.2/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/rules/hexedit.make b/rules/hexedit.make index 8a4fba058..5253f2a50 100644 --- a/rules/hexedit.make +++ b/rules/hexedit.make @@ -18,11 +18,11 @@ PACKAGES-$(PTXCONF_HEXEDIT) += hexedit # # Paths and names # -HEXEDIT_VERSION := 1.2.12 -HEXEDIT_MD5 := 0d2f48610006278cd93359fea9a06d5c +HEXEDIT_VERSION := 1.4.2 +HEXEDIT_MD5 := 6fa1ce9c8c0306f3392f1ea002c80370 HEXEDIT := hexedit-$(HEXEDIT_VERSION) -HEXEDIT_SUFFIX := src.tgz -HEXEDIT_URL := http://rigaux.org/$(HEXEDIT).$(HEXEDIT_SUFFIX) +HEXEDIT_SUFFIX := tar.gz +HEXEDIT_URL := https://github.com/pixel/hexedit/archive/$(HEXEDIT_VERSION).$(HEXEDIT_SUFFIX) HEXEDIT_SOURCE := $(SRCDIR)/$(HEXEDIT).$(HEXEDIT_SUFFIX) HEXEDIT_DIR := $(BUILDDIR)/$(HEXEDIT) HEXEDIT_LICENSE := GPL-2.0+ @@ -30,7 +30,10 @@ HEXEDIT_LICENSE := GPL-2.0+ # # autoconf # -HEXEDIT_CONF_TOOL := autoconf +HEXEDIT_CONF_TOOL := autoconf +HEXEDIT_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + $(GLOBAL_LARGE_FILE_OPTION) # ---------------------------------------------------------------------------- # Target-Install |