From 56c956f6c0f366dadfdece4933548dcd3b2b9fc9 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 7 Apr 2017 23:36:46 +0200 Subject: fbida: Fix compile-host-path error Remove the explicit reference to /usr/local/* in Variables.mk. This is completely bogus and causes failure during cross-compilation. Signed-off-by: Marek Vasut Signed-off-by: Martin Jansa --- meta-oe/recipes-graphics/fbida/fbida_2.10.bb | 4 ++- .../fbida/files/0001-Avoid-using-host-path.patch | 34 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch (limited to 'meta-oe/recipes-graphics') diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.10.bb b/meta-oe/recipes-graphics/fbida/fbida_2.10.bb index 2322476c7c..eb31f7b737 100644 --- a/meta-oe/recipes-graphics/fbida/fbida_2.10.bb +++ b/meta-oe/recipes-graphics/fbida/fbida_2.10.bb @@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif" -SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz" +SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz \ + file://0001-Avoid-using-host-path.patch \ + " SRC_URI[md5sum] = "09460b964b58c2e39b665498eca29018" SRC_URI[sha256sum] = "7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6" diff --git a/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch b/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch new file mode 100644 index 0000000000..cdf2c25d37 --- /dev/null +++ b/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch @@ -0,0 +1,34 @@ +From 8d8fa9f22d9f6a95523bac63ac3af724faf5ff92 Mon Sep 17 00:00:00 2001 +From: Marek Vasut +Date: Fri, 7 Apr 2017 23:26:09 +0200 +Subject: [PATCH] Avoid using host-path + +Remove the explicit reference to /usr/local/* , this is completely +bogus and causes trouble during cross-compilation. + +Signed-off-by: Marek Vasut +Upstream-Status: Inappropriate [upstream requires this] +--- + mk/Variables.mk | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/mk/Variables.mk b/mk/Variables.mk +index 99f787c..3ffd87a 100644 +--- a/mk/Variables.mk ++++ b/mk/Variables.mk +@@ -42,12 +42,6 @@ CFLAGS += -Wall -Wmissing-prototypes -Wstrict-prototypes \ + -Wpointer-arith -Wunused + CXXFLAGS += -Wall -Wpointer-arith -Wunused + +-# add /usr/local to the search path if something is in there ... +-ifneq ($(wildcard /usr/local/include/*.h),) +- CFLAGS += -I/usr/local/include +- LDFLAGS += -L/usr/local/$(LIB) +-endif +- + # fixup include path for $(srcdir) != "." + ifneq ($(srcdir),.) + CFLAGS += -I. -I$(srcdir) +-- +2.11.0 + -- cgit 1.2.3-korg