From a2af945885029212c9d5d6e58b0ca3cff0d6a181 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Mon, 1 Feb 2021 00:56:53 -0800 Subject: [PATCH 1/4] [armadillo] Update to 10.2.0 and also update the repository --- ports/armadillo/CONTROL | 4 +- .../armadillo/add-disable-find-package.patch | 120 +++++++++--------- ports/armadillo/fix-CMakePath.patch | 26 ++-- ports/armadillo/portfile.cmake | 15 +-- ports/armadillo/remove_custom_modules.patch | 44 ++++--- 5 files changed, 105 insertions(+), 104 deletions(-) diff --git a/ports/armadillo/CONTROL b/ports/armadillo/CONTROL index 0939fe8f269fe8..d903f6472ed481 100644 --- a/ports/armadillo/CONTROL +++ b/ports/armadillo/CONTROL @@ -1,5 +1,5 @@ Source: armadillo -Version: 10.1.0 -Homepage: https://gitlab.com/conradsnicta/armadillo-code +Version: 10.2.0 +Homepage: http://arma.sourceforge.net Description: Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use Build-Depends: blas, lapack diff --git a/ports/armadillo/add-disable-find-package.patch b/ports/armadillo/add-disable-find-package.patch index a3262823323891..4428b8a0ae7b95 100644 --- a/ports/armadillo/add-disable-find-package.patch +++ b/ports/armadillo/add-disable-find-package.patch @@ -1,60 +1,60 @@ -diff --git a/cmake_aux/Modules/ARMA_FindARPACK.cmake b/cmake_aux/Modules/ARMA_FindARPACK.cmake -index 1a709ad..3029c25 100644 ---- a/cmake_aux/Modules/ARMA_FindARPACK.cmake -+++ b/cmake_aux/Modules/ARMA_FindARPACK.cmake -@@ -4,6 +4,10 @@ - # ARPACK_FOUND - system has ARPACK - # ARPACK_LIBRARY - Link this to use ARPACK - -+if(CMAKE_DISABLE_FIND_PACKAGE_ARPACK) -+ set(ARPACK_FOUND NO) -+ return() -+endif() - - find_library(ARPACK_LIBRARY - NAMES arpack -diff --git a/cmake_aux/Modules/ARMA_FindATLAS.cmake b/cmake_aux/Modules/ARMA_FindATLAS.cmake -index 491a361..e40a0ff 100644 ---- a/cmake_aux/Modules/ARMA_FindATLAS.cmake -+++ b/cmake_aux/Modules/ARMA_FindATLAS.cmake -@@ -1,3 +1,8 @@ -+if(CMAKE_DISABLE_FIND_PACKAGE_ATLAS) -+ set(ATLAS_FOUND NO) -+ return() -+endif() -+ - find_path(ATLAS_CBLAS_INCLUDE_DIR - NAMES cblas.h - PATHS /usr/include/atlas/ /usr/include/ /usr/local/include/atlas/ /usr/local/include/ -diff --git a/cmake_aux/Modules/ARMA_FindMKL.cmake b/cmake_aux/Modules/ARMA_FindMKL.cmake -index 0fd5b06..d6bcd49 100644 ---- a/cmake_aux/Modules/ARMA_FindMKL.cmake -+++ b/cmake_aux/Modules/ARMA_FindMKL.cmake -@@ -6,6 +6,11 @@ - ## the link below explains why we're linking only with mkl_rt - ## https://software.intel.com/en-us/articles/a-new-linking-model-single-dynamic-library-mkl_rt-since-intel-mkl-103 - -+if(CMAKE_DISABLE_FIND_PACKAGE_MKL) -+ set(MKL_FOUND NO) -+ return() -+endif() -+ - set(MKL_NAMES ${MKL_NAMES} mkl_rt) - #set(MKL_NAMES ${MKL_NAMES} mkl_lapack) - #set(MKL_NAMES ${MKL_NAMES} mkl_intel_thread) -diff --git a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake -index abf046d..e496cb0 100644 ---- a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake -+++ b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake -@@ -5,6 +5,11 @@ - # SuperLU_LIBRARY - Link this to use SuperLU - # SuperLU_INCLUDE_DIR - directory of SuperLU headers - -+if(CMAKE_DISABLE_FIND_PACKAGE_SuperLU) -+ set(SuperLU_FOUND OFF) -+ return() -+endif() -+ - find_path(SuperLU_INCLUDE_DIR slu_ddefs.h - /usr/include/superlu/ - /usr/include/SuperLU/ +diff --git a/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindARPACK.cmake b/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindARPACK.cmake +index 1a709ad..3029c25 100644 +--- a/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindARPACK.cmake ++++ b/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindARPACK.cmake +@@ -4,6 +4,10 @@ + # ARPACK_FOUND - system has ARPACK + # ARPACK_LIBRARY - Link this to use ARPACK + ++if(CMAKE_DISABLE_FIND_PACKAGE_ARPACK) ++ set(ARPACK_FOUND NO) ++ return() ++endif() + + find_library(ARPACK_LIBRARY + NAMES arpack +diff --git a/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindATLAS.cmake b/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindATLAS.cmake +index 491a361..e40a0ff 100644 +--- a/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindATLAS.cmake ++++ b/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindATLAS.cmake +@@ -1,3 +1,8 @@ ++if(CMAKE_DISABLE_FIND_PACKAGE_ATLAS) ++ set(ATLAS_FOUND NO) ++ return() ++endif() ++ + find_path(ATLAS_CBLAS_INCLUDE_DIR + NAMES cblas.h + PATHS /usr/include/atlas/ /usr/include/ /usr/local/include/atlas/ /usr/local/include/ +diff --git a/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindMKL.cmake b/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindMKL.cmake +index 0fd5b06..d6bcd49 100644 +--- a/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindMKL.cmake ++++ b/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindMKL.cmake +@@ -6,6 +6,11 @@ + ## the link below explains why we're linking only with mkl_rt + ## https://software.intel.com/en-us/articles/a-new-linking-model-single-dynamic-library-mkl_rt-since-intel-mkl-103 + ++if(CMAKE_DISABLE_FIND_PACKAGE_MKL) ++ set(MKL_FOUND NO) ++ return() ++endif() ++ + set(MKL_NAMES ${MKL_NAMES} mkl_rt) + #set(MKL_NAMES ${MKL_NAMES} mkl_lapack) + #set(MKL_NAMES ${MKL_NAMES} mkl_intel_thread) +diff --git a/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindSuperLU5.cmake b/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindSuperLU5.cmake +index abf046d..e496cb0 100644 +--- a/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindSuperLU5.cmake ++++ b/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindSuperLU5.cmake +@@ -5,6 +5,11 @@ + # SuperLU_LIBRARY - Link this to use SuperLU + # SuperLU_INCLUDE_DIR - directory of SuperLU headers + ++if(CMAKE_DISABLE_FIND_PACKAGE_SuperLU) ++ set(SuperLU_FOUND OFF) ++ return() ++endif() ++ + find_path(SuperLU_INCLUDE_DIR slu_ddefs.h + /usr/include/superlu/ + /usr/include/SuperLU/ diff --git a/ports/armadillo/fix-CMakePath.patch b/ports/armadillo/fix-CMakePath.patch index 6d16a26f8e01e9..a53833ef04ae91 100644 --- a/ports/armadillo/fix-CMakePath.patch +++ b/ports/armadillo/fix-CMakePath.patch @@ -1,13 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0fb228f..19cfdf8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -611,7 +611,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION - # and install it - set(ARMADILLO_INCLUDE_DIRS "${CMAKE_INSTALL_FULL_INCLUDEDIR}") - set(ARMADILLO_LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") --set(ARMADILLO_CMAKE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo/CMake") -+set(ARMADILLO_CMAKE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo") - - - message(STATUS "Generating '${PROJECT_BINARY_DIR}/InstallFiles/ArmadilloConfig.cmake'") +diff --git a/armadillo-10.2.0/CMakeLists.txt b/armadillo-10.2.0/CMakeLists.txt +index ea5516e..ecd14bc 100644 +--- a/armadillo-10.2.0/CMakeLists.txt ++++ b/armadillo-10.2.0/CMakeLists.txt +@@ -615,7 +615,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION + # and install it + set(ARMADILLO_INCLUDE_DIRS "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + set(ARMADILLO_LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") +-set(ARMADILLO_CMAKE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo/CMake") ++set(ARMADILLO_CMAKE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo") + + + message(STATUS "Generating '${PROJECT_BINARY_DIR}/InstallFiles/ArmadilloConfig.cmake'") diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index 7ec7bdad0c8250..ca36bcfe2ac2bd 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_gitlab( - GITLAB_URL https://gitlab.com +vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH - REPO conradsnicta/armadillo-code - REF 24b4762cbfbd3ad14c99a4854acd3560559a3195 #v 10.1.0 - SHA512 224a875d21168f80e00604185ef72cb559a86a350a037c9cd1660a6f4dcc68f2ebf6dbc073f234a3cb03d35d959adb44ec49af88b11e3aaca9e0017c9c3fcee6 - HEAD_REF 10.1.x + REPO arma + FILENAME "armadillo-10.2.0.tar.xz" + NO_REMOVE_ONE_LEVEL + SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd PATCHES remove_custom_modules.patch fix-CMakePath.patch @@ -18,7 +17,7 @@ file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindLAPACK.cmake) file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindOpenBLAS.cmake) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH ${SOURCE_PATH}/armadillo-10.2.0 DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS @@ -47,4 +46,4 @@ if(SHARE_LEN EQUAL 0) endif() file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/armadillo-10.2.0/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/armadillo/remove_custom_modules.patch b/ports/armadillo/remove_custom_modules.patch index 1ce5984bfea835..6c4344ecc8cb56 100644 --- a/ports/armadillo/remove_custom_modules.patch +++ b/ports/armadillo/remove_custom_modules.patch @@ -1,21 +1,23 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0fb228f..2275734 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -321,14 +321,13 @@ else() - set(ARMA_OS unix) - - include(ARMA_FindMKL) -- include(ARMA_FindOpenBLAS) - include(ARMA_FindATLAS) -- include(ARMA_FindBLAS) -- include(ARMA_FindLAPACK) - - if(ALLOW_FLEXIBLAS_LINUX AND (${CMAKE_SYSTEM_NAME} MATCHES "Linux")) - include(ARMA_FindFlexiBLAS) - endif() -+ find_package(BLAS) -+ find_package(LAPACK) - - message(STATUS " MKL_FOUND = ${MKL_FOUND}" ) - message(STATUS " OpenBLAS_FOUND = ${OpenBLAS_FOUND}" ) +diff --git a/armadillo-10.2.0/CMakeLists.txt b/armadillo-10.2.0/CMakeLists.txt +index ab7dbed..ea5516e 100644 +--- a/armadillo-10.2.0/CMakeLists.txt ++++ b/armadillo-10.2.0/CMakeLists.txt +@@ -324,15 +324,15 @@ if(APPLE) + else() + + include(ARMA_FindMKL) +- include(ARMA_FindOpenBLAS) + include(ARMA_FindATLAS) +- include(ARMA_FindBLAS) +- include(ARMA_FindLAPACK) + + if(ALLOW_FLEXIBLAS_LINUX AND (${CMAKE_SYSTEM_NAME} MATCHES "Linux")) + include(ARMA_FindFlexiBLAS) + endif() + ++ find_package(BLAS) ++ find_package(LAPACK) ++ + message(STATUS " MKL_FOUND = ${MKL_FOUND}" ) + message(STATUS " OpenBLAS_FOUND = ${OpenBLAS_FOUND}" ) + message(STATUS " ATLAS_FOUND = ${ATLAS_FOUND}" ) From 18c25e44bf816af29e811842b98d79fc8f694899 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Mon, 1 Feb 2021 01:49:16 -0800 Subject: [PATCH 2/4] Update versions --- versions/a-/armadillo.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index fa267c3876288d..4098b8a29f69e9 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "801aec8388549da9e8649aa70b323166b019e1e0", + "version-string": "10.2.0", + "port-version": 0 + }, { "git-tree": "fa82d7d3b12f794825dad7fddcda2b08f268c2b2", "version-string": "10.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8e1b31d6c043e3..d06dc7c991bbb2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -137,7 +137,7 @@ "port-version": 0 }, "armadillo": { - "baseline": "10.1.0", + "baseline": "10.2.0", "port-version": 0 }, "arrayfire": { From 83b8f3bc8b7a6af3069fbecb91c9199eea020a43 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Tue, 2 Feb 2021 19:02:08 -0800 Subject: [PATCH 3/4] Remove NO_REMOVE_ONE_LEVEL and update patches --- .../armadillo/add-disable-find-package.patch | 24 +++++++++---------- ports/armadillo/fix-CMakePath.patch | 6 ++--- ports/armadillo/portfile.cmake | 5 ++-- ports/armadillo/remove_custom_modules.patch | 6 ++--- versions/a-/armadillo.json | 2 +- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/ports/armadillo/add-disable-find-package.patch b/ports/armadillo/add-disable-find-package.patch index 4428b8a0ae7b95..b5d67d5c21a741 100644 --- a/ports/armadillo/add-disable-find-package.patch +++ b/ports/armadillo/add-disable-find-package.patch @@ -1,7 +1,7 @@ -diff --git a/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindARPACK.cmake b/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindARPACK.cmake +diff --git a/cmake_aux/Modules/ARMA_FindARPACK.cmake b/cmake_aux/Modules/ARMA_FindARPACK.cmake index 1a709ad..3029c25 100644 ---- a/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindARPACK.cmake -+++ b/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindARPACK.cmake +--- a/cmake_aux/Modules/ARMA_FindARPACK.cmake ++++ b/cmake_aux/Modules/ARMA_FindARPACK.cmake @@ -4,6 +4,10 @@ # ARPACK_FOUND - system has ARPACK # ARPACK_LIBRARY - Link this to use ARPACK @@ -13,10 +13,10 @@ index 1a709ad..3029c25 100644 find_library(ARPACK_LIBRARY NAMES arpack -diff --git a/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindATLAS.cmake b/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindATLAS.cmake +diff --git a/cmake_aux/Modules/ARMA_FindATLAS.cmake b/cmake_aux/Modules/ARMA_FindATLAS.cmake index 491a361..e40a0ff 100644 ---- a/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindATLAS.cmake -+++ b/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindATLAS.cmake +--- a/cmake_aux/Modules/ARMA_FindATLAS.cmake ++++ b/cmake_aux/Modules/ARMA_FindATLAS.cmake @@ -1,3 +1,8 @@ +if(CMAKE_DISABLE_FIND_PACKAGE_ATLAS) + set(ATLAS_FOUND NO) @@ -26,10 +26,10 @@ index 491a361..e40a0ff 100644 find_path(ATLAS_CBLAS_INCLUDE_DIR NAMES cblas.h PATHS /usr/include/atlas/ /usr/include/ /usr/local/include/atlas/ /usr/local/include/ -diff --git a/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindMKL.cmake b/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindMKL.cmake +diff --git a/cmake_aux/Modules/ARMA_FindMKL.cmake b/cmake_aux/Modules/ARMA_FindMKL.cmake index 0fd5b06..d6bcd49 100644 ---- a/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindMKL.cmake -+++ b/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindMKL.cmake +--- a/cmake_aux/Modules/ARMA_FindMKL.cmake ++++ b/cmake_aux/Modules/ARMA_FindMKL.cmake @@ -6,6 +6,11 @@ ## the link below explains why we're linking only with mkl_rt ## https://software.intel.com/en-us/articles/a-new-linking-model-single-dynamic-library-mkl_rt-since-intel-mkl-103 @@ -42,10 +42,10 @@ index 0fd5b06..d6bcd49 100644 set(MKL_NAMES ${MKL_NAMES} mkl_rt) #set(MKL_NAMES ${MKL_NAMES} mkl_lapack) #set(MKL_NAMES ${MKL_NAMES} mkl_intel_thread) -diff --git a/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindSuperLU5.cmake b/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindSuperLU5.cmake +diff --git a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake index abf046d..e496cb0 100644 ---- a/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindSuperLU5.cmake -+++ b/armadillo-10.2.0/cmake_aux/Modules/ARMA_FindSuperLU5.cmake +--- a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake ++++ b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake @@ -5,6 +5,11 @@ # SuperLU_LIBRARY - Link this to use SuperLU # SuperLU_INCLUDE_DIR - directory of SuperLU headers diff --git a/ports/armadillo/fix-CMakePath.patch b/ports/armadillo/fix-CMakePath.patch index a53833ef04ae91..cfafc4f289ead3 100644 --- a/ports/armadillo/fix-CMakePath.patch +++ b/ports/armadillo/fix-CMakePath.patch @@ -1,7 +1,7 @@ -diff --git a/armadillo-10.2.0/CMakeLists.txt b/armadillo-10.2.0/CMakeLists.txt +diff --git a/CMakeLists.txt b/CMakeLists.txt index ea5516e..ecd14bc 100644 ---- a/armadillo-10.2.0/CMakeLists.txt -+++ b/armadillo-10.2.0/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -615,7 +615,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION # and install it set(ARMADILLO_INCLUDE_DIRS "${CMAKE_INSTALL_FULL_INCLUDEDIR}") diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index ca36bcfe2ac2bd..bc275cb66a478c 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -4,7 +4,6 @@ vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO arma FILENAME "armadillo-10.2.0.tar.xz" - NO_REMOVE_ONE_LEVEL SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd PATCHES remove_custom_modules.patch @@ -17,7 +16,7 @@ file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindLAPACK.cmake) file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindOpenBLAS.cmake) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/armadillo-10.2.0 + SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS @@ -46,4 +45,4 @@ if(SHARE_LEN EQUAL 0) endif() file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/armadillo-10.2.0/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/armadillo/remove_custom_modules.patch b/ports/armadillo/remove_custom_modules.patch index 6c4344ecc8cb56..88631b573aab49 100644 --- a/ports/armadillo/remove_custom_modules.patch +++ b/ports/armadillo/remove_custom_modules.patch @@ -1,7 +1,7 @@ -diff --git a/armadillo-10.2.0/CMakeLists.txt b/armadillo-10.2.0/CMakeLists.txt +diff --git a/CMakeLists.txt b/CMakeLists.txt index ab7dbed..ea5516e 100644 ---- a/armadillo-10.2.0/CMakeLists.txt -+++ b/armadillo-10.2.0/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -324,15 +324,15 @@ if(APPLE) else() diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index 8980046241e913..39132acf263ff3 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -4,7 +4,7 @@ "git-tree": "801aec8388549da9e8649aa70b323166b019e1e0", "version-string": "10.2.0", "port-version": 0 - }, + }, { "git-tree": "3ec327570d6731dbd87ebdee5a0cebdd8bd62ed7", "version-string": "10.1.0", From 9985f2fffc0488d7e2d8e08f3e52d9acddfb595b Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Tue, 2 Feb 2021 19:04:20 -0800 Subject: [PATCH 4/4] Update versions/a-/armadillo.json --- versions/a-/armadillo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index 39132acf263ff3..2dfbf6adfed539 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "801aec8388549da9e8649aa70b323166b019e1e0", + "git-tree": "8f9484de18ab042899bdf1fd033f6522ff091225", "version-string": "10.2.0", "port-version": 0 },