From fa414a08b279ab8dfd6910d8c51729d220b71e9f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 10 Jul 2019 18:34:18 +0300 Subject: [PATCH] allegro4: Don't give away host include paths from allegro-config Signed-off-by: Marko Lindqvist --- .../avoid_include_paths.patch | 25 +++++++++++++++++++ recipes-gamelib/allegro4/allegro4_4.4.3.1.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 recipes-gamelib/allegro4/allegro4-4.4.3.1/avoid_include_paths.patch diff --git a/recipes-gamelib/allegro4/allegro4-4.4.3.1/avoid_include_paths.patch b/recipes-gamelib/allegro4/allegro4-4.4.3.1/avoid_include_paths.patch new file mode 100644 index 0000000..ffa7521 --- /dev/null +++ b/recipes-gamelib/allegro4/allegro4-4.4.3.1/avoid_include_paths.patch @@ -0,0 +1,25 @@ +allegro-config does not give any include path parameters for --cflags to +avoid problems with target paths getting used in build system. + +Signed-off-by: Marko Lindqvist +diff -Nurd allegro-4.4.3.1/misc/allegro-config.in allegro-4.4.3.1/misc/allegro-config.in +--- allegro-4.4.3.1/misc/allegro-config.in 2019-03-04 03:30:11.000000000 +0200 ++++ allegro-4.4.3.1/misc/allegro-config.in 2019-07-10 18:26:36.680737493 +0300 +@@ -173,7 +173,7 @@ + + if test "$echo_cflags" = "yes"; then + if test -n "$include_prefix" -a -z "$addon_form"; then +- echo -I${include_path} $allegro_cflags ++ echo $allegro_cflags + else + echo $allegro_cflags + fi +@@ -181,7 +181,7 @@ + + if test "$echo_cppflags" = "yes"; then + if test -n "$include_prefix" -a -z "$addon_form"; then +- echo -I${include_path} $allegro_cppflags ++ echo $allegro_cppflags + else + echo $allegro_cppflags + fi diff --git a/recipes-gamelib/allegro4/allegro4_4.4.3.1.bb b/recipes-gamelib/allegro4/allegro4_4.4.3.1.bb index 2b28653..501c562 100644 --- a/recipes-gamelib/allegro4/allegro4_4.4.3.1.bb +++ b/recipes-gamelib/allegro4/allegro4_4.4.3.1.bb @@ -10,6 +10,7 @@ DEPENDS = "virtual/libgl libglu libx11 libxcursor physfs openal-soft jpeg" # This uses uploaded asset from github.com, not one automatically regenerated # from time to time SRC_URI = "https://github.com/liballeg/allegro5/releases/download/${PV}/allegro-${PV}.tar.gz \ + file://avoid_include_paths.patch \ file://avoid_lib_paths.patch \ file://0001-CMakeLists.txt-don-t-try-to-run-in-cross-environment.patch \ "