зеркало из https://github.com/microsoft/vcpkg.git
[openblas] Update version to 0.3.23 (#31367)
* [openblas] Update version to 0.3.23 * version * remove patch * version * new function * version * end line * v db
This commit is contained in:
Родитель
222409d3a4
Коммит
2c7ca69fb1
|
@ -1,43 +0,0 @@
|
|||
diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
|
||||
index 60b7637..a8b34ef 100644
|
||||
--- a/cmake/prebuild.cmake
|
||||
+++ b/cmake/prebuild.cmake
|
||||
@@ -1322,14 +1322,14 @@ else(NOT CMAKE_CROSSCOMPILING)
|
||||
|
||||
set(GETARCH_DIR "${PROJECT_BINARY_DIR}/getarch_build")
|
||||
set(GETARCH_BIN "getarch${CMAKE_EXECUTABLE_SUFFIX}")
|
||||
- file(MAKE_DIRECTORY ${GETARCH_DIR})
|
||||
- configure_file(${TARGET_CONF_TEMP} ${GETARCH_DIR}/${TARGET_CONF} COPYONLY)
|
||||
+ file(MAKE_DIRECTORY "${GETARCH_DIR}")
|
||||
+ configure_file(${TARGET_CONF_TEMP} "${GETARCH_DIR}/${TARGET_CONF}" COPYONLY)
|
||||
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
|
||||
- try_compile(GETARCH_RESULT ${GETARCH_DIR}
|
||||
+ try_compile(GETARCH_RESULT "${GETARCH_DIR}"
|
||||
SOURCES ${GETARCH_SRC}
|
||||
COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I"${GETARCH_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}"
|
||||
OUTPUT_VARIABLE GETARCH_LOG
|
||||
- COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN}
|
||||
+ COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH_BIN}"
|
||||
)
|
||||
|
||||
if (NOT ${GETARCH_RESULT})
|
||||
@@ -1367,14 +1367,14 @@ execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIA
|
||||
|
||||
set(GETARCH2_DIR "${PROJECT_BINARY_DIR}/getarch2_build")
|
||||
set(GETARCH2_BIN "getarch_2nd${CMAKE_EXECUTABLE_SUFFIX}")
|
||||
- file(MAKE_DIRECTORY ${GETARCH2_DIR})
|
||||
- configure_file(${TARGET_CONF_TEMP} ${GETARCH2_DIR}/${TARGET_CONF} COPYONLY)
|
||||
+ file(MAKE_DIRECTORY "${GETARCH2_DIR}")
|
||||
+ configure_file(${TARGET_CONF_TEMP} "${GETARCH2_DIR}/${TARGET_CONF}" COPYONLY)
|
||||
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
|
||||
- try_compile(GETARCH2_RESULT ${GETARCH2_DIR}
|
||||
- SOURCES ${PROJECT_SOURCE_DIR}/getarch_2nd.c
|
||||
+ try_compile(GETARCH2_RESULT "${GETARCH2_DIR}"
|
||||
+ SOURCES "${PROJECT_SOURCE_DIR}/getarch_2nd.c"
|
||||
COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GETARCH2_FLAGS} -I"${GETARCH2_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}"
|
||||
OUTPUT_VARIABLE GETARCH2_LOG
|
||||
- COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH2_BIN}
|
||||
+ COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}"
|
||||
)
|
||||
|
||||
if (NOT ${GETARCH2_RESULT})
|
|
@ -1,12 +1,11 @@
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO xianyi/OpenBLAS
|
||||
REF b89fb708caa5a5a32de8f4306c4ff132e0228e9a # v0.3.21
|
||||
SHA512 495e885409f0c6178332cddd685f3c002dc92e7af251c4e4eb3da6935ef6e81565c2505d436245b9bf53ce58649764e0471dc43b7f5f30b6ed092366cbbc2d5c
|
||||
REF 394a9fbafe9010b76a2615c562204277a956eb52 # v0.3.23
|
||||
SHA512 d79ae7ba4f9146f0bcacdef9b9cf4cd287e5eb2e3891f7deb4b3992b742a557ca094ac2f258420a16cfe6bbda7ca82addf415aecd7ced425a02374847c0b6013
|
||||
HEAD_REF develop
|
||||
PATCHES
|
||||
uwp.patch
|
||||
fix-space-path.patch
|
||||
fix-redefinition-function.patch
|
||||
fix-uwp-build.patch
|
||||
install-tools.patch
|
||||
|
@ -112,4 +111,4 @@ vcpkg_replace_string(
|
|||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
|
||||
--- a/cmake/prebuild.cmake 2019-01-28 03:05:58.422245700 -0600
|
||||
+++ b/cmake/prebuild.cmake 2019-01-28 03:07:02.885495800 -0600
|
||||
@@ -37,6 +37,9 @@
|
||||
index a33acbb..451422d 100644
|
||||
--- a/cmake/prebuild.cmake
|
||||
+++ b/cmake/prebuild.cmake
|
||||
@@ -39,6 +39,9 @@
|
||||
|
||||
# CPUIDEMU = ../../cpuid/table.o
|
||||
|
||||
|
@ -11,7 +12,7 @@ diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
|
|||
|
||||
if (DEFINED CPUIDEMU)
|
||||
set(EXFLAGS "-DCPUIDEMU -DVENDOR=99")
|
||||
@@ -310,8 +313,8 @@ else(NOT CMAKE_CROSSCOMPILING)
|
||||
@@ -1399,8 +1402,8 @@ else(NOT CMAKE_CROSSCOMPILING)
|
||||
message(STATUS "Running getarch")
|
||||
|
||||
# use the cmake binary w/ the -E param to run a shell command in a cross-platform way
|
||||
|
@ -22,7 +23,7 @@ diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
|
|||
|
||||
message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}")
|
||||
|
||||
@@ -337,8 +340,8 @@ execute_process(COMMAND "${PROJECT_BINAR
|
||||
@@ -1426,8 +1429,8 @@ execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIABLE
|
||||
endif ()
|
||||
|
||||
# use the cmake binary w/ the -E param to run a shell command in a cross-platform way
|
||||
|
@ -32,10 +33,9 @@ diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
|
|||
+execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN}" 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT)
|
||||
|
||||
# append config data from getarch_2nd to the TARGET file and read in CMake vars
|
||||
file(APPEND ${TARGET_CONF_TEMP} ${GETARCH2_CONF_OUT})
|
||||
|
||||
file(APPEND "${TARGET_CONF_TEMP}" ${GETARCH2_CONF_OUT})
|
||||
diff --git a/cmake/system.cmake b/cmake/system.cmake
|
||||
index a060d98..52ffa5a 100644
|
||||
index 631e7fe..83220ce 100644
|
||||
--- a/cmake/system.cmake
|
||||
+++ b/cmake/system.cmake
|
||||
@@ -13,6 +13,9 @@ if(CMAKE_CROSSCOMPILING AND NOT DEFINED TARGET)
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
"name": "openblas",
|
||||
"version": "0.3.21",
|
||||
"port-version": 2,
|
||||
"version": "0.3.23",
|
||||
"description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.",
|
||||
"homepage": "https://github.com/xianyi/OpenBLAS",
|
||||
"license": "BSD-3-Clause",
|
||||
|
|
|
@ -5801,8 +5801,8 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"openblas": {
|
||||
"baseline": "0.3.21",
|
||||
"port-version": 2
|
||||
"baseline": "0.3.23",
|
||||
"port-version": 0
|
||||
},
|
||||
"opencascade": {
|
||||
"baseline": "7.6.2",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "716c00140c032ec22773130b006af542e011f00e",
|
||||
"version": "0.3.23",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "ad5694adc46ca2974329e57896d0097e80d65c7d",
|
||||
"version": "0.3.21",
|
||||
|
|
Загрузка…
Ссылка в новой задаче