From 140a5bc861cfd519a7b9faaff31eb738f4d9065d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 13 Mar 2015 22:44:53 +0100 Subject: [PATCH] supertux: fix build - at least for hardfloat machines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...AKE_C_FLAGS-CMAKE-CXX_FLAGS-to-empty.patch | 36 +++++++++++++++++++ recipes-games/supertux/supertux2_git.bb | 7 ++-- 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 recipes-games/supertux/files/0001-do-not-set-CMAKE_C_FLAGS-CMAKE-CXX_FLAGS-to-empty.patch diff --git a/recipes-games/supertux/files/0001-do-not-set-CMAKE_C_FLAGS-CMAKE-CXX_FLAGS-to-empty.patch b/recipes-games/supertux/files/0001-do-not-set-CMAKE_C_FLAGS-CMAKE-CXX_FLAGS-to-empty.patch new file mode 100644 index 0000000..642e4a6 --- /dev/null +++ b/recipes-games/supertux/files/0001-do-not-set-CMAKE_C_FLAGS-CMAKE-CXX_FLAGS-to-empty.patch @@ -0,0 +1,36 @@ +From ed6fd52abd39880b7b1b2cd187a4f54a648d9ea0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 13 Mar 2015 22:34:56 +0100 +Subject: [PATCH] do not set CMAKE_C_FLAGS / CMAKE CXX_FLAGS to empty +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This causes horrible (many faces) errors in cross environments + +Upstrem-Status: Pending + +Signed-off-by: Andreas Müller +--- + external/squirrel/CMakeLists.txt | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/external/squirrel/CMakeLists.txt b/external/squirrel/CMakeLists.txt +index 0c4ef29..cdfa38a 100644 +--- a/external/squirrel/CMakeLists.txt ++++ b/external/squirrel/CMakeLists.txt +@@ -34,11 +34,6 @@ IF(ENABLE_SQDBG) + SET(SQUIRREL_SOURCES ${SQDBG_SOURCES} ${SQUIRREL_SOURCES}) + ENDIF(ENABLE_SQDBG) + +-# the squirrel sources are out of our control so don't be too pedantic about +-# them +-SET(CMAKE_CXX_FLAGS "") +-SET(CMAKE_C_FLAGS "") +- + ## define a target for building the library + + ADD_LIBRARY(squirrel ${SQUIRREL_SOURCES}) +-- +1.9.3 + diff --git a/recipes-games/supertux/supertux2_git.bb b/recipes-games/supertux/supertux2_git.bb index 66903e0..ca920e0 100644 --- a/recipes-games/supertux/supertux2_git.bb +++ b/recipes-games/supertux/supertux2_git.bb @@ -14,9 +14,10 @@ SRCREV = "947098af8085388eef4b5352f5c5d0b6edbcd78a" PV = "0.3.3+git${SRCPV}" S = "${WORKDIR}/git" -SRC_URI = "git://code.google.com/p/supertux;protocol=https" -SRC_URI[md5sum] = "f3f803e629ee51a9de0b366a036e393d" -SRC_URI[sha256sum] = "fceaf95251092d5698211ff0f51f1c50237fa5e2a6690464e9835a66e18301d0" +SRC_URI = " \ + git://code.google.com/p/supertux;protocol=https \ + file://0001-do-not-set-CMAKE_C_FLAGS-CMAKE-CXX_FLAGS-to-empty.patch \ +" EXTRA_OECMAKE = "-DINSTALL_SUBDIR_BIN=bin -DCMAKE_BUILD_TYPE=RELEASE"