stella: upgrade 5.1.3 -> 6.0

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2019-04-26 23:19:30 +02:00
parent 1dcb78a87a
commit 8e331dc790
2 changed files with 2 additions and 43 deletions

View File

@@ -40,45 +40,6 @@ index a1ecfb1..05e5c1c 100755
;;
esac
@@ -347,21 +348,26 @@ esac
#
# Determine the C++ compiler
#
-echo_n "Looking for C++ compiler... "
-if test -n "$_host"; then
- compilers="$CXX $_host_prefix-g++ $_host_prefix-c++ $_host_cpu-$_host_os-g++ $_host_cpu-$_host_os-c++"
+if test_compiler "$CXX"; then
+ echo "$CXX"
else
- compilers="$CXX g++ c++"
+ if test -n "$_host"; then
+ compilers="$_host_prefix-g++ $_host_prefix-c++ $_host_cpu-$_host_os-g++ $_host_cpu-$_host_os-c++"
+ else
+ compilers="g++ c++"
+ fi
+
+ for compiler in $compilers; do
+ echo "testing compile $compiler"
+ if test_compiler $compiler; then
+ CXX=$compiler
+ echo $CXX
+ break
+ fi
+ done
fi
-for compiler in $compilers; do
- if test_compiler "$compiler -std=c++14"; then
- CXX=$compiler
- echo $CXX
- break
- fi
-done
-if test -z $CXX; then
+if test -z "$CXX"; then
echo "none found!"
exit 1
fi
@@ -511,8 +517,9 @@ if test -n "$_host"; then
_host_os=win32
;;

View File

@@ -13,9 +13,7 @@ SRC_URI = " \
https://github.com/stella-emu/stella/releases/download/${PV}/${BPN}-${PV}-src.tar.xz \
file://0001-custtomize-configure-and-Makefile-to-our-needs.patch \
"
SRC_URI[md5sum] = "f7cccdf4761b7183a235ffeef136e180"
SRC_URI[sha256sum] = "e074317c25e5d4cabec4558909d301c3a7654ad620863f05d342244fe6bdfe0a"
SRC_URI[md5sum] = "496dc9837f6bd634a7567e37f21a49f2"
SRC_URI[sha256sum] = "17aa8c5f08e09c51dd7dd933f93b0a1929d2832bd66f3bd994fa50ebb2b9a2b1"
CLEANBROKEN = "1"
FILES_${PN} += "${datadir}/icons"