X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4cce3b1620d3ad13b15697efcce0f39f7cd5f51a..02f4867a492aa007738b3c298c9a73a42776ef7a:/package/uboot-envtools/patches/002-makefile.patch?ds=sidebyside

diff --git a/package/uboot-envtools/patches/002-makefile.patch b/package/uboot-envtools/patches/002-makefile.patch
index 6086611e1..ddd08e19d 100644
--- a/package/uboot-envtools/patches/002-makefile.patch
+++ b/package/uboot-envtools/patches/002-makefile.patch
@@ -1,28 +1,39 @@
-Index: uboot-envtools-20080520/Makefile
-===================================================================
---- uboot-envtools-20080520.orig/Makefile	2008-08-03 15:50:27.000000000 +0200
-+++ uboot-envtools-20080520/Makefile	2008-08-03 15:51:59.000000000 +0200
-@@ -21,12 +21,10 @@
+--- a/Makefile
++++ b/Makefile
+@@ -21,37 +21,16 @@
  # MA 02111-1307 USA
  #
  
 -include $(TOPDIR)/config.mk
 -
- SRCS	:= $(obj)crc32.c  fw_env.c  fw_env_main.c
+-HOSTSRCS := $(obj)crc32.c  fw_env.c  fw_env_main.c
++SRCS := crc32.c  fw_env.c  fw_env_main.c
  HEADERS	:= fw_env.h
  
--CPPFLAGS := -Wall -DUSE_HOSTCC -I$(SRCTREE)/include
-+CPPFLAGS := -Wall -DUSE_HOSTCC -I/usr/include
+-# Compile for a hosted environment on the target
+-HOSTCPPFLAGS  = -idirafter $(SRCTREE)/include \
+-		-idirafter $(OBJTREE)/include2 \
+-		-idirafter $(OBJTREE)/include \
+-		-DUSE_HOSTCC
+-
+-ifeq ($(MTD_VERSION),old)
+-HOSTCPPFLAGS += -DMTD_OLD
+-endif
++CPPFLAGS := -Wall $(CFLAGS)
+ 
+ all:	$(obj)fw_printenv
  
- ifeq ($(MTD_VERSION),old)
- CPPFLAGS += -DMTD_OLD
-@@ -39,14 +37,3 @@
+ # Some files complain if compiled with -pedantic, use HOSTCFLAGS_NOPED
+-$(obj)fw_printenv:	$(HOSTSRCS) $(HEADERS)
+-	$(HOSTCC) $(HOSTCFLAGS_NOPED) $(HOSTLDFLAGS) -o $@ $(HOSTSRCS)
++$(obj)fw_printenv:	$(SRCS) $(HEADERS)
++	$(CC) $(CPPFLAGS) $(SRCS) -o $(obj)fw_printenv
  
  clean:
- 	rm -f $(obj)fw_printenv $(obj)crc32.c
+-	rm -f $(obj)fw_printenv $(obj)crc32.c
 -
 -$(obj)crc32.c:
--	ln -s $(src)../../lib_generic/crc32.c $(obj)crc32.c
+-	ln -s $(src)../../lib/crc32.c $(obj)crc32.c
 -
 -#########################################################################
 -
@@ -31,3 +42,4 @@ Index: uboot-envtools-20080520/Makefile
 -sinclude $(obj).depend
 -
 -#########################################################################
++	rm -f $(obj)fw_printenv