diff --git a/config/software/libxml2.rb b/config/software/libxml2.rb index df04ca735..9222599fe 100644 --- a/config/software/libxml2.rb +++ b/config/software/libxml2.rb @@ -15,7 +15,7 @@ # name "libxml2" -default_version "2.9.14" +default_version "2.10.4" license "MIT" license_file "COPYING" @@ -26,6 +26,7 @@ dependency "config_guess" # version_list: url=https://download.gnome.org/sources/libxml2/2.9/ filter=*.tar.xz +version("2.10.4") { source sha256: "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45" } version("2.9.14") { source sha256: "60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee" } version("2.9.13") { source sha256: "276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e" } version("2.9.12") { source sha256: "28a92f6ab1f311acf5e478564c49088ef0ac77090d9c719bbc5d518f1fe62eb9" } @@ -56,6 +57,11 @@ "--without-docbook", ] + # if windows? + # configure_command << "--disable-shared" + # env["CFLAGS"] << " -DIN_LIBXML" + # env["CPPFLAGS"] = "-DLIBXML_STATIC" + # end update_config_guess configure(*configure_command, env: env) diff --git a/config/software/libxslt.rb b/config/software/libxslt.rb index 9ab49c5ac..597cdd2ec 100644 --- a/config/software/libxslt.rb +++ b/config/software/libxslt.rb @@ -15,7 +15,7 @@ # name "libxslt" -default_version "1.1.35" +default_version "1.1.39" license "MIT" license_file "COPYING" @@ -26,6 +26,7 @@ dependency "config_guess" # versions_list: url=https://download.gnome.org/sources/libxslt/1.1/ filter=*.tar.xz +version("1.1.39") { source sha256: "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0" } version("1.1.37") { source sha256: "3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4" } version("1.1.36") { source sha256: "12848f0a4408f65b530d3962cd9ff670b6ae796191cfeff37522b5772de8dc8e" } version("1.1.35") { source sha256: "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79" } @@ -54,7 +55,9 @@ # iteration treats colons as a delimiter so we are using a cygwin # style path to accomodate configure_commands = [ - "--with-libxml-prefix=#{install_dir.sub("C:", "/C")}/embedded", + "--with-libxml-prefix=#{install_dir.sub("C:", "/C")}/embedded/", + "--with-xml2-lib=#{install_dir.sub("C:", "/C")}/embedded/lib", + "--with-xml2-include=#{install_dir.sub("C:", "/C")}/embedded/include/libxml2", "--without-python", "--without-crypto", "--without-profiler", @@ -62,7 +65,7 @@ ] configure(*configure_commands, env: env) - + make "clean", env: env make "-j #{workers}", env: env make "install", env: env end