package/omxplayer/0001-Makefiles-clean-up-the-cruft.patch

   1 From 563dafc1129848419482b540d149d0b8687cac1e Mon Sep 17 00:00:00 2001
   2 From: "Yann E. MORIN" <yann.morin.1998@free.fr>
   3 Date: Sun, 10 Apr 2016 16:22:53 +0200
   4 Subject: [PATCH] Makefiles: clean up the cruft
   5
   6 Most of the variables that Makefile.include tries (but fails) to set,
   7 are already available from Buildroot's variables:
   8   - AR, AS, CC, CXX, OBJDUMP...
   9   - CFLAGS, CXXFLAGS, CPPFLAGS...
  10
  11 This leaves us with a few select variables that define include and
  12 library paths local to the omxplayer package, plus a few optimisations.
  13
  14 Finally, also remove hard-coded, absolute paths pointing to the host
  15 system (won't work for cross-compilation, so our paranoid wrapper would
  16 catch those paths).
  17
  18 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
  19 ---
  20  Makefile         |  2 +-
  21  Makefile.include | 20 ++------------------
  22  2 files changed, 3 insertions(+), 19 deletions(-)
  23
  24 diff --git a/Makefile b/Makefile
  25 index bcfadfb..3dc1a03 100644
  26 --- a/Makefile
  27 +++ b/Makefile
  28 @@ -4,7 +4,7 @@ CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX
  29
  30  LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
  31
  32 -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
  33 +INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/
  34
  35  DIST ?= omxplayer-dist
  36
  37 diff --git a/Makefile.include b/Makefile.include
  38 index 58e9560..79ca277 100644
  39 --- a/Makefile.include
  40 +++ b/Makefile.include
  41 @@ -20,21 +20,5 @@ endif
  42
  43  JOBS=7
  44
  45 -CFLAGS                 := -isystem$(PREFIX)/include
  46 -CXXFLAGS               := $(CFLAGS)
  47 -CPPFLAGS               := $(CFLAGS)
  48 -LDFLAGS                        := -L$(BUILDROOT)/lib
  49 -LD                                     := $(TOOLCHAIN)/bin/$(HOST)-ld --sysroot=$(SYSROOT)
  50 -CC                                     := $(TOOLCHAIN)/bin/$(HOST)-gcc --sysroot=$(SYSROOT)
  51 -CXX         := $(TOOLCHAIN)/bin/$(HOST)-g++ --sysroot=$(SYSROOT)
  52 -OBJDUMP                        := $(TOOLCHAIN)/bin/$(HOST)-objdump
  53 -RANLIB                 := $(TOOLCHAIN)/bin/$(HOST)-ranlib
  54 -STRIP                          := $(TOOLCHAIN)/bin/$(HOST)-strip
  55 -AR                                     := $(TOOLCHAIN)/bin/$(HOST)-ar
  56 -CXXCP                  := $(CXX) -E
  57 -PATH                           := $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)
  58 -
  59 -CFLAGS                 += -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog
  60 -LDFLAGS                        += -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build
  61 -#INCLUDES              += -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2
  62 -INCLUDES               += -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include
  63 +CFLAGS                 += -fomit-frame-pointer -Wno-psabi -mno-apcs-stack-check    \
  64 +                          -mstructure-size-boundary=32 -mno-sched-prolog
  65 --
  66 1.9.1
  67