All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/stella: bump to version 6.6
@ 2021-12-16 22:30 Fabrice Fontaine
  2021-12-17 17:44 ` Arnout Vandecappelle
  0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2021-12-16 22:30 UTC (permalink / raw)
  To: buildroot; +Cc: Sergio Prado, Fabrice Fontaine

- C++17 is mandatory since version 6.5 and
  https://github.com/stella-emu/stella/commit/fe2b4d630e1aeae80d0e90d7fe5e79b396c796a6
- Update hash of Copyright.txt, year updated:
  https://github.com/stella-emu/stella/commit/21438a82cc5245ff7437c9e61425d9d4307f7273

https://github.com/stella-emu/stella/blob/6.6/Changes.txt

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/stella/0001-configure-add-CC.patch | 30 ++++++++++++++++++++++
 package/stella/Config.in                   |  6 ++---
 package/stella/stella.hash                 |  4 +--
 package/stella/stella.mk                   |  2 +-
 4 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 package/stella/0001-configure-add-CC.patch

diff --git a/package/stella/0001-configure-add-CC.patch b/package/stella/0001-configure-add-CC.patch
new file mode 100644
index 0000000000..d4b29e39b5
--- /dev/null
+++ b/package/stella/0001-configure-add-CC.patch
@@ -0,0 +1,30 @@
+From 143cf9fa13a07b827de7065a5e919631406b0941 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 12 Dec 2021 22:46:52 +0100
+Subject: [PATCH] configure: add CC (#854)
+
+Add CC to fix the following build failure when cross-compiling which is
+raised since
+https://github.com/stella-emu/stella/commit/771b5b44e31de1b81a552ee47b65014fbc338776:
+
+out/src/sqlite/sqlite3.o: file not recognized: file format not recognized
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved from:
+https://github.com/stella-emu/stella/commit/143cf9fa13a07b827de7065a5e919631406b0941]
+---
+ configure | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure b/configure
+index df666b377..0101d2567 100755
+--- a/configure
++++ b/configure
+@@ -899,6 +899,7 @@ echo "Creating config.mak"
+ cat > config.mak << EOF
+ # -------- Generated by configure -----------
+ 
++CC := $CC
+ CXX := $CXX
+ CXXFLAGS := $CXXFLAGS
+ LD := $LD
diff --git a/package/stella/Config.in b/package/stella/Config.in
index 7722f8a540..b5d148489a 100644
--- a/package/stella/Config.in
+++ b/package/stella/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_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_6 # C++14
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
 	select BR2_PACKAGE_SDL2
 	help
@@ -11,10 +11,10 @@ config BR2_PACKAGE_STELLA
 
 	  https://stella-emu.github.io/
 
-comment "stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 6"
+comment "stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 7"
 	depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_HAS_THREADS || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_6
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_7
 
 comment "stella needs a toolchain not affected by GCC bug 64735"
 	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
diff --git a/package/stella/stella.hash b/package/stella/stella.hash
index c40d96616a..8aa5118165 100644
--- a/package/stella/stella.hash
+++ b/package/stella/stella.hash
@@ -1,4 +1,4 @@
 # Locally computed:
-sha256  0346900e9ba4b6d532b72d956adc5078502a9bd6bbc1648bb3dd68f5ffd4859b  stella-6.4-src.tar.xz
-sha256  d207ee9e563fdd062582df8cbb6c8303b9879bd107692c0db2a32477e47dfa35  Copyright.txt
+sha256  d481efc6d27b5294565dfcc10983de2dbc4db8a59932a678ffdb4d2404b8c207  stella-6.6-src.tar.xz
+sha256  d5e5897578c2590e48328986cebd950ff215653f7f506ef93accf981870366a6  Copyright.txt
 sha256  58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455  License.txt
diff --git a/package/stella/stella.mk b/package/stella/stella.mk
index 9e21606155..198a1134dc 100644
--- a/package/stella/stella.mk
+++ b/package/stella/stella.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-STELLA_VERSION = 6.4
+STELLA_VERSION = 6.6
 STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz
 STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION)
 STELLA_LICENSE = GPL-2.0+
-- 
2.33.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/stella: bump to version 6.6
  2021-12-16 22:30 [Buildroot] [PATCH 1/1] package/stella: bump to version 6.6 Fabrice Fontaine
@ 2021-12-17 17:44 ` Arnout Vandecappelle
  0 siblings, 0 replies; 2+ messages in thread
From: Arnout Vandecappelle @ 2021-12-17 17:44 UTC (permalink / raw)
  To: Fabrice Fontaine, buildroot; +Cc: Sergio Prado



