[arch-commits] Commit in boost1.69/trunk (PKGBUILD)

[Evangelos Foutras]

    Date: Thursday, January 30, 2020 @ 12:05:11
  Author: foutrelis
Revision: 374336

upgpkg: boost1.69 1.69.0-4: fix file conflict with boost (FS#65328)

Modified:
  boost1.69/trunk/PKGBUILD

----------+
 PKGBUILD |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-30 12:02:22 UTC (rev 374335)
+++ PKGBUILD	2020-01-30 12:05:11 UTC (rev 374336)
@@ -13,7 +13,7 @@
 pkgname=('boost1.69-libs' 'boost1.69')
 pkgver=1.69.0
 _boostver=${pkgver//./_}
-pkgrel=3
+pkgrel=4
 url='https://www.boost.org/'
 arch=('x86_64')
 license=('custom')
@@ -131,6 +131,9 @@
    # remove library symlinks shipped in boost1.69 / conflicting with boost-libs
    rm "${pkgdir}"/usr/lib/libboost_*.so
 
+   # remove mpi.so module which conflicts with boost
+   rm "${pkgdir}"/usr/lib/mpi.so
+
    install -Dm644 "${srcdir}/"boost_${_boostver}/LICENSE_1_0.txt \
       "${pkgdir}"/usr/share/licenses/boost1.69-libs/LICENSE_1_0.txt
 }