Bug#1028440: warzone2100 build fixes

[Adrian Bunk]

The missing attachment for 1. is now attached.

cu
Adrian


On Wed, Jan 11, 2023 at 03:23:23AM +0200, Adrian Bunk wrote:
> Source: warzone2100
> Version: 4.3.3-2
> Severity: serious
> Tags: ftbfs
> 
> https://buildd.debian.org/status/fetch.php?pkg=warzone2100&arch=armel&ver=4.3.3-2&stamp=1673284889&raw=0
> 
> 1. Wcast-align build errors on mipsel/riscv64/sparc64:
> Attached is the fix/workaround I submitted upstream at
> https://github.com/Warzone2100/warzone2100/pull/3084
> 
> 2. The -latomic workaround for
> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358
> needs expansion:
> 
> --- debian/rules.old	2023-01-10 00:02:52.580028340 +0000
> +++ debian/rules	2023-01-10 06:45:42.213281490 +0000
> @@ -4,9 +4,9 @@
>  export DEB_BUILD_MAINT_OPTIONS = hardening=+all
>  export DEB_CPPFLAGS_MAINT_APPEND = -DNDEBUG
>  
> -# riscv64 needs explicit -latomic
> -ifneq (,$(filter $(DEB_HOST_ARCH), riscv64))
> -    export DEB_LDFLAGS_MAINT_APPEND = -latomic
> +# workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358
> +ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mipsel powerpc riscv64 sh4))
> +    export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -latomic -Wl,--as-needed
>  endif
>  
>  %: