Skip to content

Commit 326d267

Browse files
committed
Merge branch 'xpack-develop' of https://github.com/xpack-dev-tools/qemu-riscv-xpack into xpack-develop
2 parents da185ad + 608b941 commit 326d267

File tree

2 files changed

+17
-19
lines changed

2 files changed

+17
-19
lines changed

scripts/common-versions-source.sh

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,8 @@ function build_versions()
3939
# http://zlib.net/fossils/
4040
build_zlib "1.2.12"
4141

42-
if [ "${TARGET_PLATFORM}" != "win32" ]
43-
then
44-
# https://sourceware.org/pub/bzip2/
45-
build_bzip2 "1.0.8"
46-
fi
42+
# https://sourceware.org/pub/bzip2/
43+
build_bzip2 "1.0.8"
4744

4845
# # https://github.com/facebook/zstd/releases
4946
build_zstd "1.5.2"
@@ -58,11 +55,8 @@ function build_versions()
5855
# http://www.ijg.org/files/
5956
build_jpeg "9e"
6057

61-
if [ "${TARGET_PLATFORM}" != "win32" ]
62-
then
63-
# https://gitlab.gnome.org/GNOME/libxml2/-/releases
64-
build_libxml2 "2.10.2" # "2.9.14"
65-
fi
58+
# https://gitlab.gnome.org/GNOME/libxml2/-/releases
59+
build_libxml2 "2.10.2" # "2.9.14"
6660

6761
# required by glib
6862
# https://ftp.gnu.org/pub/gnu/libiconv/
@@ -86,17 +80,21 @@ function build_versions()
8680
# https://ftp.gnu.org/pub/gnu/gettext/
8781
build_gettext "0.21"
8882

89-
# Experimental, when a newer glib was tested.
90-
if false # [ "${TARGET_PLATFORM}" != "win32" ]
83+
if [ "${TARGET_PLATFORM}" == "win32" ]
9184
then
92-
# required by pcre2
93-
# https://ftp.gnu.org/gnu/readline/
94-
build_readline "8.1.2"
95-
96-
# https://github.com/PCRE2Project/pcre2/releases
97-
build_pcre2 "10.40"
85+
# required by readline
86+
# https://ftp.gnu.org/gnu/termcap/
87+
build_termcap "1.3.1"
9888
fi
9989

90+
# required by pcre2
91+
# https://ftp.gnu.org/gnu/readline/
92+
# x86_64-w64-mingw32/bin/ld: cannot find -ltermcap
93+
build_readline "8.1.2"
94+
95+
# https://github.com/PCRE2Project/pcre2/releases
96+
build_pcre2 "10.40"
97+
10098
# https://download.gnome.org/sources/glib/
10199
# ERROR: glib-2.56 gthread-2.0 is required to compile QEMU
102100
build_glib "2.56.4"

0 commit comments

Comments
 (0)