diff --git a/mingw-w64-armadillo/0002-fix-pkgconfig-file.patch b/mingw-w64-armadillo/0002-fix-pkgconfig-file.patch new file mode 100644 index 0000000000..ebad6768b0 --- /dev/null +++ b/mingw-w64-armadillo/0002-fix-pkgconfig-file.patch @@ -0,0 +1,12 @@ +--- a/misc/armadillo.pc.in ++++ b/misc/armadillo.pc.in +@@ -1,5 +1,7 @@ +-libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include + + Name: armadillo + Description: Fast C++ matrix library with syntax similar to MATLAB and Octave diff --git a/mingw-w64-armadillo/PKGBUILD b/mingw-w64-armadillo/PKGBUILD index ba1e8c07a1..1c7d76b649 100644 --- a/mingw-w64-armadillo/PKGBUILD +++ b/mingw-w64-armadillo/PKGBUILD @@ -4,7 +4,7 @@ _realname=armadillo pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=10.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="C++ linear algebra library (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -21,13 +21,16 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja") install=${_realname}-${MSYSTEM}.install source=(https://sourceforge.net/projects/arma/files/${_realname}-${pkgver}.tar.xz - 0001-mingw-config-fix.patch) + 0001-mingw-config-fix.patch + 0002-fix-pkgconfig-file.patch) sha256sums=('5087ab5a2268e5ce71798c1afcb6d1fb246463f8dc88a60db49a083600f98332' - '772719e60eb2970ecb37844382dbcb6d0439f949c5080f9865798115640b612a') + '772719e60eb2970ecb37844382dbcb6d0439f949c5080f9865798115640b612a' + '830adb017e12c0e90671471dc6870a28ee21755a55e95280a04f73c2d65d665b') prepare() { cd "${srcdir}/${_realname}-${pkgver}" patch -Np1 -i "${srcdir}/0001-mingw-config-fix.patch" + patch -Np1 -i "${srcdir}/0002-fix-pkgconfig-file.patch" } build() {