소스 검색

make ftpmirror the first url (#2870)

Hoildkv 1 년 전
부모
커밋
d9bf2df3d5

+ 2 - 2
packages/a/autoconf-archive/xmake.lua

@@ -3,8 +3,8 @@ package("autoconf-archive")
     set_description("A mirror of the GNU Autoconf Archive, a collection of more than 500 macros for GNU Autoconf that have been contributed as free software by friendly supporters of the cause from all over the Internet.")
     set_license("GPL-3.0-or-later")
 
-    add_urls("https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-$(version).tar.xz",
-             "https://ftpmirror.gnu.org/autoconf-archive/autoconf-archive-$(version).tar.xz")
+    add_urls("https://ftpmirror.gnu.org/autoconf-archive/autoconf-archive-$(version).tar.xz",
+             "https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-$(version).tar.xz")
     add_versions("2023.02.20", "71d4048479ae28f1f5794619c3d72df9c01df49b1c628ef85fde37596dc31a33")
 
     add_deps("autoconf")

+ 2 - 1
packages/a/autoconf/xmake.lua

@@ -4,7 +4,8 @@ package("autoconf")
     set_homepage("https://www.gnu.org/software/autoconf/autoconf.html")
     set_description("An extensible package of M4 macros that produce shell scripts to automatically configure software source code packages.")
 
-    add_urls("http://ftp.gnu.org/gnu/autoconf/autoconf-$(version).tar.gz",
+    add_urls("http://ftpmirror.gnu.org/gnu/autoconf/autoconf-$(version).tar.gz",
+             "http://ftp.gnu.org/gnu/autoconf/autoconf-$(version).tar.gz",
              "https://mirrors.ustc.edu.cn/gnu/autoconf/autoconf-$(version).tar.gz",
              "git://git.sv.gnu.org/autoconf")
     add_versions("2.68", "eff70a2916f2e2b3ed7fe8a2d7e63d72cf3a23684b56456b319c3ebce0705d99")

+ 3 - 1
packages/a/automake/xmake.lua

@@ -4,8 +4,10 @@ package("automake")
     set_homepage("https://www.gnu.org/software/automake/")
     set_description("A tool for automatically generating Makefile.in files compliant with the GNU Coding Standards.")
 
-    add_urls("https://ftp.gnu.org/gnu/automake/automake-$(version).tar.gz",
+    add_urls("https://ftpmirror.gnu.org/gnu/automake/automake-$(version).tar.gz",
+             "https://ftp.gnu.org/gnu/automake/automake-$(version).tar.gz",
              "https://mirrors.ustc.edu.cn/gnu/automake/automake-$(version).tar.gz")
+    add_versions("1.16.5", "07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605")
     add_versions("1.16.4", "8a0f0be7aaae2efa3a68482af28e5872d8830b9813a6a932a2571eac63ca1794")
     add_versions("1.16.1", "608a97523f97db32f1f5d5615c98ca69326ced2054c9f82e65bade7fc4c9dea8")
     add_versions("1.15.1", "988e32527abe052307d21c8ca000aa238b914df363a617e38f4fb89f5abf6260")

+ 2 - 2
packages/b/bc/xmake.lua

@@ -5,8 +5,8 @@ package("bc")
     set_description("Arbitrary precision numeric processing language")
     set_license("GPL-3.0-or-later")
 
-    set_urls("https://ftp.gnu.org/gnu/bc/bc-$(version).tar.gz",
-             "https://ftpmirror.gnu.org/bc/bc-$(version).tar.gz")
+    set_urls("https://ftpmirror.gnu.org/bc/bc-$(version).tar.gz",
+             "https://ftp.gnu.org/gnu/bc/bc-$(version).tar.gz")
     add_versions("1.07.1", "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a")
 
     add_deps("flex", "bison", "ed", "texinfo")

+ 5 - 2
packages/b/binutils/xmake.lua

@@ -5,8 +5,9 @@ package("binutils")
     set_description("GNU binary tools for native development")
     set_license("GPL-2.0")
 
-    set_urls("https://ftp.gnu.org/gnu/binutils/binutils-$(version).tar.xz",
-             "https://ftpmirror.gnu.org/binutils/binutils-$(version).tar.xz")
+    set_urls("https://ftpmirror.gnu.org/binutils/binutils-$(version).tar.xz",
+             "https://ftp.gnu.org/gnu/binutils/binutils-$(version).tar.xz")
+    add_versions("2.41", "ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450")
     add_versions("2.38", "e316477a914f567eccc34d5d29785b8b0f5a10208d36bbacedcc39048ecfe024")
     add_versions("2.34", "f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952")
     
@@ -18,6 +19,8 @@ package("binutils")
         add_extsources("brew::binutils")
     end
 
+    add_deps("bison")
+
     on_install("@linux", "@macosx", "@msys", function (package)
         local configs = {"--disable-debug",
                          "--disable-dependency-tracking",

+ 2 - 1
packages/b/bison/xmake.lua

@@ -5,7 +5,8 @@ package("bison")
     set_license("GPL-3.0")
 
     if not is_plat("windows") then
-        add_urls("http://ftp.gnu.org/gnu/bison/bison-$(version).tar.gz")
+        add_urls("http://ftpmirror.gnu.org/gnu/bison/bison-$(version).tar.gz",
+                 "http://ftp.gnu.org/gnu/bison/bison-$(version).tar.gz")
     end
 
     add_versions("3.7.4", "fbabc7359ccd8b4b36d47bfe37ebbce44805c052526d5558b95eda125d1677e2")

+ 3 - 3
packages/g/gettext/xmake.lua

@@ -3,15 +3,15 @@ package("gettext")
     set_homepage("https://www.gnu.org/software/gettext/")
     set_description("GNU internationalization (i18n) and localization (l10n) library.")
 
-    set_urls("https://ftp.gnu.org/gnu/gettext/gettext-$(version).tar.xz",
-             "https://ftpmirror.gnu.org/gettext/gettext-$(version).tar.xz",
+    set_urls("https://ftpmirror.gnu.org/gettext/gettext-$(version).tar.xz",
+             "https://ftp.gnu.org/gnu/gettext/gettext-$(version).tar.xz",
              {version = function (version) return version:gsub('%-', '.') end})
     add_versions("0.19.8-1", "105556dbc5c3fbbc2aa0edb46d22d055748b6f5c7cd7a8d99f8e7eb84e938be4")
     add_versions("0.21", "d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192")
     add_versions("0.21.1", "50dbc8f39797950aa2c98e939947c527e5ac9ebd2c1b99dd7b06ba33a6767ae6")
 
     if is_plat("macosx") then
-        add_syslinks("iconv")
+        add_deps("libiconv", {system = true})
         add_frameworks("CoreFoundation")
     else
         add_deps("libiconv")

+ 2 - 2
packages/g/gnu-gsl/xmake.lua

@@ -4,8 +4,8 @@ package("gnu-gsl")
     set_description("The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers.")
     set_license("GPL-3.0")
 
-    add_urls("https://ftp.gnu.org/gnu/gsl/gsl-$(version).tar.gz",
-             "https://ftpmirror.gnu.org/gsl/gsl-$(version).tar.gz")
+    add_urls("https://ftpmirror.gnu.org/gsl/gsl-$(version).tar.gz",
+             "https://ftp.gnu.org/gnu/gsl/gsl-$(version).tar.gz")
     add_versions("2.7", "efbbf3785da0e53038be7907500628b466152dbc3c173a87de1b5eba2e23602b")
 
     add_links("gsl", "gslcblas")

+ 3 - 2
packages/g/gnu-sed/xmake.lua

@@ -5,9 +5,10 @@ package("gnu-sed")
     set_description("GNU implementation of the famous stream editor.")
     set_license("GPL-3.0")
 
-    set_urls("https://ftp.gnu.org/gnu/sed/sed-$(version).tar.xz",
-             "https://ftpmirror.gnu.org/sed/sed-$(version).tar.xz")
+    set_urls("https://ftpmirror.gnu.org/sed/sed-$(version).tar.xz",
+             "https://ftp.gnu.org/gnu/sed/sed-$(version).tar.xz")
     add_versions("4.8", "f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633")
+    add_versions("4.9", "6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181")
 
     on_install("macosx", "linux", function (package)
         local configs = {"--disable-dependency-tracking"}

+ 2 - 2
packages/g/gperf/xmake.lua

@@ -4,8 +4,8 @@ package("gperf")
     set_homepage("https://www.gnu.org/software/gperf")
     set_description("Perfect hash function generator.")
 
-    set_urls("https://ftp.gnu.org/gnu/gperf/gperf-$(version).tar.gz",
-             "https://ftpmirror.gnu.org/gperf/gperf-$(version).tar.gz")
+    set_urls("https://ftpmirror.gnu.org/gnu/gperf/gperf-$(version).tar.gz",
+             "https://ftp.gnu.org/gnu/gperf/gperf-$(version).tar.gz")
     add_versions("3.1", "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2")
 
     if is_host("linux") then

+ 5 - 8
packages/l/libiconv/xmake.lua

@@ -3,8 +3,8 @@ package("libiconv")
     set_homepage("https://www.gnu.org/software/libiconv")
     set_description("Character set conversion library.")
 
-    set_urls("https://ftp.gnu.org/gnu/libiconv/libiconv-$(version).tar.gz",
-             "https://ftpmirror.gnu.org/libiconv/libiconv-$(version).tar.gz")
+    set_urls("https://ftpmirror.gnu.org/gnu/libiconv/libiconv-$(version).tar.gz",
+             "https://ftp.gnu.org/gnu/libiconv/libiconv-$(version).tar.gz")
     add_versions("1.17", "8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313")
     add_versions("1.16", "e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04")
     add_versions("1.15", "ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178")
@@ -24,7 +24,7 @@ package("libiconv")
             if package:is_plat("linux") then
                 return {} -- on linux libiconv is already a part of glibc
             else
-                return package:find_package("system::iconv", {includes = "iconv.h"}) or package:find_package("system::intl", {includes = "iconv.h"})
+                return package:find_package("system::iconv", {includes = "iconv.h"})
             end
         end
     end)
@@ -49,10 +49,7 @@ package("libiconv")
     end)
 
     on_install("macosx", "linux", "bsd", "cross", "android", "wasm", function (package)
-        local configs = {"--disable-dependency-tracking", "--enable-extra-encodings"}
-        if not package:is_plat("macosx") then
-            table.insert(configs, "--enable-relocatable")
-        end
+        local configs = {"--disable-dependency-tracking", "--enable-extra-encodings", "--enable-relocatable"}
         table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
         table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
         if package:debug() then
@@ -67,7 +64,7 @@ package("libiconv")
     end)
 
     on_test(function (package)
-        if package:is_plat("macosx", "linux", "bsd") then
+        if package:is_plat("linux", "bsd") or (package:is_plat("macosx") and not package:config("shared")) then
             os.vrun("iconv --version")
         end
         assert(package:check_csnippets({test = [[

+ 2 - 2
packages/l/libidn2/xmake.lua

@@ -4,8 +4,8 @@ package("libidn2")
     set_description("Libidn2 is an implementation of the IDNA2008 + TR46 specifications.")
     set_license("LGPL-3.0")
 
-    add_urls("https://ftp.gnu.org/gnu/libidn/libidn2-$(version).tar.gz",
-             "https://ftpmirror.gnu.org/libidn/libidn2-$(version).tar.gz")
+    add_urls("https://ftpmirror.gnu.org/gnu/libidn/libidn2-$(version).tar.gz",
+             "https://ftp.gnu.org/gnu/libidn/libidn2-$(version).tar.gz")
     add_versions("2.3.2", "76940cd4e778e8093579a9d195b25fff5e936e9dc6242068528b437a76764f91")
 
     add_deps("libunistring")

+ 2 - 1
packages/l/libintl/xmake.lua

@@ -3,7 +3,8 @@ package("libintl")
     set_homepage("https://www.gnu.org/software/gettext/")
     set_description("GNU gettext runtime")
 
-    add_urls("https://ftp.gnu.org/gnu/gettext/gettext-$(version).tar.xz")
+    add_urls("https://ftpmirror.gnu.org/gnu/gettext/gettext-$(version).tar.xz",
+             "https://ftp.gnu.org/gnu/gettext/gettext-$(version).tar.xz")
     add_versions("0.21", "d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192")
     add_versions("0.22.3", "b838228b3f8823a6c1eddf07297197c4db13f7e1b173b9ef93f3f945a63080b6")
 

+ 4 - 2
packages/l/libtasn1/xmake.lua

@@ -4,11 +4,13 @@ package("libtasn1")
     set_description("Libtasn1 is the ASN.1 library used by GnuTLS, p11-kit and some other packages.")
     set_license("LGPL-2.1")
 
-    add_urls("https://ftp.gnu.org/gnu/libtasn1/libtasn1-$(version).tar.gz")
+    add_urls("https://ftpmirror.gnu.org/gnu/libtasn1/libtasn1-$(version).tar.gz",
+             "https://ftp.gnu.org/gnu/libtasn1/libtasn1-$(version).tar.gz")
     add_versions("4.15.0", "dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e")
+    add_versions("4.19.0", "1613f0ac1cf484d6ec0ce3b8c06d56263cc7242f1c23b30d82d23de345a63f7a")
 
     on_install("macosx", "linux", function (package)
-        local configs = {"--disable-doc", "--disable-dependency-tracking", "--with-pic"}
+        local configs = {"--disable-doc", "--disable-dependency-tracking"}
         if package:config("shared") then
             table.insert(configs, "--enable-shared")
             table.insert(configs, "--disable-static")

+ 3 - 1
packages/l/libunistring/xmake.lua

@@ -4,8 +4,10 @@ package("libunistring")
     set_description("This library provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard.")
     set_license("GPL-3.0")
 
-    add_urls("https://ftp.gnu.org/gnu/libunistring/libunistring-$(version).tar.gz")
+    add_urls("https://ftpmirror.gnu.org/gnu/libunistring/libunistring-$(version).tar.gz",
+             "https://ftp.gnu.org/gnu/libunistring/libunistring-$(version).tar.gz")
     add_versions("0.9.10", "a82e5b333339a88ea4608e4635479a1cfb2e01aafb925e1290b65710d43f610b")
+    add_versions("1.1", "a2252beeec830ac444b9f68d6b38ad883db19919db35b52222cf827c385bdb6a")
 
     add_deps("libiconv")
 

+ 2 - 2
packages/m/m4/xmake.lua

@@ -4,8 +4,8 @@ package("m4")
     set_homepage("https://www.gnu.org/software/m4")
     set_description("Macro processing language")
 
-    add_urls("https://ftp.gnu.org/gnu/m4/m4-$(version).tar.xz",
-             "https://ftpmirror.gnu.org/m4/m4-$(version).tar.xz",
+    add_urls("https://ftpmirror.gnu.org/m4/m4-$(version).tar.xz",
+             "https://ftp.gnu.org/gnu/m4/m4-$(version).tar.xz",
              "https://mirrors.ustc.edu.cn/gnu/m4/m4-$(version).tar.xz")
     add_versions("1.4.18", "f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07")
     add_versions("1.4.19", "63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96")

+ 4 - 2
packages/m/make/xmake.lua

@@ -18,9 +18,11 @@ package("make")
         add_extsources("brew::make")
     end
 
-    on_install("@windows", function(package)
+    on_install("@windows", function (package)
         import("core.tool.toolchain")
-        local runenvs = toolchain.load("msvc", {plat = "windows", arch = os.arch()}):runenvs()
+        local msvc = package:toolchain("msvc") or
+            toolchain.load("msvc", {plat = package:plat(), arch = package:arch()})
+        local runenvs = msvc:runenvs()
         os.vrunv("build_w32.bat", {}, {envs = runenvs})
         os.cp("WinRel/gnumake.exe", path.join(package:installdir("bin"), "make.exe"))
     end)

+ 4 - 2
packages/m/mpc/xmake.lua

@@ -4,12 +4,14 @@ package("mpc")
     set_description("GNU MPC is a C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result.")
     set_license("LGPL-3.0")
 
-    add_urls("https://ftp.gnu.org/gnu/mpc/mpc-$(version).tar.gz")
+    add_urls("https://ftpmirror.gnu.org/gnu/mpc/mpc-$(version).tar.gz",
+             "https://ftp.gnu.org/gnu/mpc/mpc-$(version).tar.gz")
     add_versions("1.2.1", "17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459")
+    add_versions("1.3.1", "ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8")
 
     add_deps("gmp", "mpfr")
     on_install("macosx", "linux", function (package)
-        local configs = {"--disable-dependency-tracking", "--with-pic"}
+        local configs = {"--disable-dependency-tracking"}
         table.insert(configs, "--with-gmp=" .. package:dep("gmp"):installdir())
         table.insert(configs, "--with-mpfr=" .. package:dep("mpfr"):installdir())
         if package:config("shared") then

+ 8 - 1
packages/n/nettle/xmake.lua

@@ -4,8 +4,15 @@ package("nettle")
     set_description("Nettle is a cryptographic library that is designed to fit easily in more or less any context.")
     set_license("LGPL-3.0")
 
-    add_urls("https://ftp.gnu.org/gnu/nettle/nettle-$(version).tar.gz")
+    add_urls("https://ftpmirror.gnu.org/gnu/nettle/nettle-$(version).tar.gz",
+             "https://ftp.gnu.org/gnu/nettle/nettle-$(version).tar.gz")
     add_versions("3.6", "d24c0d0f2abffbc8f4f34dcf114b0f131ec3774895f3555922fe2f40f3d5e3f1")
+    add_versions("3.9.1", "ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3")
+
+    add_deps("m4")
+    if is_plat("linux") then
+        add_extsources("apt::nettle-dev")
+    end
 
     on_install("macosx", "linux", function (package)
         local configs = {"--disable-openssl", "--disable-documentation", "--enable-pic"}

+ 2 - 1
packages/p/patch/xmake.lua

@@ -9,7 +9,8 @@ package("patch")
         add_urls("https://github.com/xmake-mirror/patch/releases/download/v2.5.9/patch-$(version)-bin.zip")
         add_versions("2.5.9-7", "fabd6517e7bd88e067db9bf630d69bb3a38a08e044fa73d13a704ab5f8dd110b")
     else
-        add_urls("https://ftp.gnu.org/gnu/patch/patch-$(version).tar.bz2",
+        add_urls("https://ftpmirror.gnu.org/gnu/patch/patch-$(version).tar.bz2",
+                 "https://ftp.gnu.org/gnu/patch/patch-$(version).tar.bz2",
                  "https://github.com/xmake-mirror/patch/releases/download/v$(version)/patch-$(version).tar.bz2")
         add_versions("2.7.6", "3d1d001210d76c9f754c12824aa69f25de7cb27bb6765df63455b77601a0dcc9")
     end

+ 2 - 2
packages/r/readline/xmake.lua

@@ -3,8 +3,8 @@ package("readline")
     set_description("Library for command-line editing")
     set_license("GPL-3.0-or-later")
 
-    add_urls("https://ftp.gnu.org/gnu/readline/readline-$(version).tar.gz",
-             "https://ftpmirror.gnu.org/readline/readline-8.1.tar.gz")
+    add_urls("https://ftpmirror.gnu.org/readline/readline-$(version).tar.gz",
+             "https://ftp.gnu.org/gnu/readline/readline-$(version).tar.gz")
     add_versions("8.1", "f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02")
 
     add_deps("ncurses")

+ 2 - 2
packages/t/texinfo/xmake.lua

@@ -5,8 +5,8 @@ package("texinfo")
     set_description("Official documentation format of the GNU project")
     set_license("GPL-3.0")
 
-    set_urls("https://ftp.gnu.org/gnu/texinfo/texinfo-$(version).tar.xz",
-             "https://ftpmirror.gnu.org/texinfo/texinfo-$(version).tar.xz")
+    set_urls("https://ftpmirror.gnu.org/texinfo/texinfo-$(version).tar.xz",
+             "https://ftp.gnu.org/gnu/texinfo/texinfo-$(version).tar.xz")
     add_versions("6.7", "988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa")
     -- FIXME, we need fix gnulib on linux, @see https://www.mail-archive.com/[email protected]/msg10181.html
     --add_versions("6.8", "8eb753ed28bca21f8f56c1a180362aed789229bd62fff58bf8368e9beb59fec4")

+ 2 - 1
packages/w/which/xmake.lua

@@ -4,7 +4,8 @@ package("which")
     set_homepage("https://www.gnu.org/software/which/")
     set_description("shows the full path of (shell) commands")
 
-    add_urls("https://ftp.gnu.org/gnu/which/which-$(version).tar.gz",
+    add_urls("https://ftpmirror.gnu.org/gnu/which/which-$(version).tar.gz",
+             "https://ftp.gnu.org/gnu/which/which-$(version).tar.gz",
              "https://carlowood.github.io/which/which-$(version).tar.gz",
              "https://mirrors.ustc.edu.cn/gnu/which/which-$(version).tar.gz")
     add_versions("2.16", "0ac8502e9985a3ac6b0e2aa4f2a60f91cad0dc0cca6dc9c1c142ebba4b8dd664")