diff options
| author | myd7349 <myd7349@gmail.com> | 2019-06-19 04:34:43 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-06-18 13:34:43 -0700 |
| commit | 1a63672f8fa796b044c839c777f7113ccea6e635 (patch) | |
| tree | 3647ce538089d9a3a39f223c76aae0b0d7b6253a /ports/shogun | |
| parent | bd5007625e2c44e4474361d9cba5e03fa6e5aab7 (diff) | |
| download | vcpkg-1a63672f8fa796b044c839c777f7113ccea6e635.tar.gz vcpkg-1a63672f8fa796b044c839c777f7113ccea6e635.zip | |
[protobuf] Update to 3.8.0 (#6739)
* [protobuf] Update to 3.8.0
* [nlopt] set options off
* [shogun] should not use CMAKE_SYSTEM_PROCESSOR in port file
* [protobuf] Add Homepage
* [protobuf] turn warning flag off
* [protobuf] Fix orc build error on macOS
* bump shogun, fix nlopt
Diffstat (limited to 'ports/shogun')
| -rw-r--r-- | ports/shogun/CONTROL | 2 | ||||
| -rw-r--r-- | ports/shogun/portfile.cmake | 12 | ||||
| -rw-r--r-- | ports/shogun/use_proper_cmake_symbol.patch | 22 |
3 files changed, 2 insertions, 34 deletions
diff --git a/ports/shogun/CONTROL b/ports/shogun/CONTROL index e57f129fe..69b7968db 100644 --- a/ports/shogun/CONTROL +++ b/ports/shogun/CONTROL @@ -1,4 +1,4 @@ Source: shogun -Version: 6.1.3-3 +Version: 6.1.3-4 Build-Depends: bzip2, eigen3, liblzma, libxml2, openblas (x64&!osx), nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent Description: Unified and efficient Machine Learning diff --git a/ports/shogun/portfile.cmake b/ports/shogun/portfile.cmake index dfabdf4aa..1f46e6ba7 100644 --- a/ports/shogun/portfile.cmake +++ b/ports/shogun/portfile.cmake @@ -10,7 +10,6 @@ vcpkg_from_github( HEAD_REF master PATCHES cmake.patch - use_proper_cmake_symbol.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/external) @@ -23,17 +22,9 @@ else() set(CMAKE_DISABLE_FIND_PACKAGE_BLAS 1) endif() -if(NOT CMAKE_SYSTEM_PROCESSOR) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(CMAKE_SYSTEM_PROCESSOR "__x86_64__") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(CMAKE_SYSTEM_PROCESSOR "__i386__") - endif() -endif() - vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) -set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}") +vcpkg_add_to_path(${PYTHON3_DIR}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -65,7 +56,6 @@ vcpkg_configure_cmake( -DCMAKE_DISABLE_FIND_PACKAGE_BLAS=${CMAKE_DISABLE_FIND_PACKAGE_BLAS} -DINSTALL_TARGETS=shogun-static - -DCMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR} ) vcpkg_install_cmake() diff --git a/ports/shogun/use_proper_cmake_symbol.patch b/ports/shogun/use_proper_cmake_symbol.patch deleted file mode 100644 index 627c5bd77..000000000 --- a/ports/shogun/use_proper_cmake_symbol.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6f97c8b..a10b599 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -145,7 +145,7 @@ ENDIF() - DetectSystemName() - - # Get processor type, sets MACHINE macro --SET(MACHINE ${CMAKE_SYSTEM_PROCESSOR}) -+add_definitions(-DMACHINE=${CMAKE_SYSTEM_PROCESSOR}) - - SET(EXT_LIB_SWIG_RUBY ".so") - if(DARWIN) -@@ -174,7 +174,7 @@ ENDIF() - - IF(CMAKE_COMPILER_IS_GNUCXX) - SET(RELEASE_COMPILER_FLAGS "-fexpensive-optimizations -frerun-cse-after-loop -fcse-follow-jumps -finline-functions -fschedule-insns2 -fthread-jumps -fforce-addr -fstrength-reduce -funroll-loops") -- IF (${MACHINE} MATCHES "x86_64" OR ${MACHINE} MATCHES "i686") -+ IF (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "i686") - SET(RELEASE_COMPILER_FLAGS "${RELEASE_COMPILER_FLAGS} -mfpmath=sse") - ENDIF() - ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") |