File tree Expand file tree Collapse file tree 2 files changed +7
-9
lines changed
Expand file tree Collapse file tree 2 files changed +7
-9
lines changed Original file line number Diff line number Diff line change @@ -37,20 +37,19 @@ if [ -z "$FAMILY" ]; then
3737fi
3838
3939# Newer version of glib required for QEMU.
40- # Anything newer than this won't build on red hat 8
40+ section_header " Installing glib "
4141STATUS=" glib"
42+ cd " $RISCV "
4243if [ ! -e " $RISCV " /include/glib-2.0 ]; then
43- section_header " Installing glib"
44- cd " $RISCV "
45- wget -nv --retry-connrefused $retry_on_host_error https://download.gnome.org/sources/glib/2.70/glib-2.70.5.tar.xz
46- tar -xJf glib-2.70.5.tar.xz
47- rm -f glib-2.70.5.tar.xz
48- cd glib-2.70.5
44+ wget -nv --retry-connrefused $retry_on_host_error --output-document=glib.tar.xz https://download.gnome.org/sources/glib/2.86/glib-2.86.3.tar.xz
45+ tar -xJf glib.tar.xz
46+ rm -f glib.tar.xz
47+ cd glib
4948 uvx meson setup _build --prefix=" $RISCV "
5049 uvx meson compile -C _build -j " ${NUM_THREADS} " 2>&1 | logger; [ " ${PIPESTATUS[0]} " == 0 ]
5150 uvx meson install -C _build 2>&1 | logger; [ " ${PIPESTATUS[0]} " == 0 ]
5251 cd " $RISCV "
53- rm -rf glib-2.70.5
52+ rm -rf glib
5453 echo -e " ${SUCCESS_COLOR} glib successfully installed!${ENDC} "
5554else
5655 echo -e " ${OK_COLOR} glib already installed.${ENDC} "
Original file line number Diff line number Diff line change @@ -57,7 +57,6 @@ source "${WALLY}"/bin/installation/activate-tools.sh
5757
5858
5959# Newer version of glib required for QEMU.
60- # Anything newer than this won't build on red hat 8
6160# Used for all installed tools because mixing glib versions can cause issues.
6261if (( RHEL_VERSION == 8 )) || (( UBUNTU_VERSION == 20 )) ; then
6362 source " $WALLY " /bin/installation/glib-installation.sh
You can’t perform that action at this time.
0 commit comments