Commit in naev/trunk (PKGBUILD binutils-2.39.patch)

[Antonio Rojas]

    Date: Friday, November 11, 2022 @ 11:07:40
  Author: arojas
Revision: 1346609

upgpkg: naev 0.9.4-2: suitesparse 6.0 rebuild

Added:
  naev/trunk/binutils-2.39.patch
Modified:
  naev/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   15 +++++++++++----
 binutils-2.39.patch |   13 +++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-11-11 09:58:37 UTC (rev 1346608)
+++ PKGBUILD    2022-11-11 11:07:40 UTC (rev 1346609)
@@ -3,20 +3,27 @@
 
 pkgname=naev
 pkgver=0.9.4
-pkgrel=1
+pkgrel=2
 pkgdesc='2D action/rpg space game'
 arch=('x86_64')
 url="https://github.com/naev/naev";
 license=('GPL3')
 depends=('glu' 'openal' 'libvorbis' 'sdl2' 'sdl2_image' 'sdl2_mixer' 'libgl' 
'libxml2' 'freetype2'
-         'libpng' 'libzip' 'luajit' 'glpk' 'physfs' 'libunibreak' 
'suitesparse' 'openblas')
+         'libpng' 'libzip' 'luajit' 'glpk' 'physfs' 'libunibreak' 
'suitesparse' 'openblas' 'cblas')
 makedepends=('freeglut' 'zip' 'meson' 'git' 'python-yaml')
-source=("https://github.com/naev/naev/releases/download/v$pkgver/naev-$pkgver-source.tar.xz";)
-sha512sums=('e8efb115d8d623ea92d348854d98ee22e8863aaf6555efa058d6160210f000186ae39f054f5b4f0fa8d92949de83defa35d4acd8216398157a1a42886745ddab')
+source=("https://github.com/naev/naev/releases/download/v$pkgver/naev-$pkgver-source.tar.xz";
+         binutils-2.39.patch)
+sha512sums=('e8efb115d8d623ea92d348854d98ee22e8863aaf6555efa058d6160210f000186ae39f054f5b4f0fa8d92949de83defa35d4acd8216398157a1a42886745ddab'
+            
'274b2189a9c81d75ff649ae777fdca0cba0ed41fd1c62e8079fc3cd4e48617cde49d930742e7786dbe98a46a02e8733ac9a6d551d6e418f27ecfaeff91c63679')
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < binutils-2.39.patch # Fix build with 
binutils 2.39
+}
+
 build() {
   cd "$pkgname-$pkgver"
 
+  export LDFLAGS+=' -lcblas' # Workaround our openblas not providing cblas
   meson setup -Dprefix=/usr -Dndata_path=/usr/share/naev/ndata build .
   cd build
   meson compile

Added: binutils-2.39.patch
===================================================================
--- binutils-2.39.patch                         (rev 0)
+++ binutils-2.39.patch 2022-11-11 11:07:40 UTC (rev 1346609)
@@ -0,0 +1,13 @@
+diff --git a/src/debug.c b/src/debug.c
+index 9306c763d..ddbca4019 100644
+--- a/src/debug.c
++++ b/src/debug.c
+@@ -150,7 +150,7 @@ static void debug_sigHandler( int sig, siginfo_t *info, 
void *unused )
+          debug_sigCodeToStr(info->si_signo, info->si_code) );
+    for (i=0; i<num; i++) {
+       if (abfd != NULL)
+-         debug_translateAddress(symbols[i], (bfd_vma) (bfd_hostptr_t) buf[i]);
++         debug_translateAddress(symbols[i], (bfd_vma) (uintptr_t) buf[i]);
+       else
+          DEBUG("   %s", symbols[i]);
+    }