Fix build due to deprecated glibc symbols.

3 files changed, 36 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cecd11dc8139..825a894d547a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nanox
 	pkgdesc = Nanos++ is a runtime designed to serve as runtime support in parallel environments. It is mainly used to support OmpSs, a extension to OpenMP developed at BSC.
 	pkgver = 0.15.20190627
-	pkgrel = 1
+	pkgrel = 2
 	url = https://pm.bsc.es/ompss
 	arch = i686
 	arch = x86_64
@@ -10,7 +10,9 @@ pkgbase = nanox
 	depends = extrae
 	depends = sqlite3
 	source = https://pm.bsc.es/ftp/ompss/releases/ompss-19.06.tar.gz
+	source = nanox-Fix-build-due-to-use-of-deprecated-_sys_siglist.patch
 	sha512sums = 159efc17ba446f3f2205a8c0580ed10fab263f8bdb7306d5444d1fc6a592f80d749c03031e7e416090360c36a51a38da083b2b2ed4e75dda5c55a103806d91d2
+	sha512sums = f900d2c30236ef641e1e527364324e317d1df2746082df0e0bf8adcceb279b7cde6f0c094576e330de24fc9d51f989016f6e2d50489e308fe2f8683acb3bf41c
 
 pkgname = nanox
 
diff --git a/PKGBUILD b/PKGBUILD
index 62d4e5b9d612..629dea0d451f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,21 @@ _bundlepkgname='ompss'
 pkgdesc='Nanos++ is a runtime designed to serve as runtime support in parallel environments. It is mainly used to support OmpSs, a extension to OpenMP developed at BSC.'
 pkgver='0.15.20190627'
 _bundlepkgver='19.06'
-pkgrel='1'
+pkgrel='2'
 arch=('i686' 'x86_64')
 url='https://pm.bsc.es/ompss'
 license=('GPL2')
 depends=(extrae sqlite3)
 makedepends=(python)
-source=("https://pm.bsc.es/ftp/${_bundlepkgname}/releases/${_bundlepkgname}-${_bundlepkgver}.tar.gz")
-sha512sums=(159efc17ba446f3f2205a8c0580ed10fab263f8bdb7306d5444d1fc6a592f80d749c03031e7e416090360c36a51a38da083b2b2ed4e75dda5c55a103806d91d2)
+source=("https://pm.bsc.es/ftp/${_bundlepkgname}/releases/${_bundlepkgname}-${_bundlepkgver}.tar.gz"
+        "nanox-Fix-build-due-to-use-of-deprecated-_sys_siglist.patch")
+sha512sums=(159efc17ba446f3f2205a8c0580ed10fab263f8bdb7306d5444d1fc6a592f80d749c03031e7e416090360c36a51a38da083b2b2ed4e75dda5c55a103806d91d2
+            f900d2c30236ef641e1e527364324e317d1df2746082df0e0bf8adcceb279b7cde6f0c094576e330de24fc9d51f989016f6e2d50489e308fe2f8683acb3bf41c)
 
 prepare() {
 	cd "$srcdir/${_bundlepkgname}-${_bundlepkgver}/$pkgname-${pkgver%.*}"
+
+	patch -Np1 -i "$srcdir/nanox-Fix-build-due-to-use-of-deprecated-_sys_siglist.patch"
 }
 
 build() {
diff --git a/nanox-Fix-build-due-to-use-of-deprecated-_sys_siglist.patch b/nanox-Fix-build-due-to-use-of-deprecated-_sys_siglist.patch
new file mode 100644
index 000000000000..64d01ee2d2e8
--- /dev/null
+++ b/nanox-Fix-build-due-to-use-of-deprecated-_sys_siglist.patch
@@ -0,0 +1,26 @@
+From 5be3051984743292ad8ea151b001e99bcd74f694 Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Mon, 14 Sep 2020 11:07:40 +0200
+Subject: [PATCH] Fix build due to use of deprecated _sys_siglist.
+
+Breaking commit in glibc appears to be https://sourceware.org/git/?p=glibc.git;a=commit;h=b1ccfc061feee9ce616444ded8e1cd5acf9fa97f
+---
+ src/core/taskexecutionexception.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/taskexecutionexception.cpp b/src/core/taskexecutionexception.cpp
+index 92a7450..103d22b 100644
+--- a/src/core/taskexecutionexception.cpp
++++ b/src/core/taskexecutionexception.cpp
+@@ -27,7 +27,7 @@ const char* TaskExecutionException::what ( ) const throw ()
+ 
+    const char* sig_desc;
+    if (signal_info.si_signo >= 0 && signal_info.si_signo < NSIG && (sig_desc =
+-         _sys_siglist[signal_info.si_signo]) != NULL) {
++         strsignal(signal_info.si_signo)) != NULL) {
+ 
+       s += sig_desc;
+       switch (signal_info.si_signo) {
+-- 
+2.28.0
+