Upstream is broken with glibc 2.28, and newer gcc. Applied fixes, reported upstream.

1 files changed, 17 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 71de82426ae2..e1e9e2efc28f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,15 +8,15 @@ _pkgname=psm
 pkgver=3.3
 _pkgver_subver=22
 _pkgver_commit=g326b95a
-pkgrel=2
+pkgrel=3
 pkgdesc='OpenFabrics Alliance Intel Performance Scaled Messaging library'
-arch=('x86_64' 'i686')
+arch=('x86_64')
 url='https://www.openfabrics.org/index.php/overview.html'
 license=('GPL2' 'custom:"Open Fabrics Alliance BSD"')
 depends=('glibc' 'libutil-linux')
 makedepends=('git')
 # Latest more-official release at "https://www.openfabrics.org/downloads/${pkgname}/${pkgname}-${pkgver}-${_pkgver_subver}_${_pkgver_commit}_open.tar.gz" is broken
-source=("git+https://github.com/01org/${_pkgname}")
+source=("git+https://github.com/intel/${_pkgname}")
 md5sums=('SKIP')
 
 prepare() {
@@ -24,28 +24,30 @@ prepare() {
   # Latest more-official release at "https://www.openfabrics.org/downloads/${pkgname}/${pkgname}-${pkgver}-${_pkgver_subver}_${_pkgver_commit}_open.tar.gz" is broken
   # This isn't a -git AUR package, so grab the latest known and tested commit, as of the last updating of PKGBUILD 
   git checkout 326b95a
+
+  # Upstream is incompatible with glibc 2.28
+  # https://github.com/intel/psm/issues/25
+  sed 's|#include <sys/types.h>|#include <sys/sysmacros.h>\n#include <sys/types.h>|g' -i ipath/ipath_proto.c
+
+  # Upstream doesn't compile with newer GCC with -Werror
+  # https://github.com/intel/psm/issues/26
+  # NOTE: This gets it to compile, but this could point to an upstream bug
+  sed 's|-Wall $(WERROR)|-Wall|g' -i buildflags.mak
+  sed 's|-Wall -Werror|-Wall|g' -i psmd/Makefile
 }
 
 build() {
   cd "${srcdir}/psm"
-  # infinipath-psm doesn't use configure, just make.  And make without options fails.
-  # And Makefile looks for "arch" environment variable to be x86_64 or i386, which is not set by default on arch linux
-  if [[ "${CARCH}" == 'x86_64' ]]; then
-    make arch="${CARCH}"
-  elif [[ "${CARCH}" == 'i686' ]]; then
-    make arch='i386'
-  fi
+  # infinipath-psm doesn't use configure, just make.  make without options fails.
+  # Makefile looks for "arch" environment variable to be x86_64 or i386, which is not set by default on arch linux
+  make arch=x86_64
 }
 
 package() {
   cd "${srcdir}/psm"
   # Again, Makefile looks for "arch" environment variable to be x86_64 or i386, which is not set by default on arch linux
   # Also note README specifies LIBDIR option is upper case, but it's lower case libdir
-  if [[ "${CARCH}" == 'x86_64' ]]; then
-    make arch="${CARCH}" DESTDIR="${pkgdir}" libdir=/usr/lib install
-  elif [[ "${CARCH}" == 'i686' ]]; then
-    make arch='i386' DESTDIR="${pkgdir}" libdir=/usr/lib install
-  fi
+  make arch=x86_64 DESTDIR="${pkgdir}" libdir=/usr/lib install
   
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }