From 22ed0bf0bef925be9b32df6202a77e40b97406cf Mon Sep 17 00:00:00 2001 From: Juergen Lock Date: Thu, 19 Jul 2012 20:15:43 +0000 Subject: - Update to 1.1.1, announce message is here: http://lists.nongnu.org/archive/html/qemu-devel/2012-07/msg01626.html - Rename CLANG workaround knob to CLANG_HACK to avoid it being inadvertently triggered by WITH_CLANG in make.conf etc. - Change USE_BZIP2=yes to EXTRACT_SUFX=.tar.bz2 because the 1.1.1 distfile is in fact compressed with gzip not bzip2 despite the extension. - Add preliminary arm-bsd-user support, this still will only run very simple executables like a static echo (the same as the rest of the bsd-user targets) due to lots of syscall handling still missing. Help welcome there! :) This work was started by bapt and cognet, I fixed syscall arg passing (only the first four are passed in registers, the rest on the stack) as well as errno and carry handling at syscall return among other things and cleaned up cognet's version a bit. (The OpenBSD case is untested and probably wrong.) [1] Some notes in this post: http://lists.freebsd.org/pipermail/freebsd-emulation/2012-July/009901.html Submitted by: cognet [1] (initial version of the patch) --- emulators/qemu-devel/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'emulators/qemu-devel/Makefile') diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index affe89c3d82a..1eb798b9e038 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= qemu -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/:release \ LOCAL/nox:snapshot @@ -18,7 +18,7 @@ MAINTAINER= nox@FreeBSD.org COMMENT= QEMU CPU Emulator - development version HAS_CONFIGURE= yes -USE_BZIP2= yes +EXTRACT_SUFX= .tar.bz2 USE_GMAKE= yes USE_PERL5_BUILD= yes USE_PYTHON_BUILD= yes @@ -32,7 +32,7 @@ CONFLICTS_INSTALL= qemu-[0-9]* MAKE_JOBS_SAFE= yes OPTIONS_DEFINE= SAMBA SDL OPENGL GNUTLS SASL JPEG PNG CURL CDROM_DMA PCAP \ - USBREDIR GNS3 ADD_AUDIO CLANG X86_TARGETS BSD_USER + USBREDIR GNS3 ADD_AUDIO CLANG_HACK X86_TARGETS BSD_USER SAMBA_DESC= samba dependency (for -smb) GNUTLS_DESC= gnutls dependency (vnc encryption) SASL_DESC= cyrus-sasl dependency (vnc encryption) @@ -45,7 +45,7 @@ SEABIOS_GIT_DESC= add seabios snapshot (-bios bios.bin-1.6.3.1) USBREDIR_DESC= usb device network redirection (experimental!) GNS3_DESC= gns3 patches (udp, promiscuous multicast) ADD_AUDIO_DESC= Emulate more audio hardware (experimental!) -CLANG_DESC= clang workaround (result slow and less stable!) +CLANG_HACK_DESC= clang workaround (result slow and less stable!) X86_TARGETS_DESC= Don't build non-x86 system targets BSD_USER_DESC= Also build bsd-user targets (for testing) OPTIONS_DEFAULT=SDL OPENGL GNUTLS SASL JPEG PNG CURL CDROM_DMA PCAP @@ -53,19 +53,19 @@ OPTIONS_DEFAULT=SDL OPENGL GNUTLS SASL JPEG PNG CURL CDROM_DMA PCAP .include CONFIGURE_ARGS+= --extra-ldflags=-L${LOCALBASE}/lib -PORTDOCS= docs qemu-doc.html qemu-tech.html +PORTDOCS= docs qemu-doc.html qemu-tech.html qmp-commands.txt # XXX this fixes build with clang but --enable-tcg-interpreter that's # needed to avoid global register usage that clang doesn't support # causes the result to be slow and less stable. -.if ${PORT_OPTIONS:MCLANG} +.if ${PORT_OPTIONS:MCLANG_HACK} CONFIGURE_ARGS+= --enable-tcg-interpreter CLANG_CFLAGS_AS+= -no-integrated-as .endif .if ${PORT_OPTIONS:MX86_TARGETS} .if ${PORT_OPTIONS:MBSD_USER} -CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu,i386-bsd-user,x86_64-bsd-user,sparc-bsd-user,sparc64-bsd-user +CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu,i386-bsd-user,x86_64-bsd-user,sparc-bsd-user,sparc64-bsd-user,arm-bsd-user .else CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu .endif -- cgit v1.2.3