summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/syslinux/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/syslinux/files')
-rw-r--r--meta/recipes-devtools/syslinux/files/cross-build.patch64
1 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-devtools/syslinux/files/cross-build.patch b/meta/recipes-devtools/syslinux/files/cross-build.patch
new file mode 100644
index 0000000000..c90c7afbaf
--- /dev/null
+++ b/meta/recipes-devtools/syslinux/files/cross-build.patch
@@ -0,0 +1,64 @@
1Use ?= for Makefile variables to use poky environment variables.
2Original method to sed s/CC =/CC ?=/ is not applicable anymore
3because of the Makefile changes.
4
5against 3.86
6
706/28/2010 - qhe
8
9also AUXDIR stays in $(LIBDIR)/syslinux rather than $(DATADIR)/syslinux
10
1107/08/2010 - qhe
12
13---
14diff --git a/MCONFIG b/MCONFIG
15index e9c16d3..4d49f33 100644
16--- a/MCONFIG
17+++ b/MCONFIG
18@@ -18,13 +18,13 @@
19 MAKEFLAGS += -r
20 MAKE += -r
21
22-BINDIR = /usr/bin
23-SBINDIR = /sbin
24-LIBDIR = /usr/lib
25-DATADIR = /usr/share
26-AUXDIR = $(DATADIR)/syslinux
27-MANDIR = /usr/man
28-INCDIR = /usr/include
29+BINDIR ?= /usr/bin
30+SBINDIR ?= /sbin
31+LIBDIR ?= /usr/lib
32+DATADIR ?= /usr/share
33+AUXDIR = $(LIBDIR)/syslinux
34+MANDIR ?= /usr/man
35+INCDIR ?= /usr/include
36 TFTPBOOT = /tftpboot
37 COM32DIR = $(AUXDIR)/com32
38
39@@ -38,18 +38,18 @@ PERL = perl
40
41 CHMOD = chmod
42
43-CC = gcc
44+CC ?= gcc
45 gcc_ok = $(shell tmpf=gcc_ok.$$$$.tmp; \
46 if $(CC) $(1) -c $(topdir)/dummy.c -o $$tmpf 2>/dev/null ; \
47 then echo '$(1)'; else echo '$(2)'; fi; \
48 rm -f $$tmpf)
49
50-LD = ld
51-OBJDUMP = objdump
52-OBJCOPY = objcopy
53-AR = ar
54-NM = nm
55-RANLIB = ranlib
56+LD ?= ld
57+OBJDUMP ?= objdump
58+OBJCOPY ?= objcopy
59+AR ?= ar
60+NM ?= nm
61+RANLIB ?= ranlib
62 GZIPPROG = gzip
63 PNGTOPNM = pngtopnm
64 MCOPY = mcopy