nuport-mac: various fixes

[openwrt/staging/yousong.git] / package / uboot-envtools / patches / 002-makefile.patch

diff --git a/package/uboot-envtools/patches/002-makefile.patch b/package/uboot-envtools/patches/002-makefile.patch
index 9dd8d82a6b2b298b4dd96a4cc3183d71044a5ff0..b18bff6e7ac23a9a05cf0384f06a10c14299360c 100644 (file)
--- a/package/uboot-envtools/patches/002-makefile.patch
+++ b/package/uboot-envtools/patches/002-makefile.patch
@@ -1,36 +1,44 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -21,12 +21,10 @@
+@@ -21,34 +21,17 @@
  # MA 02111-1307 USA
  #
  
 -include $(TOPDIR)/config.mk
 -
- SRCS  := $(obj)crc32.c  fw_env.c  fw_env_main.c
+-HOSTSRCS := $(SRCTREE)/lib/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
+-# 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
+-
+-all:  $(obj)fw_printenv
+-
+-# Some files complain if compiled with -pedantic, use HOSTCFLAGS_NOPED
+-$(obj)fw_printenv:    $(HOSTSRCS) $(HEADERS)
+-      $(HOSTCC) $(HOSTCFLAGS_NOPED) $(HOSTLDFLAGS) -o $@ $(HOSTSRCS)
 +CPPFLAGS := -Wall $(CFLAGS)
  
- ifeq ($(MTD_VERSION),old)
- CPPFLAGS += -DMTD_OLD
-@@ -35,18 +33,7 @@ endif
- all:  $(obj)fw_printenv
+-clean:
+-      rm -f $(obj)fw_printenv
++all: fw_printenv
  
- $(obj)fw_printenv:    $(SRCS) $(HEADERS)
--      $(CROSS_COMPILE)gcc $(CPPFLAGS) $(SRCS) -o $(obj)fw_printenv
-+      $(CC) $(CPPFLAGS) $(SRCS) -o $(obj)fw_printenv
- 
- clean:
-       rm -f $(obj)fw_printenv $(obj)crc32.c
--
--$(obj)crc32.c:
--      ln -s $(src)../../lib_generic/crc32.c $(obj)crc32.c
--
 -#########################################################################
--
++fw_printenv: $(SRCS) $(HEADERS)
++      $(CC) $(CPPFLAGS) $(SRCS) -o fw_printenv
+ 
 -include $(TOPDIR)/rules.mk
 -
 -sinclude $(obj).depend
--
--#########################################################################
++clean:
++      rm -f fw_printenv
+ 
+ #########################################################################