Patchwork [U-Boot] Uboot tool Makefile patch for Mac OSX Snow leopard

login
register
mail settings
Submitter sungyeon
Date June 2, 2011, 1:37 a.m.
Message ID <1885B1E3-F654-47C1-AA0B-44897BD28B2D@mdstec.com>
Download mbox | patch
Permalink /patch/98316/
State Changes Requested
Headers show

Comments

sungyeon - June 2, 2011, 1:37 a.m.

Mike Frysinger - June 2, 2011, 3:48 p.m.
could you provide some real details as to what the problem is you're hitting 
and why/how this fixes things ?  2011.03 builds fine for me on leopard (10.5).
-mike
Jeroen - July 19, 2011, 9:38 p.m.
Hello Sungyeon / Mike,

I am not sure what the exact purpose of this patch is, but seems like the issue
I encountered with .depends (not finding the files in the correct path).

http://patchwork.ozlabs.org/patch/98316/

You might want to check if this helps:
http://patchwork.ozlabs.org/patch/105538/

Mike:
"could you provide some real details as to what the problem is you're hitting
and why/how this fixes things ?  2011.03 builds fine for me on leopard (10.5).
-mike"

Which sed version are you using on the mac? I don't know, but I am tempted to
think it doesn't ship sed with GNU extension by default.

Regards,
Jeroen
Mike Frysinger - July 19, 2011, 9:41 p.m.
On Tue, Jul 19, 2011 at 17:38, Jeroen wrote:
> http://patchwork.ozlabs.org/patch/105538/
>
> Mike:
> "could you provide some real details as to what the problem is you're
> hitting
> and why/how this fixes things ?  2011.03 builds fine for me on leopard
> (10.5).
> -mike"
>
> Which sed version are you using on the mac? I don't know, but I am tempted
> to think it doesn't ship sed with GNU extension by default.

i'm using fink to bring sanity to the OS X hell hole, so i probably do
miss some utility related bugs.  but that doesnt explain at all what
sungyeon's patch is attempting to fix or how it fixes it.
-mike
sungyeon - July 20, 2011, 2:41 p.m.
Dear Jeroen.

The patch file that i uploaded before is for u-boot tools for snow leopard 10.6.8.
I think http://patchwork.ozlabs.org/patch/105538/ will resolve for snow leopard environment.

Regards
sungyeon.

On Jul 19, 2011, at 11:38 PM, Jeroen wrote:

> Hello Sungyeon / Mike,
> 
> I am not sure what the exact purpose of this patch is, but seems like the issue
> I encountered with .depends (not finding the files in the correct path).
> 
> http://patchwork.ozlabs.org/patch/98316/
> 
> You might want to check if this helps:
> http://patchwork.ozlabs.org/patch/105538/
> 
> Mike:
> "could you provide some real details as to what the problem is you're hitting
> and why/how this fixes things ?  2011.03 builds fine for me on leopard (10.5).
> -mike"
> 
> Which sed version are you using on the mac? I don't know, but I am tempted to
> think it doesn't ship sed with GNU extension by default.
> 
> Regards,
> Jeroen
> 
> 
> 
> 
> 
>

Patch

diff --git a/tools/Makefile b/tools/Makefile
index 623f908..f794ef1 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -96,11 +96,11 @@  OBJ_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1.o
#endif

# Flattened device tree objects
-LIBFDT_OBJ_FILES-y += fdt.o
-LIBFDT_OBJ_FILES-y += fdt_ro.o
-LIBFDT_OBJ_FILES-y += fdt_rw.o
-LIBFDT_OBJ_FILES-y += fdt_strerror.o
-LIBFDT_OBJ_FILES-y += fdt_wip.o
+LIBFDT_OBJ_FILES-y += lib/libfdt/fdt.o
+LIBFDT_OBJ_FILES-y += lib/libfdt/fdt_ro.o
+LIBFDT_OBJ_FILES-y += lib/libfdt/fdt_rw.o
+LIBFDT_OBJ_FILES-y += lib/libfdt/fdt_strerror.o
+LIBFDT_OBJ_FILES-y += lib/libfdt/fdt_wip.o

# Generated LCD/video logo
LOGO_H = $(OBJTREE)/include/bmp_logo.h
@@ -129,7 +129,7 @@  endif
# now $(obj) is defined
HOSTSRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))
HOSTSRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c))
-HOSTSRCS += $(addprefix $(SRCTREE)/lib/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c))
+HOSTSRCS += $(addprefix $(SRCTREE)/,$(LIBFDT_OBJ_FILES-y:.o=.c))
BINS	:= $(addprefix $(obj),$(sort $(BIN_FILES-y)))
LIBFDT_OBJS	:= $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))

@@ -185,7 +185,11 @@  $(obj)mkimage$(SFX):	$(obj)crc32.o \
			$(obj)mkimage.o \
			$(obj)os_support.o \
			$(obj)sha1.o \
-			$(LIBFDT_OBJS)
+			$(obj)fdt.o \
+			$(obj)fdt_ro.o\
+			$(obj)fdt_rw.o\
+			$(obj)fdt_strerror.o\
+			$(obj)fdt_wip.o
	$(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^
	$(HOSTSTRIP) $@

@@ -201,13 +205,13 @@  $(obj)ubsha1$(SFX):	$(obj)os_support.o $(obj)sha1.o $(obj)ubsha1.o
	$(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^

# Some of the tool objects need to be accessed from outside the tools directory
-$(obj)%.o: $(SRCTREE)/common/%.c
+$(subst common/,,$(filter common/%,$(EXT_OBJ_FILES-y))): $(obj)%.o: $(SRCTREE)/common/%.c
	$(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $<

-$(obj)%.o: $(SRCTREE)/lib/%.c
+$(subst lib/,,$(filter lib/%,$(EXT_OBJ_FILES-y))): $(obj)%.o: $(SRCTREE)/lib/%.c
	$(HOSTCC) -g $(HOSTCFLAGS) -c -o $@ $<

-$(obj)%.o: $(SRCTREE)/lib/libfdt/%.c
+$(subst lib/libfdt/,,$(filter lib/libfdt/%,$(LIBFDT_OBJ_FILES-y))): $(obj)%.o: $(SRCTREE)/lib/libfdt/%.c
	$(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $<

subdirs: