diff --git a/ports/secp256k1/CMakeLists.txt b/ports/secp256k1/CMakeLists.txt deleted file mode 100644 index 3fe32d099c..0000000000 --- a/ports/secp256k1/CMakeLists.txt +++ /dev/null @@ -1,85 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -project(secp256k1 C) - -option(INSTALL_HEADERS "Install header files" ON) -option(BUILD_TOOLS "Build tools" OFF) -option(BUILD_EXAMPLES "Build examples" OFF) - -add_definitions( - -DENABLE_MODULE_ECDH - -DENABLE_MODULE_RECOVERY - -DENABLE_MODULE_EXTRAKEYS - -DENABLE_MODULE_SCHNORRSIG -) - -file(GLOB SOURCES src/secp256k1.c) -add_library(secp256k1 ${SOURCES}) - -target_include_directories(secp256k1 PUBLIC $ $ $) - -file(GLOB SOURCES_PRECOMP src/precomputed_ecmult.c src/precomputed_ecmult_gen.c) -add_library(secp256k1_precomputed ${SOURCES_PRECOMP}) - -target_include_directories(secp256k1_precomputed PUBLIC $ $) - -if (BUILD_TOOLS) - add_executable(bench src/bench.c) - target_link_libraries(bench PRIVATE secp256k1 secp256k1_precomputed) - - add_executable(bench_internal src/bench_internal.c) - target_link_libraries(bench_internal PRIVATE secp256k1_precomputed) - - add_executable(bench_ecmult src/bench_ecmult.c) - target_link_libraries(bench_ecmult PRIVATE secp256k1_precomputed) - - install(TARGETS bench bench_internal bench_ecmult RUNTIME DESTINATION bin) -endif() - -if (BUILD_EXAMPLES) - add_executable(ecdsa_example examples/ecdsa.c) - target_include_directories(ecdsa_example PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) - target_link_libraries(ecdsa_example PRIVATE secp256k1 secp256k1_precomputed) - if (WIN32) - target_link_libraries(ecdsa_example PRIVATE Bcrypt) - endif() - - add_executable(ecdh_example examples/ecdh.c) - target_include_directories(ecdh_example PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) - target_link_libraries(ecdh_example PRIVATE secp256k1 secp256k1_precomputed) - if (WIN32) - target_link_libraries(ecdh_example PRIVATE Bcrypt) - endif() - - add_executable(schnorr_example examples/schnorr.c) - target_include_directories(schnorr_example PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) - target_link_libraries(schnorr_example PRIVATE secp256k1 secp256k1_precomputed) - if (WIN32) - target_link_libraries(schnorr_example PRIVATE Bcrypt) - endif() - - install(TARGETS ecdsa_example ecdh_example schnorr_example RUNTIME DESTINATION bin) -endif() - -if(INSTALL_HEADERS) - file(GLOB HEADERS include/*.h) - install(FILES ${HEADERS} DESTINATION include) -endif() - -install(TARGETS secp256k1 EXPORT unofficial-secp256k1-config - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) - -install(TARGETS secp256k1_precomputed EXPORT unofficial-secp256k1-config - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) - -install( - EXPORT unofficial-secp256k1-config - FILE unofficial-secp256k1-config.cmake - NAMESPACE unofficial:: - DESTINATION share/unofficial-secp256k1 -) diff --git a/ports/secp256k1/portfile.cmake b/ports/secp256k1/portfile.cmake index 4c63bebed8..e5dc4f155c 100644 --- a/ports/secp256k1/portfile.cmake +++ b/ports/secp256k1/portfile.cmake @@ -3,44 +3,23 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bitcoin-core/secp256k1 - REF 3efeb9da21368c02cad58435b2ccdf6eb4b359c3 - SHA512 6d792943f9277a1b4c36dad62389cb38e0b93efb570b6af6c41afdb936d10ca30d4c2e4e743fc0f113d1f9785891d1e9d1fe224d7b8abd4197a9f5febf0febd6 -) - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - tools BUILD_TOOLS - examples BUILD_EXAMPLES + REF v${VERSION} + SHA512 747bda9276c02a87511c2d3275ec8894db1b7b99dcc9ab9a48497659c2eb512c555cc5f5f2c0269b00237e7177aa3790a5c7cf635ee695f2d440f0ddcb8672ab ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${FEATURE_OPTIONS} - OPTIONS_DEBUG - -DINSTALL_HEADERS=OFF + -DSECP256K1_BUILD_BENCHMARK=OFF + -DSECP256K1_BUILD_TESTS=OFF + -DSECP256K1_BUILD_EXHAUSTIVE_TESTS=OFF ) vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH "share/unofficial-${PORT}" PACKAGE_NAME unofficial-${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libsecp256k1" PACKAGE_NAME libsecp256k1) +vcpkg_fixup_pkgconfig() -if (BUILD_TOOLS OR BUILD_EXAMPLES) - set(SECP256K1_TOOLS "") - if (BUILD_TOOLS) - list(APPEND SECP256K1_TOOLS bench bench_internal bench_ecmult) - endif() - - if (BUILD_EXAMPLES) - list(APPEND SECP256K1_TOOLS ecdsa_example ecdh_example schnorr_example) - endif() - - vcpkg_copy_tools(TOOL_NAMES ${SECP256K1_TOOLS} AUTO_CLEAN) -endif() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/secp256k1/vcpkg.json b/ports/secp256k1/vcpkg.json index 8026e540c7..a704809247 100644 --- a/ports/secp256k1/vcpkg.json +++ b/ports/secp256k1/vcpkg.json @@ -1,7 +1,6 @@ { "name": "secp256k1", - "version-date": "2022-07-11", - "port-version": 1, + "version": "0.7.1", "description": "Optimized C library for EC operations on curve", "homepage": "https://github.com/bitcoin-core/secp256k1", "license": "MIT", @@ -14,13 +13,5 @@ "name": "vcpkg-cmake-config", "host": true } - ], - "features": { - "examples": { - "description": "Build examples" - }, - "tools": { - "description": "Build tools" - } - } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 00c130b035..c39e75e0f0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8997,8 +8997,8 @@ "port-version": 0 }, "secp256k1": { - "baseline": "2022-07-11", - "port-version": 1 + "baseline": "0.7.1", + "port-version": 0 }, "selene": { "baseline": "0.3.1", diff --git a/versions/s-/secp256k1.json b/versions/s-/secp256k1.json index 0d095d4f51..c2098ebe7f 100644 --- a/versions/s-/secp256k1.json +++ b/versions/s-/secp256k1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68e1068847e3f48579524c9d5ee33c1b30ec6dfb", + "version": "0.7.1", + "port-version": 0 + }, { "git-tree": "deb0a4b2cf9d3e5a0d4c3c8475a6851b7345d39d", "version-date": "2022-07-11",