diff options
| -rw-r--r-- | meta-oe/recipes-graphics/fbida/fbida_2.10.bb | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch | 34 |
2 files changed, 37 insertions, 1 deletions
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" | |||
| 10 | 10 | ||
| 11 | DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif" | 11 | DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif" |
| 12 | 12 | ||
| 13 | SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz" | 13 | SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz \ |
| 14 | file://0001-Avoid-using-host-path.patch \ | ||
| 15 | " | ||
| 14 | SRC_URI[md5sum] = "09460b964b58c2e39b665498eca29018" | 16 | SRC_URI[md5sum] = "09460b964b58c2e39b665498eca29018" |
| 15 | SRC_URI[sha256sum] = "7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6" | 17 | SRC_URI[sha256sum] = "7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6" |
| 16 | 18 | ||
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 @@ | |||
| 1 | From 8d8fa9f22d9f6a95523bac63ac3af724faf5ff92 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Marek Vasut <marex@denx.de> | ||
| 3 | Date: Fri, 7 Apr 2017 23:26:09 +0200 | ||
| 4 | Subject: [PATCH] Avoid using host-path | ||
| 5 | |||
| 6 | Remove the explicit reference to /usr/local/* , this is completely | ||
| 7 | bogus and causes trouble during cross-compilation. | ||
| 8 | |||
| 9 | Signed-off-by: Marek Vasut <marex@denx.de> | ||
| 10 | Upstream-Status: Inappropriate [upstream requires this] | ||
| 11 | --- | ||
| 12 | mk/Variables.mk | 6 ------ | ||
| 13 | 1 file changed, 6 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/mk/Variables.mk b/mk/Variables.mk | ||
| 16 | index 99f787c..3ffd87a 100644 | ||
| 17 | --- a/mk/Variables.mk | ||
| 18 | +++ b/mk/Variables.mk | ||
| 19 | @@ -42,12 +42,6 @@ CFLAGS += -Wall -Wmissing-prototypes -Wstrict-prototypes \ | ||
| 20 | -Wpointer-arith -Wunused | ||
| 21 | CXXFLAGS += -Wall -Wpointer-arith -Wunused | ||
| 22 | |||
| 23 | -# add /usr/local to the search path if something is in there ... | ||
| 24 | -ifneq ($(wildcard /usr/local/include/*.h),) | ||
| 25 | - CFLAGS += -I/usr/local/include | ||
| 26 | - LDFLAGS += -L/usr/local/$(LIB) | ||
| 27 | -endif | ||
| 28 | - | ||
| 29 | # fixup include path for $(srcdir) != "." | ||
| 30 | ifneq ($(srcdir),.) | ||
| 31 | CFLAGS += -I. -I$(srcdir) | ||
| 32 | -- | ||
| 33 | 2.11.0 | ||
| 34 | |||
