diff --git a/ports/nlopt/CONTROL b/ports/nlopt/CONTROL index 81a24bef7..0cc7666bb 100644 --- a/ports/nlopt/CONTROL +++ b/ports/nlopt/CONTROL @@ -1,4 +1,4 @@ Source: nlopt -Version: 2.6.1 +Version: 2.6.1-1 Homepage: https://github.com/stevengj/nlopt -Description: a library for nonlinear local and global optimization, for functions with and without gradient information. +Description: a library for nonlinear local and global optimization, for functions with and without gradient information. \ No newline at end of file diff --git a/ports/nlopt/portfile.cmake b/ports/nlopt/portfile.cmake index 301c92e30..c5017f4f8 100644 --- a/ports/nlopt/portfile.cmake +++ b/ports/nlopt/portfile.cmake @@ -13,6 +13,13 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DNLOPT_FORTRAN=OFF + -DNLOPT_PYTHON=OFF + -DNLOPT_OCTAVE=OFF + -DNLOPT_MATLAB=OFF + -DNLOPT_GUILE=OFF + -DNLOPT_SWIG=OFF ) vcpkg_install_cmake() diff --git a/ports/orc/CONTROL b/ports/orc/CONTROL index 1cb8967ed..4cb08a814 100644 --- a/ports/orc/CONTROL +++ b/ports/orc/CONTROL @@ -1,4 +1,4 @@ Source: orc -Version: 1.5.5 +Version: 1.5.5-1 Build-Depends: zlib, protobuf, lz4, snappy, zstd, gtest Description: The smallest, fastest columnar storage for Hadoop workloads. diff --git a/ports/orc/no-werror.patch b/ports/orc/no-werror.patch new file mode 100644 index 000000000..d2572612f --- /dev/null +++ b/ports/orc/no-werror.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4484e373..87b5ed41 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -81,9 +81,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set (WARN_FLAGS "${WARN_FLAGS} -Wno-covered-switch-default") + set (WARN_FLAGS "${WARN_FLAGS} -Wno-missing-noreturn -Wno-unknown-pragmas") + set (WARN_FLAGS "${WARN_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") +- set (WARN_FLAGS "${WARN_FLAGS} -Wconversion -Werror") ++ set (WARN_FLAGS "${WARN_FLAGS} -Wconversion") + elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- set (WARN_FLAGS "-Wall -Wno-unknown-pragmas -Wconversion -Werror") ++ set (WARN_FLAGS "-Wall -Wno-unknown-pragmas -Wconversion") + if (CMAKE_CXX_COMPILER_VERSION STREQUAL "" OR + CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") + set (CXX11_FLAGS "-std=c++0x") diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake index e72f9fd69..f993755e9 100644 --- a/ports/orc/portfile.cmake +++ b/ports/orc/portfile.cmake @@ -8,7 +8,8 @@ vcpkg_from_github( HEAD_REF master PATCHES 0003-dependencies-from-vcpkg.patch - ) + no-werror.patch +) file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake") file(REMOVE "${SOURCE_PATH}/cmake_modules/FindLZ4.cmake") diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL index caca65297..bce258d24 100644 --- a/ports/protobuf/CONTROL +++ b/ports/protobuf/CONTROL @@ -1,8 +1,8 @@ Source: protobuf -Version: 3.7.1 +Version: 3.8.0 Homepage: https://github.com/google/protobuf Description: Protocol Buffers - Google's data interchange format Feature: zlib Description: ZLib based features like Gzip streams -Build-Depends: zlib +Build-Depends: zlib \ No newline at end of file diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 9e0bc15d7..982345db1 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/protobuf - REF v3.7.1 - SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f + REF v3.8.0 + SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2 HEAD_REF master PATCHES fix-uwp.patch 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")