summaryrefslogtreecommitdiffstats
path: root/system/qemu/qemu.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'system/qemu/qemu.SlackBuild')
-rw-r--r--system/qemu/qemu.SlackBuild14
1 files changed, 8 insertions, 6 deletions
diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild
index 57a43b834a..e2e1bae37f 100644
--- a/system/qemu/qemu.SlackBuild
+++ b/system/qemu/qemu.SlackBuild
@@ -59,7 +59,7 @@
# 6.2 16-Nov-2020 version update, 14.2 final release.
PRGNAM=qemu
-VERSION=${VERSION:-4.1.1}
+VERSION=${VERSION:-5.2.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -135,6 +135,11 @@ else
with_vnc="--disable-vnc"
fi
+# temp fix until upstream catches up.
+# ld: Error: unable to disambiguate: -no-pie (did you mean --no-pie ?)
+# https://lists.gnu.org/archive/html/qemu-devel/2020-12/msg03684.html
+patch -p1 < $CWD/linker-no-pie.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -155,14 +160,11 @@ CXXFLAGS="$SLKCFLAGS" \
$with_vnc \
$targets
-# Make these first; otherwise make won't run in parallel.
-make config-all-devices.mak config-all-disas.mak
-
make V=1
make install DESTDIR=$PKG
# Remove empty /var
-rm -rf $PKG/var/run
+rm -rf $PKG/var
# install some udev rules for /dev/kvm
# Note: no udev rules for usb pasthrough when running qemu as non-root on linux hosts. See Section 2.11.2
@@ -191,7 +193,7 @@ fi
# Add docs to the proper location
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changelog COPYING* CODING_STYLE HACKING LICENSE MAINTAINERS README docs/* \
+cp -a COPYING* CODING_STYLE.rst LICENSE MAINTAINERS README.rst docs/* \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild