mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[getdns/flint/arb] Update to the latest version (#20050)
* [getdns/flint] Update to the latest version * [getdns/flint] Update to the latest version * [flint] Add unsupported on uwp * Update version files * [flint] Handle dllimport macro in header files * [arb] Update to 2.21.0 * [arb] Update to 2.2.1 and use upstream CMakeLists.txt * [arb] App patch * Update versions/a-/arb.json
This commit is contained in:
NancyLi1013
GitHub
parent
637c236d18
commit
41d944f701
@ -1,87 +0,0 @@
|
||||
cmake_minimum_required(VERSION 2.8.12)
|
||||
|
||||
project(arb C)
|
||||
|
||||
set (DEPS mpir mpfr pthreads flint2 gettimeofday)
|
||||
set (mpir_lib gmp mpir)
|
||||
set (mpfr_lib mpfr)
|
||||
set (pthreads_lib pthreads pthread pthreadVC2 pthreadVC3)
|
||||
set (flint2_lib ${LIBRARY_TYPE}_flint flint)
|
||||
set (gettimeofday_lib gettimeofday)
|
||||
|
||||
set (mpir_header gmp.h)
|
||||
set (mpfr_header mpfr.h)
|
||||
set (pthreads_header pthread.h)
|
||||
set (flint2_header flint/flint.h)
|
||||
set (gettimeofday_header gettimeofday.h)
|
||||
|
||||
foreach (LIB ${DEPS})
|
||||
string (TOUPPER ${LIB} LIB_UPPER)
|
||||
find_library(${LIB_UPPER}_LIBRARY NAMES ${${LIB}_lib})
|
||||
if (NOT ${LIB_UPPER}_LIBRARY)
|
||||
message(FATAL_ERROR "${LIB} library not found.")
|
||||
endif()
|
||||
add_library(${LIB} UNKNOWN IMPORTED)
|
||||
set_property(TARGET ${LIB} PROPERTY IMPORTED_LOCATION ${${LIB_UPPER}_LIBRARY})
|
||||
message("${LIB} found in ${${LIB_UPPER}_LIBRARY}")
|
||||
endforeach ()
|
||||
|
||||
foreach (LIB ${DEPS})
|
||||
string(TOUPPER ${LIB} HEADER_PKG)
|
||||
set (HEADER ${${LIB}_header})
|
||||
find_path(${HEADER_PKG}_INCLUDE_DIR NAMES ${HEADER})
|
||||
if (NOT ${HEADER_PKG}_INCLUDE_DIR)
|
||||
message(FATAL_ERROR "${HEADER} header not found.")
|
||||
endif()
|
||||
message("${HEADER} found in ${${HEADER_PKG}_INCLUDE_DIR}")
|
||||
set (DEP_INCLUDE_DIRS ${DEP_INCLUDE_DIRS} ${${HEADER_PKG}_INCLUDE_DIR})
|
||||
endforeach ()
|
||||
|
||||
file(GLOB TEMP "*.h")
|
||||
|
||||
foreach (TEMP_H ${TEMP})
|
||||
get_filename_component(FOLDER ${TEMP_H} NAME_WE)
|
||||
set(FOLDERS ${FOLDERS} ${FOLDER})
|
||||
endforeach()
|
||||
|
||||
foreach (FOLDER ${FOLDERS})
|
||||
file(GLOB TEMP "${FOLDER}/*.c")
|
||||
set(SRC ${SRC} ${TEMP})
|
||||
endforeach ()
|
||||
|
||||
include_directories(BEFORE ${arb_SOURCE_DIR})
|
||||
include_directories(BEFORE ${DEP_INCLUDE_DIRS})
|
||||
|
||||
add_library(arb ${SRC})
|
||||
|
||||
target_compile_definitions(arb PRIVATE HAVE_TLS=1 FLINT_REENTRANT=0)
|
||||
target_compile_definitions(arb PRIVATE PTW32_STATIC_LIB)
|
||||
MESSAGE( STATUS "Building static libraries" )
|
||||
target_compile_definitions(arb PRIVATE "ARB_BUILD_DLL")
|
||||
|
||||
target_link_libraries(arb ${DEPS})
|
||||
|
||||
install(TARGETS arb
|
||||
RUNTIME DESTINATION bin
|
||||
ARCHIVE DESTINATION lib
|
||||
LIBRARY DESTINATION lib
|
||||
)
|
||||
|
||||
foreach (FOLDER ${FOLDERS})
|
||||
set(HEADERS ${HEADERS} ${FOLDER}.h)
|
||||
endforeach ()
|
||||
|
||||
install(FILES ${HEADERS} DESTINATION include)
|
||||
|
||||
if (BUILD_TESTS)
|
||||
enable_testing()
|
||||
foreach (FOLDER ${FOLDERS})
|
||||
file(GLOB TEMP "${FOLDER}/test/*.c")
|
||||
foreach (TEST_SOURCE ${TEMP})
|
||||
get_filename_component(TEST_NAME ${TEST_SOURCE} NAME_WE)
|
||||
add_executable(${FOLDER}-${TEST_NAME} ${TEST_SOURCE})
|
||||
target_link_libraries(${FOLDER}-${TEST_NAME} arb)
|
||||
add_test(${FOLDER}-${TEST_NAME} ${FOLDER}-${TEST_NAME})
|
||||
endforeach ()
|
||||
endforeach ()
|
||||
endif ()
|
||||
14
ports/arb/fix-build-error.patch
Normal file
14
ports/arb/fix-build-error.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d6136a8..9e260eb 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -76,7 +76,8 @@ set (pthreads_header pthread.h)
|
||||
set (flint2_header flint/flint.h)
|
||||
|
||||
if(MSVC)
|
||||
- set(DEPS ${DEPS} pthreads)
|
||||
+ find_package(pthreads REQUIRED)
|
||||
+ set(PTHREADS_LIBRARIES PThreads4W::PThreads4W)
|
||||
else()
|
||||
option(CMAKE_THREAD_PREFER_PTHREAD "Prefer pthreads" yes)
|
||||
option(THREADS_PREFER_PTHREAD_FLAG "Prefer -pthread flag" yes)
|
||||
@ -3,24 +3,25 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO fredrik-johansson/arb
|
||||
REF ae6009e3e19bd309a2433467d1b2ddb7001cd1eb # 2.18.1
|
||||
SHA512 78e149f0d51ef8ab29afbad99fd24e3b59acfc509f626e89bdcd57d4a8478b84c3aa51e92f5e26f8a10a20c66d72d2eed50f0dfbfda4a5f5277988f9bac3fa48
|
||||
REF e3a633dcc1adafeb7ca9648669f2b1fa2f433ee1 # 2.21.1
|
||||
SHA512 af864ea4f849d12dbaadec8cda7e6b1a7d349b7aa776966ec7f61ad7a5186dc3f280512218bcff28901e2d55d6c976525746e6de13925a9942ed947ac2253af6
|
||||
HEAD_REF master
|
||||
PATCHES fix-build-error.patch
|
||||
)
|
||||
|
||||
file(REMOVE ${SOURCE_PATH}/CMakeLists.txt)
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
||||
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" MSVC_USE_MT)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DMSVC_USE_MT=${MSVC_USE_MT}
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
# Remove duplicate headers
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
@ -1,10 +1,17 @@
|
||||
{
|
||||
"name": "arb",
|
||||
"version-string": "2.18.1",
|
||||
"port-version": 1,
|
||||
"version": "2.21.1",
|
||||
"description": "a C library for arbitrary-precision interval arithmetic",
|
||||
"homepage": "https://github.com/fredrik-johansson/arb",
|
||||
"dependencies": [
|
||||
"flint"
|
||||
"flint",
|
||||
{
|
||||
"name": "pthreads",
|
||||
"platform": "windows"
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
diff --git a/build.vc14/dll_flint/dll_flint.vcxproj b/build.vc14/dll_flint/dll_flint.vcxproj
|
||||
index 3c8edd3..5c861d2 100644
|
||||
--- a/build.vc14/dll_flint/dll_flint.vcxproj
|
||||
+++ b/build.vc14/dll_flint/dll_flint.vcxproj
|
||||
@@ -81,7 +81,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Full</Optimization>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
- <AdditionalIncludeDirectories>..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir);</AdditionalIncludeDirectories>
|
||||
+ <AdditionalIncludeDirectories>..\;..\..\;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||
@@ -90,7 +90,7 @@
|
||||
<Link>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<LargeAddressAware>true</LargeAddressAware>
|
||||
- <AdditionalDependencies>..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
+ <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>postbuild $(IntDir) DLL
|
||||
@@ -105,7 +105,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
- <AdditionalIncludeDirectories>..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir);</AdditionalIncludeDirectories>
|
||||
+ <AdditionalIncludeDirectories>..\;..\..\;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||
@@ -114,7 +114,7 @@
|
||||
<Link>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<LargeAddressAware>true</LargeAddressAware>
|
||||
- <AdditionalDependencies>..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
+ <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>postbuild $(IntDir) DLL
|
||||
@@ -129,7 +129,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Full</Optimization>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
- <AdditionalIncludeDirectories>..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir);</AdditionalIncludeDirectories>
|
||||
+ <AdditionalIncludeDirectories>..\;..\..\;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||
@@ -138,7 +138,7 @@
|
||||
<Link>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<LargeAddressAware>true</LargeAddressAware>
|
||||
- <AdditionalDependencies>..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
+ <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>postbuild $(IntDir) DLL
|
||||
@@ -153,7 +153,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
- <AdditionalIncludeDirectories>..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir);</AdditionalIncludeDirectories>
|
||||
+ <AdditionalIncludeDirectories>..\;..\..\;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||
@@ -162,7 +162,7 @@
|
||||
<Link>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<LargeAddressAware>true</LargeAddressAware>
|
||||
- <AdditionalDependencies>..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
+ <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>postbuild $(IntDir) DLL
|
||||
26
ports/flint/fix-cmakelists.patch
Normal file
26
ports/flint/fix-cmakelists.patch
Normal file
@ -0,0 +1,26 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 2616d06..4be28ac 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -34,10 +34,11 @@ find_package(MPFR REQUIRED)
|
||||
if (WITH_NTL)
|
||||
find_package(NTL REQUIRED)
|
||||
endif()
|
||||
-find_package(PythonInterp REQUIRED)
|
||||
|
||||
+if(WITH_CBLAS)
|
||||
find_package(CBLAS)
|
||||
set(FLINT_USES_BLAS ${CBLAS_FOUND})
|
||||
+endif()
|
||||
|
||||
if(CMAKE_BUILD_TYPE STREQUAL Debug)
|
||||
set(FLINT_WANT_ASSERT ON)
|
||||
@@ -47,6 +48,8 @@ endif()
|
||||
|
||||
if(MSVC)
|
||||
find_package(PThreads REQUIRED)
|
||||
+ set(PThreads_LIBRARIES ${PThreads4W_LIBRARY})
|
||||
+ set(PThreads_INCLUDE_DIRS ${PThreads4W_INCLUDE_DIR})
|
||||
set(FLINT_USES_PTHREAD ON CACHE BOOL "Use POSIX Threads.")
|
||||
else()
|
||||
option(CMAKE_THREAD_PREFER_PTHREAD "Prefer pthreads" yes)
|
||||
@ -1,40 +0,0 @@
|
||||
diff --git a/build.vc14/lib_flint/lib_flint.vcxproj b/build.vc14/lib_flint/lib_flint.vcxproj
|
||||
index c6bd44c0..197d7723 100644
|
||||
--- a/build.vc14/lib_flint/lib_flint.vcxproj
|
||||
+++ b/build.vc14/lib_flint/lib_flint.vcxproj
|
||||
@@ -81,7 +81,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Full</Optimization>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
- <AdditionalIncludeDirectories>..\;..\..\;..\..\..\mpir\lib\$(IntDir);..\..\..\mpfr\lib\$(IntDir);..\..\..\pthreads\lib\$(IntDir)</AdditionalIncludeDirectories>
|
||||
+ <AdditionalIncludeDirectories>..\;..\..\;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;PTW32_STATIC_LIB;FLINT_REENTRANT=0;HAVE_TLS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||
@@ -100,7 +100,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
- <AdditionalIncludeDirectories>..\;..\..\;..\..\..\mpir\lib\$(IntDir);..\..\..\mpfr\lib\$(IntDir);..\..\..\pthreads\lib\$(IntDir)</AdditionalIncludeDirectories>
|
||||
+ <AdditionalIncludeDirectories>..\;..\..\;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;WIN32;_LIB;HAVE_CONFIG_H;PTW32_STATIC_LIB;FLINT_REENTRANT=0;HAVE_TLS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||
@@ -119,7 +119,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Full</Optimization>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
- <AdditionalIncludeDirectories>..\;..\..\;..\..\..\mpir\lib\$(IntDir);..\..\..\mpfr\lib\$(IntDir);..\..\..\pthreads\lib\$(IntDir)</AdditionalIncludeDirectories>
|
||||
+ <AdditionalIncludeDirectories>..\;..\..\;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;PTW32_STATIC_LIB;FLINT_REENTRANT=0;HAVE_TLS=1;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||
@@ -138,7 +138,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
- <AdditionalIncludeDirectories>..\;..\..\;..\..\..\mpir\lib\$(IntDir);..\..\..\mpfr\lib\$(IntDir);..\..\..\pthreads\lib\$(IntDir)</AdditionalIncludeDirectories>
|
||||
+ <AdditionalIncludeDirectories>..\;..\..\;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;WIN32;_LIB;HAVE_CONFIG_H;PTW32_STATIC_LIB;FLINT_REENTRANT=0;HAVE_TLS=1;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||
@ -1,5 +1,7 @@
|
||||
set(FLINT_VERSION 2.5.2)
|
||||
set(FLINT_HASH "8606b369af505d5fcedd05d95fcd04afac2a916fc5291501c56785891cfdb2f9bc98700b2d05afd1d9482fb96df2a8c8bf1cd0e5696df46775df9fa743eb900b")
|
||||
vcpkg_fail_port_install(ON_TARGET "uwp")
|
||||
|
||||
set(FLINT_VERSION 2.8.0)
|
||||
set(FLINT_HASH "916285d13a55d12a041236195a9d7bbc5c1c3c30c3aa2f169efee6063b800d34f96ad3235f1c77285b04305ce685e5890169c984108d50d0c9ee7a77c3f6e73d")
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "http://www.flintlib.org/flint-${FLINT_VERSION}.zip"
|
||||
@ -7,103 +9,31 @@ vcpkg_download_distfile(ARCHIVE
|
||||
SHA512 ${FLINT_HASH}
|
||||
)
|
||||
|
||||
vcpkg_find_acquire_program(PYTHON3)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
PATCHES
|
||||
lib_flint.patch
|
||||
dll_flint.patch
|
||||
fix-cmakelists.patch
|
||||
)
|
||||
|
||||
set(MSVC_VERSION 14)
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
|
||||
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
|
||||
file(COPY ${SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
|
||||
get_filename_component(SOURCE_DIR_NAME "${SOURCE_PATH}" NAME)
|
||||
|
||||
# Use fresh copy of sources for building and modification
|
||||
set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${SOURCE_DIR_NAME}")
|
||||
|
||||
file(TO_NATIVE_PATH ${CURRENT_INSTALLED_DIR} NATIVE_INSTALLED_DIR)
|
||||
configure_file(
|
||||
"${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/dll_flint.vcxproj" "${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/dll_flint.vcxproj" @ONLY
|
||||
)
|
||||
configure_file(
|
||||
"${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_flint/lib_flint.vcxproj" "${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_flint/lib_flint.vcxproj" @ONLY
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DPYTHON_EXECUTABLE=${PYTHON3}
|
||||
-DWITH_NTL=OFF
|
||||
-DWITH_CBLAS=OFF
|
||||
)
|
||||
|
||||
file(RENAME "${SOURCE_PATH}/fmpz-conversions-gc.in" "${SOURCE_PATH}/fmpz-conversions.h")
|
||||
vcpkg_cmake_install()
|
||||
|
||||
IF (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
|
||||
file(RENAME "${SOURCE_PATH}/fft_tuning32.in" "${SOURCE_PATH}/fft_tuning.h")
|
||||
ELSE()
|
||||
file(RENAME "${SOURCE_PATH}/fft_tuning64.in" "${SOURCE_PATH}/fft_tuning.h")
|
||||
ENDIF()
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
vcpkg_build_msbuild(
|
||||
PROJECT_PATH ${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/dll_flint.vcxproj
|
||||
)
|
||||
else()
|
||||
vcpkg_build_msbuild(
|
||||
PROJECT_PATH ${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_flint/lib_flint.vcxproj
|
||||
)
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS)
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/flint/flint-config.h"
|
||||
"#elif defined(MSC_USE_DLL)" "#elif 1"
|
||||
)
|
||||
endif()
|
||||
|
||||
IF (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
|
||||
SET(BUILD_ARCH "Win32")
|
||||
ELSE()
|
||||
SET(BUILD_ARCH ${VCPKG_TARGET_ARCHITECTURE})
|
||||
ENDIF()
|
||||
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
file(GLOB FLINT_HEADERS "${SOURCE_PATH}/dll/${BUILD_ARCH}/Release/*.h")
|
||||
file(INSTALL
|
||||
${FLINT_HEADERS}
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/include/flint
|
||||
)
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/${BUILD_ARCH}/Release/dll_flint.dll
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/bin
|
||||
)
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/${BUILD_ARCH}/Debug/dll_flint.dll
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
|
||||
)
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/${BUILD_ARCH}/Release/dll_flint.lib
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/lib
|
||||
RENAME flint.lib
|
||||
)
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/${BUILD_ARCH}/Debug/dll_flint.lib
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
|
||||
RENAME flint.lib
|
||||
)
|
||||
vcpkg_copy_pdbs()
|
||||
else()
|
||||
file(GLOB FLINT_HEADERS "${SOURCE_PATH}/lib/${BUILD_ARCH}/Release/*.h")
|
||||
file(INSTALL
|
||||
${FLINT_HEADERS}
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/include/flint
|
||||
)
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_flint/${BUILD_ARCH}/Release/lib_flint.lib
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/lib
|
||||
RENAME flint.lib
|
||||
)
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_flint/${BUILD_ARCH}/Debug/lib_flint.lib
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
|
||||
RENAME flint.lib
|
||||
)
|
||||
endif()
|
||||
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/gpl-2.0.txt
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/share/flint
|
||||
RENAME copyright
|
||||
)
|
||||
|
||||
message(STATUS "Installing done")
|
||||
file(INSTALL "${SOURCE_PATH}/gpl-2.0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
@ -1,13 +1,20 @@
|
||||
{
|
||||
"name": "flint",
|
||||
"version-string": "2.5.2",
|
||||
"port-version": 5,
|
||||
"version-semver": "2.8.0",
|
||||
"description": "Fast Library for Number Theory",
|
||||
"homepage": "https://www.flintlib.org/",
|
||||
"supports": "!uwp",
|
||||
"dependencies": [
|
||||
"gettimeofday",
|
||||
"gmp",
|
||||
"mpfr",
|
||||
"mpir",
|
||||
"pthreads"
|
||||
{
|
||||
"name": "pthreads",
|
||||
"platform": "windows"
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 10d10b99..fda6fa3c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1087,6 +1087,6 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION include)
|
||||
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man)
|
||||
|
||||
set(docdir share/doc/getdns)
|
||||
-install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir})
|
||||
+install(FILES AUTHORS ChangeLog LICENSE NEWS README.md DESTINATION ${docdir})
|
||||
install(FILES spec/index.html DESTINATION ${docdir}/spec)
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION lib/pkgconfig)
|
||||
@ -1,24 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 10d10b99..35761647 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1065,15 +1065,15 @@ if (ENABLE_STATIC)
|
||||
endif ()
|
||||
endif ()
|
||||
if (ENABLE_SHARED)
|
||||
- install(TARGETS getdns_shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
|
||||
+ install(TARGETS getdns_shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin)
|
||||
if (USE_LIBEV)
|
||||
- install(TARGETS getdns_ex_ev_shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
|
||||
+ install(TARGETS getdns_ex_ev_shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin)
|
||||
endif ()
|
||||
if (USE_LIBEVENT2)
|
||||
- install(TARGETS getdns_ex_event_shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
|
||||
+ install(TARGETS getdns_ex_event_shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin)
|
||||
endif ()
|
||||
if (USE_LIBUV)
|
||||
- install(TARGETS getdns_ex_uv_shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
|
||||
+ install(TARGETS getdns_ex_uv_shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin)
|
||||
endif ()
|
||||
endif ()
|
||||
if (BUILD_GETDNS_QUERY)
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7d22d3ca..7784ab58 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -335,7 +335,7 @@ check_include_file(openssl/rand.h HAVE_OPENSSL_RAND_H)
|
||||
check_include_file(openssl/conf.h HAVE_OPENSSL_CONF_H)
|
||||
check_include_file(openssl/engine.h HAVE_OPENSSL_ENGINE_H)
|
||||
|
||||
-set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
|
||||
+set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES} ${getdns_system_libs})
|
||||
check_function_exists(DSA_SIG_set0 HAVE_DSA_SIG_SET0)
|
||||
check_function_exists(DSA_set0_pqg HAVE_DSA_SET0_PQG)
|
||||
check_function_exists(DSA_set0_key HAVE_DSA_SET0_KEY)
|
||||
@ -1,7 +1,7 @@
|
||||
vcpkg_fail_port_install(ON_TARGET "uwp")
|
||||
|
||||
set(GETDNS_VERSION 1.6.0)
|
||||
set(GETDNS_HASH 4d3a67cd76e7ce53a31c9b92607d7768381a1f916e7950fe4e69368fa585d38dbfc04975630fbe8d8bd14f4bebf83a3516e063b5b54e0922548edc0952ee7b4e)
|
||||
set(GETDNS_VERSION 1.7.0)
|
||||
set(GETDNS_HASH d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" GETDNS_ENABLE_STATIC)
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" GETDNS_ENABLE_SHARED)
|
||||
@ -16,32 +16,34 @@ vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
REF ${GETDNS_VERSION}
|
||||
PATCHES
|
||||
"openssl_depend_libs.patch"
|
||||
"ignore_copying.patch"
|
||||
"install_dlls.patch"
|
||||
)
|
||||
|
||||
vcpkg_check_features(
|
||||
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
libevent BUILD_LIBEVENT2
|
||||
libuv BUILD_LIBUV
|
||||
FEATURES
|
||||
libevent BUILD_LIBEVENT2
|
||||
libuv BUILD_LIBUV
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
OPTIONS
|
||||
-DBUILD_GETDNS_QUERY=OFF
|
||||
-DBUILD_GETDNS_SERVER_MON=OFF
|
||||
-DENABLE_STATIC=${GETDNS_ENABLE_STATIC}
|
||||
-DENABLE_SHARED=${GETDNS_ENABLE_SHARED}
|
||||
${FEATURE_OPTIONS}
|
||||
-DBUILD_TESTING=OFF
|
||||
-DENABLE_STUB_ONLY=ON #if setting ON, it will require libunbound to build on Unix platform.
|
||||
)
|
||||
vcpkg_install_cmake()
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
vcpkg_cmake_install()
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
@ -1,13 +1,16 @@
|
||||
{
|
||||
"name": "getdns",
|
||||
"version-string": "1.6.0",
|
||||
"port-version": 2,
|
||||
"version": "1.7.0",
|
||||
"description": "GetDNS is a modern asynchronous DNS API",
|
||||
"homepage": "https://getdnsapi.net/",
|
||||
"supports": "!uwp & windows",
|
||||
"supports": "!uwp",
|
||||
"dependencies": [
|
||||
"libidn2",
|
||||
"openssl"
|
||||
"openssl",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
}
|
||||
],
|
||||
"features": {
|
||||
"libevent": {
|
||||
|
||||
@ -284,8 +284,6 @@ fdlibm:arm-uwp=fail
|
||||
fdlibm:x64-uwp=fail
|
||||
fftw3:arm-uwp=fail
|
||||
fftw3:x64-uwp=fail
|
||||
flint:x64-linux=fail
|
||||
flint:x64-osx=fail
|
||||
fltk:arm-uwp=fail
|
||||
fltk:x64-uwp=fail
|
||||
fluidsynth:x64-osx=fail
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "06326497117fb757651649225284d2fe4100ef79",
|
||||
"version": "2.21.1",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "8ad21afd78955622e44098428fa7b8b7790f82d8",
|
||||
"version-string": "2.18.1",
|
||||
|
||||
@ -121,8 +121,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"arb": {
|
||||
"baseline": "2.18.1",
|
||||
"port-version": 1
|
||||
"baseline": "2.21.1",
|
||||
"port-version": 0
|
||||
},
|
||||
"arcus": {
|
||||
"baseline": "4.10.0",
|
||||
@ -2173,8 +2173,8 @@
|
||||
"port-version": 2
|
||||
},
|
||||
"flint": {
|
||||
"baseline": "2.5.2",
|
||||
"port-version": 5
|
||||
"baseline": "2.8.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"fltk": {
|
||||
"baseline": "1.3.7",
|
||||
@ -2389,8 +2389,8 @@
|
||||
"port-version": 1
|
||||
},
|
||||
"getdns": {
|
||||
"baseline": "1.6.0",
|
||||
"port-version": 2
|
||||
"baseline": "1.7.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"getopt": {
|
||||
"baseline": "0",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "270de68a6011ec21e64b76b4db6c99e9fd76930a",
|
||||
"version-semver": "2.8.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "aaa3d79bfb36d6c6280ab6aa2226e4edb8913d11",
|
||||
"version-string": "2.5.2",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "fd966770afa413f4502ba69f0c2e0a860b08f967",
|
||||
"version": "1.7.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "d6c0d2d8c997256eff5049eb3fa3447a5387d2f9",
|
||||
"version-string": "1.6.0",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user