armadillo: update to 11.1.1
Remove upstream 0002-fix-pkgconfig-file.patch file
This commit is contained in:
parent
a2235f4f9f
commit
fd6437efac
@ -1,21 +0,0 @@
|
||||
diff -urN armadillo-11.0.1/cmake_aux/Modules/ARMA_FindSuperLU5.cmake.orig armadillo-11.0.1/cmake_aux/Modules/ARMA_FindSuperLU5.cmake
|
||||
--- armadillo-11.0.1/cmake_aux/Modules/ARMA_FindSuperLU5.cmake.orig 2016-06-16 18:24:41.000000000 +0200
|
||||
+++ armadillo-11.0.1/cmake_aux/Modules/ARMA_FindSuperLU5.cmake 2022-04-20 19:02:20.871178800 +0200
|
||||
@@ -6,15 +6,8 @@
|
||||
# SuperLU_INCLUDE_DIR - directory of SuperLU headers
|
||||
|
||||
find_path(SuperLU_INCLUDE_DIR slu_ddefs.h
|
||||
- /usr/include/superlu/
|
||||
- /usr/include/SuperLU/
|
||||
- /usr/include/
|
||||
- /usr/local/include/superlu/
|
||||
- /usr/local/include/SuperLU/
|
||||
- /usr/local/include/
|
||||
- /opt/local/include/superlu/
|
||||
- /opt/local/include/SuperLU/
|
||||
- /opt/local/include/
|
||||
+ PATHS ${CMAKE_SYSTEM_INCLUDE_PATH} /usr/include /usr/local/include /opt/local/include
|
||||
+ PATH_SUFFIXES superlu SuperLU ""
|
||||
)
|
||||
|
||||
find_library(SuperLU_LIBRARY
|
||||
@ -3,7 +3,7 @@
|
||||
_realname=armadillo
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
pkgver=11.0.1
|
||||
pkgver=11.1.1
|
||||
pkgrel=1
|
||||
pkgdesc="C++ linear algebra library (mingw-w64)"
|
||||
arch=('any')
|
||||
@ -22,12 +22,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
|
||||
install=${_realname}-${MSYSTEM}.install
|
||||
source=(https://sourceforge.net/projects/arma/files/${_realname}-${pkgver}.tar.xz
|
||||
0001-mingw-config-fix.patch
|
||||
0002-fix-pkgconfig-file.patch
|
||||
0003-superlu.patch)
|
||||
sha256sums=('e43d4449376c1fc8b562095431bb82cf9c4ff98a791a22a25d0f96e5e7937c22'
|
||||
0002-fix-pkgconfig-file.patch)
|
||||
sha256sums=('bfa6154a5fefd832d28d530a58221fe4a2cff2a3bbdbd82e109bde53fb29dcdb'
|
||||
'772719e60eb2970ecb37844382dbcb6d0439f949c5080f9865798115640b612a'
|
||||
'830adb017e12c0e90671471dc6870a28ee21755a55e95280a04f73c2d65d665b'
|
||||
'615a7ee7669d5cc54e21a63047b864dfadfb4b7dc6fb0f8f4bd93fe977b08496')
|
||||
'830adb017e12c0e90671471dc6870a28ee21755a55e95280a04f73c2d65d665b')
|
||||
|
||||
# Helper macros to help make tasks easier #
|
||||
apply_patch_with_msg() {
|
||||
@ -44,10 +42,6 @@ prepare() {
|
||||
apply_patch_with_msg \
|
||||
0001-mingw-config-fix.patch \
|
||||
0002-fix-pkgconfig-file.patch
|
||||
|
||||
# https://gitlab.com/conradsnicta/armadillo-code/-/commit/bffb20645919adc52f79e30e940d583bebe3bae0
|
||||
apply_patch_with_msg \
|
||||
0003-superlu.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user