diff options
author | Qing He <qing.he@intel.com> | 2010-06-17 17:23:20 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-30 13:19:03 +0100 |
commit | 60255c8d281dfefb9c1751e41ca06b13c73664de (patch) | |
tree | 3c1415ab08806aac71c5fcc9a2f5cdd26889cfdc /meta/packages/syslinux/files/cross-build.patch | |
parent | e7bcb1210e6688fcaf5ebfd27d218a10e06b52d8 (diff) | |
download | poky-60255c8d281dfefb9c1751e41ca06b13c73664de.tar.gz |
syslinux: upgrade to versin 3.86
from version 3.36
partly based on the recipe from openembedded project
changes:
- add cross-build.patch to use poky toolchain
- mangle LDFLAGS so $LD invocation works
- use precompiled version of $BTARGET for target (OE)
- stick on ${sbindir} instead of OE's ${base_sbindir}
Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/packages/syslinux/files/cross-build.patch')
-rw-r--r-- | meta/packages/syslinux/files/cross-build.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/meta/packages/syslinux/files/cross-build.patch b/meta/packages/syslinux/files/cross-build.patch new file mode 100644 index 0000000000..69b3378baf --- /dev/null +++ b/meta/packages/syslinux/files/cross-build.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | Use ?= for Makefile variables to use poky environment variables. | ||
2 | Original method to sed s/CC =/CC ?=/ is not applicable anymore | ||
3 | because of the Makefile changes. | ||
4 | |||
5 | against 3.86 | ||
6 | |||
7 | 06/28/2010 - qhe | ||
8 | --- | ||
9 | diff --git a/MCONFIG b/MCONFIG | ||
10 | index e9c16d3..4d49f33 100644 | ||
11 | --- a/MCONFIG | ||
12 | +++ b/MCONFIG | ||
13 | @@ -18,13 +18,13 @@ | ||
14 | MAKEFLAGS += -r | ||
15 | MAKE += -r | ||
16 | |||
17 | -BINDIR = /usr/bin | ||
18 | -SBINDIR = /sbin | ||
19 | -LIBDIR = /usr/lib | ||
20 | -DATADIR = /usr/share | ||
21 | +BINDIR ?= /usr/bin | ||
22 | +SBINDIR ?= /sbin | ||
23 | +LIBDIR ?= /usr/lib | ||
24 | +DATADIR ?= /usr/share | ||
25 | AUXDIR = $(DATADIR)/syslinux | ||
26 | -MANDIR = /usr/man | ||
27 | -INCDIR = /usr/include | ||
28 | +MANDIR ?= /usr/man | ||
29 | +INCDIR ?= /usr/include | ||
30 | TFTPBOOT = /tftpboot | ||
31 | COM32DIR = $(AUXDIR)/com32 | ||
32 | |||
33 | @@ -38,18 +38,18 @@ PERL = perl | ||
34 | |||
35 | CHMOD = chmod | ||
36 | |||
37 | -CC = gcc | ||
38 | +CC ?= gcc | ||
39 | gcc_ok = $(shell tmpf=gcc_ok.$$$$.tmp; \ | ||
40 | if $(CC) $(1) -c $(topdir)/dummy.c -o $$tmpf 2>/dev/null ; \ | ||
41 | then echo '$(1)'; else echo '$(2)'; fi; \ | ||
42 | rm -f $$tmpf) | ||
43 | |||
44 | -LD = ld | ||
45 | -OBJDUMP = objdump | ||
46 | -OBJCOPY = objcopy | ||
47 | -AR = ar | ||
48 | -NM = nm | ||
49 | -RANLIB = ranlib | ||
50 | +LD ?= ld | ||
51 | +OBJDUMP ?= objdump | ||
52 | +OBJCOPY ?= objcopy | ||
53 | +AR ?= ar | ||
54 | +NM ?= nm | ||
55 | +RANLIB ?= ranlib | ||
56 | GZIPPROG = gzip | ||
57 | PNGTOPNM = pngtopnm | ||
58 | MCOPY = mcopy | ||