[blaze] Fix the SHA512 in the 'portfile.cmake' (#4138)

* [blaze] Fix the SHA512 in the 'portfile.cmake'

* [blaze] Use commit SHA to avoid future tag movement. Fix patches.

5 files changed, 39 insertions, 65 deletions

diff --git a/ports/blaze/CONTROL b/ports/blaze/CONTROL
index c7330bd4b..dc80b4c41 100644
--- a/ports/blaze/CONTROL
+++ b/ports/blaze/CONTROL
@@ -1,4 +1,4 @@
 Source: blaze
-Version: 3.4
+Version: 3.4-1
 Build-Depends: clapack, boost-exception
 Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.
diff --git a/ports/blaze/no-generate-to-source-dir.patch b/ports/blaze/avoid-src-dir-generation.patch
index 2ef7cc76f..c57d6a429 100644
--- a/ports/blaze/no-generate-to-source-dir.patch
+++ b/ports/blaze/avoid-src-dir-generation.patch
@@ -1,8 +1,28 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt

-index fcb79e6..c04a3f0 100644

+index 7ecc993..793ec34 100644

 --- a/CMakeLists.txt

 +++ b/CMakeLists.txt

-@@ -151,7 +151,7 @@ endif ()

+@@ -63,8 +63,8 @@ endif()

+ #==================================================================================================

+ 

+ find_package(LAPACK REQUIRED)

+-target_link_libraries(blaze INTERFACE ${LAPACK_LIBRARIES})

+-target_compile_options(blaze INTERFACE ${LAPACK_LINKER_FLAGS})

++target_link_libraries(blaze INTERFACE $<BUILD_INTERFACE:${LAPACK_LIBRARIES}>)

++target_compile_options(blaze INTERFACE $<BUILD_INTERFACE:${LAPACK_LINKER_FLAGS}>)

+ 

+ 

+ #==================================================================================================

+@@ -72,7 +72,7 @@ target_compile_options(blaze INTERFACE ${LAPACK_LINKER_FLAGS})

+ #==================================================================================================

+ 

+ find_package(Boost 1.54.0 REQUIRED)

+-target_include_directories(blaze INTERFACE ${Boost_INCLUDE_DIRS})

++target_include_directories(blaze INTERFACE $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>)

+ 

+ 

+ #==================================================================================================

+@@ -163,7 +163,7 @@ endif ()

  set(BLAZE_CACHE_SIZE ${BLAZE_CACHE_SIZE} CACHE STRING "Cache size of the CPU in bytes." FORCE)

  

  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/CacheSize.h.in"

@@ -11,7 +31,7 @@ index fcb79e6..c04a3f0 100644
  

  

  #==================================================================================================

-@@ -204,7 +204,7 @@ else ()

+@@ -216,7 +216,7 @@ else ()

  endif ()

  

  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/BLAS.h.in"

@@ -20,7 +40,7 @@ index fcb79e6..c04a3f0 100644
  

  

  #==================================================================================================

-@@ -215,7 +215,7 @@ set(BLAZE_TRANSPOSE_FLAG "columnVector" CACHE STRING "Specify the default transp

+@@ -227,7 +227,7 @@ set(BLAZE_TRANSPOSE_FLAG "columnVector" CACHE STRING "Specify the default transp

  set_property(CACHE BLAZE_TRANSPOSE_FLAG PROPERTY STRINGS "columnVector;rowVector")

  

  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/TransposeFlag.h.in"

@@ -29,7 +49,7 @@ index fcb79e6..c04a3f0 100644
  

  

  #==================================================================================================

-@@ -226,7 +226,7 @@ set(BLAZE_STORAGE_ORDER "rowMajor" CACHE STRING "Specify the default storage ord

+@@ -238,7 +238,7 @@ set(BLAZE_STORAGE_ORDER "rowMajor" CACHE STRING "Specify the default storage ord

  set_property(CACHE BLAZE_STORAGE_ORDER PROPERTY STRINGS "rowMajor;columnMajor")

  

  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/StorageOrder.h.in"

@@ -38,7 +58,7 @@ index fcb79e6..c04a3f0 100644
  

  

  #==================================================================================================

-@@ -242,7 +242,7 @@ else ()

+@@ -254,7 +254,7 @@ else ()

  endif ()

  

  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Vectorization.h.in"

@@ -47,7 +67,7 @@ index fcb79e6..c04a3f0 100644
  

  

  #==================================================================================================

-@@ -288,7 +288,7 @@ elseif (BLAZE_SMP_THREADS STREQUAL "HPX")

+@@ -300,7 +300,7 @@ elseif (BLAZE_SMP_THREADS STREQUAL "HPX")

  endif ()

  

  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/SMP.h.in"

@@ -56,7 +76,7 @@ index fcb79e6..c04a3f0 100644
  

  

  #==================================================================================================

-@@ -304,7 +304,7 @@ else ()

+@@ -316,7 +316,7 @@ else ()

  endif ()

  

  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Restrict.h.in"

@@ -65,7 +85,7 @@ index fcb79e6..c04a3f0 100644
  

  

  #==================================================================================================

-@@ -334,7 +334,7 @@ else ()

+@@ -346,7 +346,7 @@ else ()

  endif ()

  

  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Optimizations.h.in"

@@ -74,7 +94,7 @@ index fcb79e6..c04a3f0 100644
  

  

  #==================================================================================================

-@@ -352,7 +352,7 @@ else ()

+@@ -364,7 +364,7 @@ else ()

  endif ()

  

  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Inline.h.in"

@@ -83,23 +103,11 @@ index fcb79e6..c04a3f0 100644
  

  

  #==================================================================================================

-@@ -360,6 +360,19 @@ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Inline.h.in"

- #==================================================================================================

+@@ -379,6 +379,7 @@ write_basic_package_version_file(

+    COMPATIBILITY SameMajorVersion

+    )

  

++install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/blaze DESTINATION include)

  install(DIRECTORY blaze DESTINATION include)

-+install(

-+    FILES

-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/BLAS.h"

-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/CacheSize.h"

-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Inline.h"

-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Optimizations.h"

-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Restrict.h"

-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/SMP.h"

-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/StorageOrder.h"

-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/TransposeFlag.h"

-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Vectorization.h"

-+    DESTINATION include/blaze/config

-+)

  install(TARGETS blaze EXPORT blazeTargets)

  

- configure_file(

diff --git a/ports/blaze/no-absolute-paths-in-install.patch b/ports/blaze/no-absolute-paths-in-install.patch
deleted file mode 100644
index a601a37e7..000000000
--- a/ports/blaze/no-absolute-paths-in-install.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0d102ab..5d918b8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,7 +36,7 @@ cmake_minimum_required(VERSION 3.5)
- add_library(blaze INTERFACE)
- target_include_directories(blaze INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
--   $<INSTALL_INTERFACE:install>
-+   $<INSTALL_INTERFACE:include>
-    )
- 
- target_compile_options(blaze INTERFACE
-@@ -48,8 +48,8 @@ target_compile_options(blaze INTERFACE
- #==================================================================================================
- 
- find_package(LAPACK REQUIRED)
--target_link_libraries(blaze INTERFACE ${LAPACK_LIBRARIES})
--target_compile_options(blaze INTERFACE ${LAPACK_LINKER_FLAGS})
-+target_link_libraries(blaze INTERFACE $<BUILD_INTERFACE:${LAPACK_LIBRARIES}>)
-+target_compile_options(blaze INTERFACE $<BUILD_INTERFACE:${LAPACK_LINKER_FLAGS}>)
- 
- 
- #==================================================================================================
-@@ -57,7 +57,7 @@ target_compile_options(blaze INTERFACE ${LAPACK_LINKER_FLAGS})
- #==================================================================================================
- 
- find_package(Boost 1.54.0 REQUIRED)
--target_include_directories(blaze INTERFACE ${Boost_INCLUDE_DIRS})
-+target_include_directories(blaze INTERFACE $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>)
- 
- 
- #==================================================================================================
diff --git a/ports/blaze/portfile.cmake b/ports/blaze/portfile.cmake
index 9f5a4a0a8..53e845b70 100644
--- a/ports/blaze/portfile.cmake
+++ b/ports/blaze/portfile.cmake
@@ -3,16 +3,15 @@ include(vcpkg_common_functions)
 vcpkg_from_bitbucket(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO blaze-lib/blaze
-    REF v3.4
-    SHA512 bdfc04aa07263f508079f8b1613dc7afe61ec3e3137b4f7b2900331d32d8358341c6b6cc7afd6e893246b5497f3289e1d2ad0f3af37b443eab1122ff479f065c
+    REF bbe39c81b68eb0d8647da703899e1ee4a82cdfd3
+    SHA512 84eb8226672d9d11d194d165e7aaa333a0d49ca090bb94472f19242e5f2ad0c3e08a30cdafe055cff51b210b603533f879800bd6784f3ffdb0d9eeca65d58b25
     HEAD_REF master
 )
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/no-absolute-paths-in-install.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/no-generate-to-source-dir.patch"
+        avoid-src-dir-generation.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/scripts/cmake/vcpkg_from_bitbucket.cmake b/scripts/cmake/vcpkg_from_bitbucket.cmake
index a12d86b43..7eaf550bb 100644
--- a/scripts/cmake/vcpkg_from_bitbucket.cmake
+++ b/scripts/cmake/vcpkg_from_bitbucket.cmake
@@ -115,7 +115,7 @@ function(vcpkg_from_bitbucket)
             string(REGEX REPLACE "\"hash\": \"([a-f0-9]+)\"" "\\1" _version ${x})
             string(SUBSTRING ${_version} 0 12 _version) # Get the 12 first numbers from commit hash
         else()
-            set(_version ${_vdud_REF})
+            string(SUBSTRING ${_vdud_REF} 0 12 _version) # Get the 12 first numbers from commit hash
         endif()
 
         vcpkg_download_distfile(ARCHIVE