diff options
Diffstat (limited to 'system/qemu')
| -rw-r--r-- | system/qemu/linker-no-pie.patch | 40 | ||||
| -rw-r--r-- | system/qemu/qemu.SlackBuild | 14 | ||||
| -rw-r--r-- | system/qemu/qemu.info | 6 |
3 files changed, 51 insertions, 9 deletions
diff --git a/system/qemu/linker-no-pie.patch b/system/qemu/linker-no-pie.patch new file mode 100644 index 0000000000..615d9a4ffa --- /dev/null +++ b/system/qemu/linker-no-pie.patch @@ -0,0 +1,40 @@ +diff --git a/configure b/configure +index 3f823ed163..61c17c2dde 100755 +--- a/configure ++++ b/configure +@@ -2133,7 +2133,6 @@ EOF + # Check we support --no-pie first; we will need this for building ROMs. + if compile_prog "-Werror -fno-pie" "-no-pie"; then + CFLAGS_NOPIE="-fno-pie" +- LDFLAGS_NOPIE="-no-pie" + fi + + if test "$static" = "yes"; then +@@ -2149,7 +2148,6 @@ if test "$static" = "yes"; then + fi + elif test "$pie" = "no"; then + CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS" +- CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS" + elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then + CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS" + CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS" +@@ -6768,7 +6766,6 @@ echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak + echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak + echo "GLIB_LIBS=$glib_libs" >> $config_host_mak + echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak +-echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak + echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak + echo "EXESUF=$EXESUF" >> $config_host_mak + echo "HOST_DSOSUF=$HOST_DSOSUF" >> $config_host_mak +diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile +index 084fc10f05..30771f8d17 100644 +--- a/pc-bios/optionrom/Makefile ++++ b/pc-bios/optionrom/Makefile +@@ -41,7 +41,6 @@ override CFLAGS += $(call cc-option, $(Wa)-32) + + LD_I386_EMULATION ?= elf_i386 + override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds +-override LDFLAGS += $(LDFLAGS_NOPIE) + + all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin + 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 diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info index ff582deea0..8735ce5e19 100644 --- a/system/qemu/qemu.info +++ b/system/qemu/qemu.info @@ -1,8 +1,8 @@ PRGNAM="qemu" -VERSION="4.1.1" +VERSION="5.2.0" HOMEPAGE="https://www.qemu.org" -DOWNLOAD="https://download.qemu.org/qemu-4.1.1.tar.xz" -MD5SUM="53879f792ef2675c6c5e6cbf5cc1ac6c" +DOWNLOAD="https://download.qemu.org/qemu-5.2.0.tar.xz" +MD5SUM="179f86928835da857c237b42f4b2df73" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="SDL2" |