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 | |
| parent | e7bcb1210e6688fcaf5ebfd27d218a10e06b52d8 (diff) | |
| download | openembedded-core-60255c8d281dfefb9c1751e41ca06b13c73664de.tar.gz openembedded-core-60255c8d281dfefb9c1751e41ca06b13c73664de.tar.bz2 openembedded-core-60255c8d281dfefb9c1751e41ca06b13c73664de.tar.xz openembedded-core-60255c8d281dfefb9c1751e41ca06b13c73664de.zip | |
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')
| -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 000000000..69b3378ba --- /dev/null +++ b/meta/packages/syslinux/files/cross-build.patch @@ -0,0 +1,58 @@ +Use ?= for Makefile variables to use poky environment variables. +Original method to sed s/CC =/CC ?=/ is not applicable anymore +because of the Makefile changes. + +against 3.86 + +06/28/2010 - qhe +--- +diff --git a/MCONFIG b/MCONFIG +index e9c16d3..4d49f33 100644 +--- a/MCONFIG ++++ b/MCONFIG +@@ -18,13 +18,13 @@ + MAKEFLAGS += -r + MAKE += -r + +-BINDIR = /usr/bin +-SBINDIR = /sbin +-LIBDIR = /usr/lib +-DATADIR = /usr/share ++BINDIR ?= /usr/bin ++SBINDIR ?= /sbin ++LIBDIR ?= /usr/lib ++DATADIR ?= /usr/share + AUXDIR = $(DATADIR)/syslinux +-MANDIR = /usr/man +-INCDIR = /usr/include ++MANDIR ?= /usr/man ++INCDIR ?= /usr/include + TFTPBOOT = /tftpboot + COM32DIR = $(AUXDIR)/com32 + +@@ -38,18 +38,18 @@ PERL = perl + + CHMOD = chmod + +-CC = gcc ++CC ?= gcc + gcc_ok = $(shell tmpf=gcc_ok.$$$$.tmp; \ + if $(CC) $(1) -c $(topdir)/dummy.c -o $$tmpf 2>/dev/null ; \ + then echo '$(1)'; else echo '$(2)'; fi; \ + rm -f $$tmpf) + +-LD = ld +-OBJDUMP = objdump +-OBJCOPY = objcopy +-AR = ar +-NM = nm +-RANLIB = ranlib ++LD ?= ld ++OBJDUMP ?= objdump ++OBJCOPY ?= objcopy ++AR ?= ar ++NM ?= nm ++RANLIB ?= ranlib + GZIPPROG = gzip + PNGTOPNM = pngtopnm + MCOPY = mcopy |