From e57a4c009a32ffdcbf73cd38d76f4797f17d8dbf Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 10 Sep 2025 10:57:05 +0200 Subject: [PATCH] [guile] Add mirror (#47274) --- ports/guile/portfile.cmake | 28 +++++++++++++--------------- ports/guile/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/guile.json | 5 +++++ 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/ports/guile/portfile.cmake b/ports/guile/portfile.cmake index 7c207111d5..f34c62f23e 100644 --- a/ports/guile/portfile.cmake +++ b/ports/guile/portfile.cmake @@ -1,10 +1,12 @@ vcpkg_download_distfile(GUILE_ARCHIVE - URLS https://ftp.gnu.org/gnu/guile/guile-${VERSION}.tar.gz - FILENAME guile-${VERSION}.tar.gz - SHA512 8b0e6354fdfccd009fd92a5618828f8a8343faf20d1d3698be77a6ef7a8fe56ce633fd1239520e6a6be511ba4ca75eb90c8a81c45888b8b73d938cd2908d7a1f - ) + URLS + "https://ftpmirror.gnu.org/guile/guile-${VERSION}.tar.gz" + "https://ftp.gnu.org/gnu/guile/guile-${VERSION}.tar.gz" + FILENAME "guile-${VERSION}.tar.gz" + SHA512 8b0e6354fdfccd009fd92a5618828f8a8343faf20d1d3698be77a6ef7a8fe56ce633fd1239520e6a6be511ba4ca75eb90c8a81c45888b8b73d938cd2908d7a1f +) -vcpkg_extract_source_archive(GUILE_SOURCES ARCHIVE ${GUILE_ARCHIVE}) +vcpkg_extract_source_archive(GUILE_SOURCES ARCHIVE "${GUILE_ARCHIVE}") vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") @@ -12,7 +14,7 @@ vcpkg_configure_make( SOURCE_PATH "${GUILE_SOURCES}" ADD_BIN_TO_PATH AUTOCONFIG - ) +) vcpkg_install_make() vcpkg_copy_pdbs() @@ -21,18 +23,14 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() if (NOT VCPKG_BUILD_TYPE) - foreach(file guile-tools guile-config guild) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/${file}" "${CURRENT_INSTALLED_DIR}/debug/../tools/guile/debug/bin" "`dirname $0`" IGNORE_UNCHANGED) - endforeach() + foreach(file guile-tools guile-config guild) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/${file}" "${CURRENT_INSTALLED_DIR}/debug/../tools/guile/debug/bin" "`dirname $0`" IGNORE_UNCHANGED) + endforeach() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/guile-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") endif() foreach(file guile-tools guile-config guild) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${file}" "${CURRENT_INSTALLED_DIR}/tools/guile/bin" "`dirname $0`" IGNORE_UNCHANGED) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${file}" "${CURRENT_INSTALLED_DIR}/tools/guile/bin" "`dirname $0`" IGNORE_UNCHANGED) endforeach() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/guile-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") -file( - INSTALL "${GUILE_SOURCES}/COPYING.LESSER" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright - ) +vcpkg_install_copyright(FILE_LIST "${GUILE_SOURCES}/COPYING.LESSER") diff --git a/ports/guile/vcpkg.json b/ports/guile/vcpkg.json index f1fe666194..fc6cd998c8 100644 --- a/ports/guile/vcpkg.json +++ b/ports/guile/vcpkg.json @@ -1,6 +1,7 @@ { "name": "guile", "version": "3.0.10", + "port-version": 1, "description": "GNU's programming and extension language", "homepage": "https://www.gnu.org/software/guile/", "documentation": "https://www.gnu.org/software/guile/manual/", diff --git a/versions/baseline.json b/versions/baseline.json index 611d3eb9c8..02a5f4b2d8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3506,7 +3506,7 @@ }, "guile": { "baseline": "3.0.10", - "port-version": 0 + "port-version": 1 }, "guilite": { "baseline": "2022-05-05", diff --git a/versions/g-/guile.json b/versions/g-/guile.json index d9e2170190..011ea1df1c 100644 --- a/versions/g-/guile.json +++ b/versions/g-/guile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "883037b0117f33c721a52c8f50d82f8ff2ff4a33", + "version": "3.0.10", + "port-version": 1 + }, { "git-tree": "4fe9e6fe1d7b38bb84a73f37e34d83e6abe526cb", "version": "3.0.10",