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