On 16/12/2021 23:30, Fabrice Fontaine wrote:
> - C++17 is mandatory since version 6.5 and
>    https://github.com/stella-emu/stella/commit/fe2b4d630e1aeae80d0e90d7fe5e79b396c796a6
> - Update hash of Copyright.txt, year updated:
>    https://github.com/stella-emu/stella/commit/21438a82cc5245ff7437c9e61425d9d4307f7273
> 
> https://github.com/stella-emu/stella/blob/6.6/Changes.txt
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
>   package/stella/0001-configure-add-CC.patch | 30 ++++++++++++++++++++++
>   package/stella/Config.in                   |  6 ++---
>   package/stella/stella.hash                 |  4 +--
>   package/stella/stella.mk                   |  2 +-
>   4 files changed, 36 insertions(+), 6 deletions(-)
>   create mode 100644 package/stella/0001-configure-add-CC.patch
> 
> diff --git a/package/stella/0001-configure-add-CC.patch b/package/stella/0001-configure-add-CC.patch
> new file mode 100644
> index 0000000000..d4b29e39b5
> --- /dev/null
> +++ b/package/stella/0001-configure-add-CC.patch
> @@ -0,0 +1,30 @@
> +From 143cf9fa13a07b827de7065a5e919631406b0941 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Sun, 12 Dec 2021 22:46:52 +0100
> +Subject: [PATCH] configure: add CC (#854)
> +
> +Add CC to fix the following build failure when cross-compiling which is
> +raised since
> +https://github.com/stella-emu/stella/commit/771b5b44e31de1b81a552ee47b65014fbc338776:
> +
> +out/src/sqlite/sqlite3.o: file not recognized: file format not recognized
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Retrieved from:
> +https://github.com/stella-emu/stella/commit/143cf9fa13a07b827de7065a5e919631406b0941]
> +---
> + configure | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/configure b/configure
> +index df666b377..0101d2567 100755
> +--- a/configure
> ++++ b/configure
> +@@ -899,6 +899,7 @@ echo "Creating config.mak"
> + cat > config.mak << EOF
> + # -------- Generated by configure -----------
> +
> ++CC := $CC
> + CXX := $CXX
> + CXXFLAGS := $CXXFLAGS
> + LD := $LD
> diff --git a/package/stella/Config.in b/package/stella/Config.in
> index 7722f8a540..b5d148489a 100644
> --- a/package/stella/Config.in
> +++ b/package/stella/Config.in
> @@ -3,7 +3,7 @@ config BR2_PACKAGE_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_6 # C++14
> +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17
>   	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
>   	select BR2_PACKAGE_SDL2
>   	help
> @@ -11,10 +11,10 @@ config BR2_PACKAGE_STELLA
>   
>   	  https://stella-emu.github.io/
>   
> -comment "stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 6"
> +comment "stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 7"
>   	depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \
>   		!BR2_TOOLCHAIN_HAS_THREADS || \
> -		!BR2_TOOLCHAIN_GCC_AT_LEAST_6
> +		!BR2_TOOLCHAIN_GCC_AT_LEAST_7
>   
>   comment "stella needs a toolchain not affected by GCC bug 64735"
>   	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
> diff --git a/package/stella/stella.hash b/package/stella/stella.hash
> index c40d96616a..8aa5118165 100644
> --- a/package/stella/stella.hash
> +++ b/package/stella/stella.hash
> @@ -1,4 +1,4 @@
>   # Locally computed:
> -sha256  0346900e9ba4b6d532b72d956adc5078502a9bd6bbc1648bb3dd68f5ffd4859b  stella-6.4-src.tar.xz
> -sha256  d207ee9e563fdd062582df8cbb6c8303b9879bd107692c0db2a32477e47dfa35  Copyright.txt
> +sha256  d481efc6d27b5294565dfcc10983de2dbc4db8a59932a678ffdb4d2404b8c207  stella-6.6-src.tar.xz
> +sha256  d5e5897578c2590e48328986cebd950ff215653f7f506ef93accf981870366a6  Copyright.txt
>   sha256  58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455  License.txt
> diff --git a/package/stella/stella.mk b/package/stella/stella.mk
> index 9e21606155..198a1134dc 100644
> --- a/package/stella/stella.mk
> +++ b/package/stella/stella.mk
> @@ -4,7 +4,7 @@
>   #
>   ################################################################################
>   
> -STELLA_VERSION = 6.4
> +STELLA_VERSION = 6.6
>   STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz
>   STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION)
>   STELLA_LICENSE = GPL-2.0+
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-17 17:44 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-16 22:30 [Buildroot] [PATCH 1/1] package/stella: bump to version 6.6 Fabrice Fontaine
2021-12-17 17:44 ` Arnout Vandecappelle

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.