diff --git a/ports/arb/fix-build-error.patch b/ports/arb/fix-build-error.patch deleted file mode 100644 index fbebf09586..0000000000 --- a/ports/arb/fix-build-error.patch +++ /dev/null @@ -1,14 +0,0 @@ -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) diff --git a/ports/arb/portfile.cmake b/ports/arb/portfile.cmake deleted file mode 100644 index 62879730ad..0000000000 --- a/ports/arb/portfile.cmake +++ /dev/null @@ -1,25 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO fredrik-johansson/arb - REF e3a633dcc1adafeb7ca9648669f2b1fa2f433ee1 # 2.21.1 - SHA512 af864ea4f849d12dbaadec8cda7e6b1a7d349b7aa776966ec7f61ad7a5186dc3f280512218bcff28901e2d55d6c976525746e6de13925a9942ed947ac2253af6 - HEAD_REF master - PATCHES fix-build-error.patch -) - -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" MSVC_USE_MT) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DMSVC_USE_MT=${MSVC_USE_MT} -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() - -# Remove duplicate headers -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/arb/vcpkg.json b/ports/arb/vcpkg.json deleted file mode 100644 index 35e454c8a9..0000000000 --- a/ports/arb/vcpkg.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "arb", - "version": "2.21.1", - "port-version": 2, - "description": "a C library for arbitrary-precision interval arithmetic", - "homepage": "https://github.com/fredrik-johansson/arb", - "license": "LGPL-2.1", - "supports": "!xbox", - "dependencies": [ - "flint", - { - "name": "pthreads", - "platform": "windows" - }, - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/ports/flint/fix-cmakelists.patch b/ports/flint/fix-cmakelists.patch deleted file mode 100644 index 0111a0dd30..0000000000 --- a/ports/flint/fix-cmakelists.patch +++ /dev/null @@ -1,26 +0,0 @@ -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) diff --git a/ports/flint/fix-static.patch b/ports/flint/fix-static.patch new file mode 100644 index 0000000000..4ecd19db4a --- /dev/null +++ b/ports/flint/fix-static.patch @@ -0,0 +1,34 @@ +diff --git a/src/mpoly.h b/src/mpoly.h +index b50f27332..5e6307b89 100644 +--- a/src/mpoly.h ++++ b/src/mpoly.h +@@ -33,12 +33,14 @@ slong mpoly_divide_threads(slong n, double la, double lb); + #else + # define DECLSPEC_IMPORT + #endif ++#ifndef __GMP_H__ + DECLSPEC_IMPORT ulong __gmpn_add_n(nn_ptr, nn_srcptr, nn_srcptr, long int); + DECLSPEC_IMPORT ulong __gmpn_sub_n(nn_ptr, nn_srcptr, nn_srcptr, long int); + DECLSPEC_IMPORT ulong __gmpn_addmul_1(nn_ptr, nn_srcptr, long int, ulong); + DECLSPEC_IMPORT ulong __gmpn_submul_1(nn_ptr, nn_srcptr, long int, ulong); + DECLSPEC_IMPORT ulong __gmpn_rshift(nn_ptr, nn_srcptr, long int, unsigned int); + DECLSPEC_IMPORT ulong __gmpn_mul_1(nn_ptr, nn_srcptr, long int, ulong); ++#endif + #undef DECLSPEC_IMPORT + + /* context *******************************************************************/ +diff --git a/src/ulong_extras.h b/src/ulong_extras.h +index 808a9e3c1..aaf4916cc 100644 +--- a/src/ulong_extras.h ++++ b/src/ulong_extras.h +@@ -91,8 +91,10 @@ ulong n_clog_2exp(ulong n, ulong b); + #else + # define DECLSPEC_IMPORT + #endif ++#ifndef __GMP_H__ + DECLSPEC_IMPORT ulong __gmpn_gcd_11(ulong, ulong); + DECLSPEC_IMPORT ulong __gmpn_gcd_1(nn_srcptr, long int, ulong); ++#endif + #undef DECLSPEC_IMPORT + + ULONG_EXTRAS_INLINE diff --git a/ports/flint/portfile.cmake b/ports/flint/portfile.cmake index 3daee5f5e7..531ed82b6c 100644 --- a/ports/flint/portfile.cmake +++ b/ports/flint/portfile.cmake @@ -2,34 +2,43 @@ vcpkg_download_distfile(ARCHIVE URLS "https://flintlib.org/download/flint-${VERSION}.zip" FILENAME "flint-${VERSION}.zip" - SHA512 3dd9a4e79e08ab6bc434a786c8d4398eba6cb04e57bcb8d01677f4912cddf20ed3a971160a3e2d533d9a07b728678b0733cc8315bcb39a3f13475b6efa240062 + SHA512 a4180c4a8ce889d552e207f699d1243bb9af3001aee5f084bc0f67d04cb788268a31725ba23ffa750b1726cd7756ad4efa9f38b5242960fe962bebe96600e7d8 ) -vcpkg_find_acquire_program(PYTHON3) - vcpkg_extract_source_archive( SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES - fix-cmakelists.patch + fix-static.patch ) -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DPYTHON_EXECUTABLE=${PYTHON3} - -DWITH_NTL=OFF - -DWITH_CBLAS=OFF -) - -vcpkg_cmake_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -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" +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_find_acquire_program(PYTHON3) + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DPython_EXECUTABLE=${PYTHON3}" + -DVCPKG_LOCK_FIND_PACKAGE_CBLAS=OFF + -DWITH_NTL=OFF ) + vcpkg_cmake_install() + vcpkg_copy_pdbs() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/flint) +else() + vcpkg_make_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --with-ntl=no + --with-blas=no + ) + vcpkg_make_install() endif() -file(INSTALL "${SOURCE_PATH}/gpl-2.0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/flint/vcpkg.json b/ports/flint/vcpkg.json index 55931380b0..aee0627791 100644 --- a/ports/flint/vcpkg.json +++ b/ports/flint/vcpkg.json @@ -1,10 +1,10 @@ { "name": "flint", - "version-semver": "2.9.0", - "port-version": 1, + "version-semver": "3.4.0", "description": "Fast Library for Number Theory", "homepage": "https://www.flintlib.org/", - "supports": "!uwp", + "license": "GPL-3.0-only", + "supports": "!uwp & (!windows | x64)", "dependencies": [ "gettimeofday", "gmp", @@ -15,7 +15,18 @@ }, { "name": "vcpkg-cmake", - "host": true + "host": true, + "platform": "windows" + }, + { + "name": "vcpkg-cmake-config", + "host": true, + "platform": "windows" + }, + { + "name": "vcpkg-make", + "host": true, + "platform": "!windows" } ] } diff --git a/ports/symengine/vcpkg.json b/ports/symengine/vcpkg.json index 702d5fd06f..3c8eb86030 100644 --- a/ports/symengine/vcpkg.json +++ b/ports/symengine/vcpkg.json @@ -1,6 +1,7 @@ { "name": "symengine", "version": "0.14.0", + "port-version": 1, "description": "SymEngine is a fast symbolic manipulation library", "homepage": "https://github.com/symengine/symengine", "license": "BSD-3-Clause", @@ -33,7 +34,12 @@ "arb": { "description": "Build with arb", "dependencies": [ - "arb" + { + "name": "symengine", + "features": [ + "flint" + ] + } ] }, "flint": { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3c28d40acb..90a8e1fee3 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -186,10 +186,6 @@ ethindp-prism:arm64-linux=fail faad2:arm64-linux=fail faiss:arm64-osx=fail # No openmp on default osx toolchain faker-cxx:arm64-linux=fail -flint:arm-neon-android=fail -flint:arm64-android=fail -flint:arm64-linux=fail -flint:x64-android=fail fltk:arm-neon-android=fail fltk:arm64-android=fail fltk:arm64-linux=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index ce557241dd..978592f3a7 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -91,7 +91,6 @@ apr:arm64-windows=fail # Cross compiling CI machine cannot run gen_test_char to apr-util:arm64-linux=cascade aravis[introspection]:arm64-windows=skip # needs arm64 host aravis[usb]:arm64-linux=cascade -arb:arm64-linux=cascade arcticdb-sparrow:arm-neon-android=fail # https://github.com/man-group/sparrow/issues/653 arcticdb-sparrow:arm64-android=fail arcticdb-sparrow:x64-android=fail @@ -348,7 +347,6 @@ flashlight-sequence[cuda]:arm64-windows=cascade flashlight-sequence[cuda]:x86-windows=cascade flashlight-sequence[openmp]:arm64-osx=feature-fails # No openmp on osx flashlight-text[kenlm]:arm64-windows=cascade -flint:arm64-linux=fail fltk:arm64-linux=fail fluidsynth[pulseaudio]:arm64-linux=cascade fluidsynth[pulseaudio](android | osx | windows)=cascade @@ -1444,7 +1442,7 @@ suitesparse-graphblas[openmp]:arm64-osx=feature-fails # No openmp on default osx suitesparse-spqr:arm64-linux=cascade supernovas:arm64-linux=fail supernovas[solsys-calceph]:arm64-linux=cascade -symengine:arm64-linux=cascade +symengine[llvm]:arm64-linux=cascade symengine[llvm]:arm64-windows=cascade tdlib:arm64-linux=fail tdscpp:arm64-linux=fail diff --git a/versions/baseline.json b/versions/baseline.json index 87e758b606..c638b3d66c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -216,10 +216,6 @@ "baseline": "0.8.35", "port-version": 0 }, - "arb": { - "baseline": "2.21.1", - "port-version": 2 - }, "arcticdb-sparrow": { "baseline": "2.3.0", "port-version": 0 @@ -3081,8 +3077,8 @@ "port-version": 0 }, "flint": { - "baseline": "2.9.0", - "port-version": 1 + "baseline": "3.4.0", + "port-version": 0 }, "fltk": { "baseline": "1.3.11", @@ -9726,7 +9722,7 @@ }, "symengine": { "baseline": "0.14.0", - "port-version": 0 + "port-version": 1 }, "syscalls-cpp": { "baseline": "1.1.1", diff --git a/versions/f-/flint.json b/versions/f-/flint.json index 6dd5cb38a4..f7b5ee65c3 100644 --- a/versions/f-/flint.json +++ b/versions/f-/flint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b5b1da8478a27e66a250798a5a83747fa3ae522", + "version-semver": "3.4.0", + "port-version": 0 + }, { "git-tree": "5a97f4feeae9387e45588c117e8c85df1c00b49c", "version-semver": "2.9.0", diff --git a/versions/s-/symengine.json b/versions/s-/symengine.json index 87f402b77e..563d8bee0e 100644 --- a/versions/s-/symengine.json +++ b/versions/s-/symengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c91b7cbe86269fb0e5eca09962b2ed03b617bfb1", + "version": "0.14.0", + "port-version": 1 + }, { "git-tree": "f625203c39fa3bade14905cbd68ed077c51e7ea3", "version": "0.14.0",