From 9ebf581aadc0abd4318d429d2bf849ce2c29c5da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 25 Jan 2018 12:53:09 +0100 Subject: [PATCH] supertux2: update 0.5.0 -> 0.5.1 and use Unix Makefiles OECMAKE generator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OE-Core has changed cmake.bblass to use ninja instead of make as default. This does not work for supertux2: | ninja: error: 'squirrel/lib/libsquirrel_static.a', needed by 'supertux2', missing and no known rule to make it Signed-off-by: Andreas Müller --- .../supertux/{supertux2_0.5.0.bb => supertux2_0.5.1.bb} | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) rename recipes-games/supertux/{supertux2_0.5.0.bb => supertux2_0.5.1.bb} (76%) diff --git a/recipes-games/supertux/supertux2_0.5.0.bb b/recipes-games/supertux/supertux2_0.5.1.bb similarity index 76% rename from recipes-games/supertux/supertux2_0.5.0.bb rename to recipes-games/supertux/supertux2_0.5.1.bb index afb0fc1..bfa7408 100644 --- a/recipes-games/supertux/supertux2_0.5.0.bb +++ b/recipes-games/supertux/supertux2_0.5.1.bb @@ -10,6 +10,10 @@ RDEPENDS_${PN} += "boost" inherit cmake +# With Ninja it fails with: +# ninja: error: 'squirrel/lib/libsquirrel_static.a', needed by 'supertux2', missing and no known rule to make it +OECMAKE_GENERATOR = "Unix Makefiles" + SRC_URI = " \ https://github.com/SuperTux/supertux/releases/download/v${PV}/SuperTux-v${PV}-Source.tar.gz \ file://0001-CMakeLists.txt-Pin-PHYSFS_getPrefDir-autodetection-d.patch \ @@ -17,8 +21,8 @@ SRC_URI = " \ file://0003-pass-compile-flags-to-external-projects.patch \ file://0004-do-not-set-included-paths-as-system-causes-trouble-w.patch \ " -SRC_URI[md5sum] = "3bb7c1f3f622da79ec9fe1ebc521f286" -SRC_URI[sha256sum] = "cfae0da40c41532fb414c3b17891c98396b59471fe583a8fc756b96aea61a73b" +SRC_URI[md5sum] = "b8b678362e3c5c9e366fb1fb3550a2e0" +SRC_URI[sha256sum] = "c9dc3b42991ce5c5d0d0cb94e44c4ec2373ad09029940f0e92331e7e9ada0ac5" S = "${WORKDIR}/SuperTux-v${PV}-Source"