Merge branch 'master' of https://github.com/jasjuang/vcpkg

4 files changed, 72 insertions, 45 deletions

diff --git a/ports/openblas/CONTROL b/ports/openblas/CONTROL
index a3a3f702f..808d52ac9 100644
--- a/ports/openblas/CONTROL
+++ b/ports/openblas/CONTROL
@@ -1,3 +1,3 @@
 Source: openblas
-Version: v0.2.20
+Version: v0.2.20-2
 Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.
diff --git a/ports/openblas/install-openblas.patch b/ports/openblas/install-openblas.patch
index 354b593dc..ef9574cdd 100644
--- a/ports/openblas/install-openblas.patch
+++ b/ports/openblas/install-openblas.patch
@@ -22,40 +22,3 @@ index a379f549..f95a872b 100644
  
  # TODO: Why is the config saved here? Is this necessary with CMake?
  #Save the config files for installation
-diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
-index a7f98bfb..02ab7080 100644
---- a/cmake/prebuild.cmake
-+++ b/cmake/prebuild.cmake
-@@ -37,6 +37,10 @@
- 
- # CPUIDEMU = ../../cpuid/table.o
- 
-+if (NOT DEFINED BLASHELPER_BINARY_DIR)
-+  set(BLASHELPER_BINARY_DIR "${PROJECT_BINARY_DIR}")
-+endif ()
-+
- if (DEFINED CPUIDEMU)
-   set(EXFLAGS "-DCPUIDEMU -DVENDOR=99")
- endif ()
-@@ -95,8 +99,8 @@ endif ()
- message(STATUS "Running getarch")
- 
- # use the cmake binary w/ the -E param to run a shell command in a cross-platform way
--execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT)
--execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE GETARCH_CONF_OUT)
-+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH_BIN} 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT)
-+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE GETARCH_CONF_OUT)
- 
- message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}")
- 
-@@ -121,8 +125,8 @@ if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
- endif ()
- 
- # use the cmake binary w/ the -E param to run a shell command in a cross-platform way
--execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT)
--execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT)
-+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN} 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT)
-+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} ${GETARCH2_CONF_OUT})
diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake
index c437a8642..463db0f25 100644
--- a/ports/openblas/portfile.cmake
+++ b/ports/openblas/portfile.cmake
@@ -21,17 +21,17 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     set(VCPKG_LIBRARY_LINKAGE "dynamic")
 endif()
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openblas-0.2.20)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://codeload.github.com/xianyi/OpenBLAS/zip/v0.2.20"
-    FILENAME "openblas-v0.2.20.zip"
-    SHA512 c9cd7397bb026e3bb06c9407ad5ac26bf936258da81ac22132ceceb53c0235677e18a6046f1db8a75c8a92a614b2d156a3da89d684421a24bd283430ce55db7d
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO xianyi/OpenBLAS
+    REF v0.2.20
+    SHA512 8dfc8e8c8d456b834d2e9544c8eadd9f4770e30db8b8dd76af601ec0735fd86c9cf63dd6a03ccd23fc02ec2e05069a09875b9073dfe29f99aadab3a958ae2634
+    HEAD_REF develop
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/install-openblas.patch"
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/install-openblas.patch" "${CMAKE_CURRENT_LIST_DIR}/whitespace.patch"
 )
 
 find_program(GIT NAMES git git.cmd)
diff --git a/ports/openblas/whitespace.patch b/ports/openblas/whitespace.patch
new file mode 100644
index 000000000..410e81655
--- /dev/null
+++ b/ports/openblas/whitespace.patch
@@ -0,0 +1,64 @@
+diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
+index 02ab708..b51bd0b 100644
+--- a/cmake/prebuild.cmake
++++ b/cmake/prebuild.cmake
+@@ -37,6 +37,10 @@
+ 
+ # CPUIDEMU = ../../cpuid/table.o
+ 
++if (NOT DEFINED BLASHELPER_BINARY_DIR)
++  set(BLASHELPER_BINARY_DIR "${PROJECT_BINARY_DIR}")
++endif ()
++
+ if (DEFINED CPUIDEMU)
+   set(EXFLAGS "-DCPUIDEMU -DVENDOR=99")
+ endif ()
+@@ -87,7 +87,7 @@ file(MAKE_DIRECTORY ${GETARCH_DIR})
+ if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
+   try_compile(GETARCH_RESULT ${GETARCH_DIR}
+     SOURCES ${GETARCH_SRC}
+-    COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I${PROJECT_SOURCE_DIR}
++    COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I"${PROJECT_SOURCE_DIR}"
+     OUTPUT_VARIABLE GETARCH_LOG
+     COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN}
+   )
+@@ -95,8 +99,8 @@ endif ()
+ message(STATUS "Running getarch")
+ 
+ # use the cmake binary w/ the -E param to run a shell command in a cross-platform way
+-execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT)
+-execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE GETARCH_CONF_OUT)
++execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH_BIN} 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT)
++execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE GETARCH_CONF_OUT)
+ 
+ message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}") 
+
+@@ -114,7 +114,7 @@ file(MAKE_DIRECTORY ${GETARCH2_DIR})
+ if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
+   try_compile(GETARCH2_RESULT ${GETARCH2_DIR}
+     SOURCES ${PROJECT_SOURCE_DIR}/getarch_2nd.c
+-    COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GETARCH2_FLAGS} -I${PROJECT_SOURCE_DIR}
++    COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GETARCH2_FLAGS} -I"${PROJECT_SOURCE_DIR}"
+     OUTPUT_VARIABLE GETARCH2_LOG
+     COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH2_BIN}
+   )
+@@ -121,8 +125,8 @@ if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
+ endif ()
+ 
+ # use the cmake binary w/ the -E param to run a shell command in a cross-platform way
+-execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT)
+-execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT)
++execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN} 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT)
++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} ${GETARCH2_CONF_OUT})
+@@ -141,7 +141,7 @@ file(MAKE_DIRECTORY ${GEN_CONFIG_H_DIR})
+ if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
+   try_compile(GEN_CONFIG_H_RESULT ${GEN_CONFIG_H_DIR}
+     SOURCES ${PROJECT_SOURCE_DIR}/gen_config_h.c
+-    COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GEN_CONFIG_H_FLAGS} -I${PROJECT_SOURCE_DIR}
++    COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GEN_CONFIG_H_FLAGS} -I"${PROJECT_SOURCE_DIR}"
+     OUTPUT_VARIABLE GEN_CONFIG_H_LOG
+     COPY_FILE ${PROJECT_BINARY_DIR}/${GEN_CONFIG_H_BIN}
+   )