OmpSs 19.06 upgrade.

2 files changed, 13 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 95b615db793c..a4e3fc63b617 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mcxx
 	pkgdesc = Mercurium is a C/C++/Fortran source-to-source compilation infrastructure aimed at fast prototyping developed by the Programming Models group at the Barcelona Supercomputing Center.
-	pkgver = 2.1.0
-	pkgrel = 6
+	pkgver = 2.3.0
+	pkgrel = 1
 	url = https://pm.bsc.es/ompss
 	arch = i686
 	arch = x86_64
@@ -11,14 +11,8 @@ pkgbase = mcxx
 	depends = gcc-fortran
 	depends = gperf
 	depends = sqlite3
-	source = https://pm.bsc.es/ftp/ompss/releases/ompss-17.12.1.tar.gz
-	source = https://github.com/bsc-pm/mcxx/commit/26fb7dffbaa06a5389acb1138717b14ce7d350a1.patch
-	source = https://github.com/bsc-pm/mcxx/commit/0f2c80f40f1e452fd450aef20838667eef801475.patch
-	source = https://github.com/bsc-pm/mcxx/commit/862ad57617772802ad6a804a1f5ecf470ca00ddc.patch
-	sha512sums = e68effb54b3a4e91da22808a928afcd586d41a3825ec2cea1f783a65d4e075cfb07ce3f5a8006c5a204a46f37fc73383cd549f6706ed12124724b6be18520344
-	sha512sums = 1de58ecc762c8e6d79e9daf0718a5f1bd96c929effa6962ddd411dc0794061d6d35fc520f2889588b33d5edbdf70c9d0ac5d3800fa669f09a031ec3e55ef5eb6
-	sha512sums = c2fd4647a96de3287d1b15d2ab31d99dfa73c12e7e74a77b4ca6857e7106a0431462055feb570436a4957883bd085a2f0199f046b53a682b984b38862eaa1491
-	sha512sums = ef42c42495717a0c06e6fedf17e2c02904b20f59fd19f114a6d407913f924c340ebbec721252048c394a705bae39234e8c9346e584317ef6356111ae149724c3
+	source = https://pm.bsc.es/ftp/ompss/releases/ompss-19.06.tar.gz
+	sha512sums = 159efc17ba446f3f2205a8c0580ed10fab263f8bdb7306d5444d1fc6a592f80d749c03031e7e416090360c36a51a38da083b2b2ed4e75dda5c55a103806d91d2
 
 pkgname = mcxx
 
diff --git a/PKGBUILD b/PKGBUILD
index 25db09b6e66e..0b515e3dc78a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,16 @@
 pkgname='mcxx'
 _bundlepkgname='ompss'
 pkgdesc='Mercurium is a C/C++/Fortran source-to-source compilation infrastructure aimed at fast prototyping developed by the Programming Models group at the Barcelona Supercomputing Center.'
-pkgver='2.1.0'
-_bundlepkgver='17.12.1'
-pkgrel='6'
+pkgver='2.3.0'
+_bundlepkgver='19.06'
+pkgrel='1'
 arch=('i686' 'x86_64')
 url='https://pm.bsc.es/ompss'
 license=('GPL3')
 depends=(nanox gcc-fortran gperf sqlite3)
 makedepends=(python2)
-source=("https://pm.bsc.es/ftp/${_bundlepkgname}/releases/${_bundlepkgname}-${_bundlepkgver}.tar.gz"
-        "https://github.com/bsc-pm/mcxx/commit/26fb7dffbaa06a5389acb1138717b14ce7d350a1.patch"
-        "https://github.com/bsc-pm/mcxx/commit/0f2c80f40f1e452fd450aef20838667eef801475.patch"
-        "https://github.com/bsc-pm/mcxx/commit/862ad57617772802ad6a804a1f5ecf470ca00ddc.patch")
-sha512sums=(e68effb54b3a4e91da22808a928afcd586d41a3825ec2cea1f783a65d4e075cfb07ce3f5a8006c5a204a46f37fc73383cd549f6706ed12124724b6be18520344
-            1de58ecc762c8e6d79e9daf0718a5f1bd96c929effa6962ddd411dc0794061d6d35fc520f2889588b33d5edbdf70c9d0ac5d3800fa669f09a031ec3e55ef5eb6
-            c2fd4647a96de3287d1b15d2ab31d99dfa73c12e7e74a77b4ca6857e7106a0431462055feb570436a4957883bd085a2f0199f046b53a682b984b38862eaa1491
-            ef42c42495717a0c06e6fedf17e2c02904b20f59fd19f114a6d407913f924c340ebbec721252048c394a705bae39234e8c9346e584317ef6356111ae149724c3)
+source=("https://pm.bsc.es/ftp/${_bundlepkgname}/releases/${_bundlepkgname}-${_bundlepkgver}.tar.gz")
+sha512sums=(159efc17ba446f3f2205a8c0580ed10fab263f8bdb7306d5444d1fc6a592f80d749c03031e7e416090360c36a51a38da083b2b2ed4e75dda5c55a103806d91d2)
 
 # WORKAROUND: The sources are outdated compared to Arch's environment,
 #             so we have to downgrade/disable some things...
@@ -25,6 +19,10 @@ sha512sums=(e68effb54b3a4e91da22808a928afcd586d41a3825ec2cea1f783a65d4e075cfb07c
 
 prepare() {
 	cd "$srcdir/${_bundlepkgname}-${_bundlepkgver}/$pkgname-$pkgver"
+}
+
+build() {
+	cd "$srcdir/${_bundlepkgname}-${_bundlepkgver}/$pkgname-$pkgver"
 
 	# WORKAROUND: Force gperf files to be regenerated, to avoid build errors
 	#             (declaration mismatches due to unsigned int / gperf_length_t)
@@ -34,20 +32,6 @@ prepare() {
 	rm src/frontend/cxx-asttype-str-internal.h
 	rm src/frontend/fortran/fortran03-keywords.c
 
-	# WORKAROUND: Those patches are necessary to avoid a _float128 / _Float128 clash
-	#             (due to Arch being more cutting-edge than usual)
-	#             You can test this by building examples in (e.g. 02-beginners/matmul):
-	#             https://github.com/bsc-pm/ompss-ee
-	patch -p1 < "$srcdir/26fb7dffbaa06a5389acb1138717b14ce7d350a1.patch"
-	patch -p1 < "$srcdir/0f2c80f40f1e452fd450aef20838667eef801475.patch"
-
-	# WORKAROUND: Needed to build in GCC8 (but was unnecessary in GCC7)
-	patch -p1 < "$srcdir/862ad57617772802ad6a804a1f5ecf470ca00ddc.patch"
-}
-
-build() {
-	cd "$srcdir/${_bundlepkgname}-${_bundlepkgver}/$pkgname-$pkgver"
-
 	# See https://hub.docker.com/r/bscpm/ompss/dockerfile
 	./configure \
 		--prefix=/usr \