Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -1,6 +1,6 @@
|
||||
From fba2627bebc7d497f64827a0517316e9b5c64c0a Mon Sep 17 00:00:00 2001
|
||||
From ef1cffc526d3cf9562d50efbf8addc2aa4c06b52 Mon Sep 17 00:00:00 2001
|
||||
From: Sergio Prado <sergio.prado@e-labworks.com>
|
||||
Date: Tue, 26 Jul 2016 13:24:00 -0300
|
||||
Date: Sun, 30 Jul 2017 18:23:23 -0300
|
||||
Subject: [PATCH 1/2] Add cross-compilation support
|
||||
|
||||
Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
|
||||
@@ -9,10 +9,10 @@ Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 0d90a4f0acde..a4afea8e1880 100755
|
||||
index c2f304729651..b05321aac3da 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -502,8 +502,9 @@ if test -n "$_host"; then
|
||||
@@ -499,8 +499,9 @@ if test -n "$_host"; then
|
||||
_host_os=win32
|
||||
;;
|
||||
*)
|
||||
@@ -23,7 +23,7 @@ index 0d90a4f0acde..a4afea8e1880 100755
|
||||
+ _host_os=unix
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
From a86140353cb2e162d88da9caa1716915be2f6893 Mon Sep 17 00:00:00 2001
|
||||
From d506a586b299682a425d3c3de68baefb7221fa9a Mon Sep 17 00:00:00 2001
|
||||
From: Sergio Prado <sergio.prado@e-labworks.com>
|
||||
Date: Tue, 26 Jul 2016 13:25:12 -0300
|
||||
Date: Sun, 30 Jul 2017 18:25:12 -0300
|
||||
Subject: [PATCH 2/2] Do not strip when installing
|
||||
|
||||
Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
|
||||
@@ -9,10 +9,10 @@ Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 6dd0129587b3..b1aea5eed4a1 100644
|
||||
index 346640e53bea..fedaed05a4d6 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -172,7 +172,7 @@ config.mak: $(srcdir)/configure
|
||||
@@ -173,7 +173,7 @@ config.mak: $(srcdir)/configure
|
||||
|
||||
install: all
|
||||
$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
From 36d5c8bc3592b4dffbec222a179c3956787a0694 Mon Sep 17 00:00:00 2001
|
||||
From: Sergio Prado <sergio.prado@e-labworks.com>
|
||||
Date: Sat, 9 Sep 2017 15:04:58 -0300
|
||||
Subject: [PATCH] Fix error when building with uClibc-ng
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The uClibc-ng C library defines a type called R0 that conflits with a
|
||||
global variable called R0 from PaddleReader.cxx.
|
||||
|
||||
src/emucore/tia/PaddleReader.cxx:25:3: error: ‘constexpr const double R0’ redeclared as different kind of symbol
|
||||
R0 = 1.5e3,
|
||||
^
|
||||
/home/sprado/workspace/build/buildroot/build/stella_uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:42:3: note: previous declaration ‘<anonymous enum> R0’
|
||||
R0 = 0,
|
||||
^~
|
||||
|
||||
So let's redefine R0 as a private member of the PaddleReader class.
|
||||
|
||||
Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
|
||||
---
|
||||
src/emucore/tia/PaddleReader.cxx | 1 -
|
||||
src/emucore/tia/PaddleReader.hxx | 2 ++
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/emucore/tia/PaddleReader.cxx b/src/emucore/tia/PaddleReader.cxx
|
||||
index 69c828ea6c5c..27ff828200ee 100644
|
||||
--- a/src/emucore/tia/PaddleReader.cxx
|
||||
+++ b/src/emucore/tia/PaddleReader.cxx
|
||||
@@ -22,7 +22,6 @@
|
||||
static constexpr double
|
||||
C = 68e-9,
|
||||
RPOT = 1e6,
|
||||
- R0 = 1.5e3,
|
||||
USUPP = 5;
|
||||
|
||||
static constexpr double TRIPPOINT_LINES = 379;
|
||||
diff --git a/src/emucore/tia/PaddleReader.hxx b/src/emucore/tia/PaddleReader.hxx
|
||||
index 00238a4fe5b5..0032e6efd015 100644
|
||||
--- a/src/emucore/tia/PaddleReader.hxx
|
||||
+++ b/src/emucore/tia/PaddleReader.hxx
|
||||
@@ -65,6 +65,8 @@ class PaddleReader : public Serializable
|
||||
|
||||
bool myIsDumped;
|
||||
|
||||
+ static constexpr double R0 = 1.5e3;
|
||||
+
|
||||
private:
|
||||
PaddleReader(const PaddleReader&) = delete;
|
||||
PaddleReader(PaddleReader&&) = delete;
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
From 28f0c20302e5c64712899848cae3d0a48a9dc952 Mon Sep 17 00:00:00 2001
|
||||
From: Vlad Zakharov <vzakhar@synopsys.com>
|
||||
Date: Wed, 10 Aug 2016 18:02:59 +0300
|
||||
Subject: [PATCH] configure: Add $CXXFLAGS for test compilations
|
||||
|
||||
Why we are passing only linker flags when compiling test code?
|
||||
Loosing compiler flags leads to errors.
|
||||
|
||||
Signed-off-by: Vlad Zakharov <vzakhar@synopsys.com>
|
||||
---
|
||||
configure | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 0d90a4f..618fe78 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -63,9 +63,9 @@ cc_check() {
|
||||
echo >> "$TMPLOG"
|
||||
cat "$TMPC" >> "$TMPLOG"
|
||||
echo >> "$TMPLOG"
|
||||
- echo "$CXX $TMPC $LDFLAGS -o $TMPO$EXEEXT $@" >> "$TMPLOG"
|
||||
+ echo "$CXX $TMPC $CXXFLAGS $LDFLAGS -o $TMPO$EXEEXT $@" >> "$TMPLOG"
|
||||
rm -f "$TMPO$EXEEXT"
|
||||
- ( $CXX "$TMPC" $LDFLAGS -o "$TMPO$EXEEXT" "$@" ) >> "$TMPLOG" 2>&1
|
||||
+ ( $CXX "$TMPC" $CXXFLAGS $LDFLAGS -o "$TMPO$EXEEXT" "$@" ) >> "$TMPLOG" 2>&1
|
||||
TMP="$?"
|
||||
echo >> "$TMPLOG"
|
||||
return "$TMP"
|
||||
@@ -107,9 +107,9 @@ EOF
|
||||
|
||||
if test -n "$_host"; then
|
||||
# In cross-compiling mode, we cannot run the result
|
||||
- eval "$1 $LDFLAGS -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
|
||||
+ eval "$1 $CXXFLAGS $LDFLAGS -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
|
||||
else
|
||||
- eval "$1 $LDFLAGS -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp 2> /dev/null" && eval "./tmp_cxx_compiler 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
|
||||
+ eval "$1 $CXXFLAGS $LDFLAGS -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp 2> /dev/null" && eval "./tmp_cxx_compiler 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
|
||||
fi
|
||||
}
|
||||
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
From 6946a491cae42b971aad3bc5d822e0e549eca8bd Mon Sep 17 00:00:00 2001
|
||||
From: Sergio Prado <sergio.prado@e-labworks.com>
|
||||
Date: Thu, 1 Dec 2016 15:20:33 -0200
|
||||
Subject: [PATCH] Use gnu++11 standard to prevent errors on PPC.
|
||||
|
||||
PPC altivec vectorization triggers a bug when compiling with -std=c++11
|
||||
because "bool" is redefined in altivec.h.
|
||||
|
||||
Acording to a bug report in GCC, "You need to use -std=g++11 or
|
||||
undefine bool after the include of altivec.h as context sensitive
|
||||
keywords is not part of the C++11 standard".
|
||||
|
||||
So let's use gnu++11 standard.
|
||||
|
||||
Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 6dd0129587b3..6ed50ea4c335 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -51,7 +51,7 @@ else
|
||||
endif
|
||||
CXXFLAGS+= -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers
|
||||
ifdef HAVE_GCC
|
||||
- CXXFLAGS+= -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=c++11
|
||||
+ CXXFLAGS+= -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=gnu++11
|
||||
endif
|
||||
|
||||
ifdef PROFILE
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
config BR2_PACKAGE_STELLA
|
||||
bool "stella"
|
||||
depends on !BR2_STATIC_LIBS # sdl2
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14
|
||||
select BR2_PACKAGE_SDL2
|
||||
select BR2_PACKAGE_LIBPNG
|
||||
select BR2_PACKAGE_ZLIB
|
||||
depends on !BR2_STATIC_LIBS # sdl2
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
|
||||
help
|
||||
Stella is a multi-platform Atari 2600 VCS emulator.
|
||||
|
||||
http://stella.sourceforge.net/
|
||||
https://stella-emu.github.io/
|
||||
|
||||
comment "stella needs a toolchain w/ dynamic library, C++, gcc >= 4.8"
|
||||
comment "stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 4.9"
|
||||
depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
!BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 b2727a0e2d3b112d35dcb89b4bdc789e2c7f15e9d9c7054a69a2f67facd7416e stella-4.7.2-src.tar.xz
|
||||
sha256 74ee708b68340b65519a04a22c61921cdcf69a1d308600c212414b28e9e689ac stella-5.0.2-src.tar.xz
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
STELLA_VERSION = 4.7.2
|
||||
STELLA_VERSION = 5.0.2
|
||||
STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz
|
||||
STELLA_SITE = http://downloads.sourceforge.net/stella
|
||||
STELLA_LICENSE = GPLv2+
|
||||
STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION)
|
||||
STELLA_LICENSE = GPL-2.0+
|
||||
STELLA_LICENSE_FILES = Copyright.txt License.txt
|
||||
|
||||
STELLA_DEPENDENCIES = sdl2 libpng zlib
|
||||
|
||||
Reference in New Issue
Block a user