diff --git a/ports/gsl/portfile.cmake b/ports/gsl/portfile.cmake index 9faef9a7f7..ce644da9cb 100644 --- a/ports/gsl/portfile.cmake +++ b/ports/gsl/portfile.cmake @@ -1,14 +1,15 @@ -set(GSL_VERSION 2.8) - vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnu.org/gnu/gsl/gsl-${GSL_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gsl/gsl-${GSL_VERSION}.tar.gz" - FILENAME "gsl-${GSL_VERSION}.tar.gz" + URLS + "https://ftpmirror.gnu.org/gsl/gsl-${VERSION}.tar.gz" + "https://ftp.gnu.org/gnu/gsl/gsl-${VERSION}.tar.gz" + "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gsl/gsl-${VERSION}.tar.gz" + FILENAME "gsl-${VERSION}.tar.gz" SHA512 4427f6ce59dc14eabd6d31ef1fcac1849b4d7357faf48873aef642464ddf21cc9b500d516f08b410f02a2daa9a6ff30220f3995584b0a6ae2f73c522d1abb66b ) vcpkg_extract_source_archive( SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES 0001-configure.patch 0002-add-fp-control.patch @@ -32,5 +33,5 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gsl.pc") endif() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/gsl/vcpkg.json b/ports/gsl/vcpkg.json index f9f98dbd71..346be0afb6 100644 --- a/ports/gsl/vcpkg.json +++ b/ports/gsl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gsl", "version": "2.8", - "port-version": 1, + "port-version": 2, "description": "The GNU Scientific Library is a numerical library for C and C++ programmers", "homepage": "https://www.gnu.org/software/gsl/", "license": "GPL-3.0-or-later", @@ -9,10 +9,6 @@ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 50e0f9cba9..e22099a21d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3454,7 +3454,7 @@ }, "gsl": { "baseline": "2.8", - "port-version": 1 + "port-version": 2 }, "gsl-lite": { "baseline": "1.0.1", diff --git a/versions/g-/gsl.json b/versions/g-/gsl.json index a8f3f958c9..68f1cd2812 100644 --- a/versions/g-/gsl.json +++ b/versions/g-/gsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8fc2c5800654d9983985df349b2ee05816c1c71b", + "version": "2.8", + "port-version": 2 + }, { "git-tree": "e842d0c0f2aa72b22baf30c1350f81fcc87591dc", "version": "2.8",