cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update qemu to 0.14.0, from Brad.

Browse Source
This commit is contained in:
sthen 2011-03-12 23:28:39 +00:00
parent 90ed2c7b63
commit d9586b0eb7
12 changed files with 59 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emulators/qemu/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.61 2011/01/26 13:51:43 sthen Exp $
# $OpenBSD: Makefile,v 1.62 2011/03/12 23:28:39 sthen Exp $
# no success building on other archs yet
ONLY_FOR_ARCHS = i386 amd64 sparc64
COMMENT = multi system emulator
DISTNAME = qemu-0.13.0
REVISION = 1
DISTNAME = qemu-0.14.0
CATEGORIES = emulators
HOMEPAGE = http://www.qemu.org/
@ -35,6 +34,8 @@ CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --prefix=${PREFIX} \
--sysconfdir=${SYSCONFDIR} \
--mandir=${PREFIX}/man \
--cc="${CC}" \
--host-cc="${CC}" \
--extra-cflags="-I${LOCALBASE}/include \
-I${LOCALBASE}/include/libpng" \
--extra-ldflags=-L${LOCALBASE}/lib \

10
emulators/qemu/distinfo
View File

@ -1,5 +1,5 @@
MD5 (qemu-0.13.0.tar.gz) = OXoNZl2oup07lYNinz1kIQ==
RMD160 (qemu-0.13.0.tar.gz) = Sm+q841WFvt77cGmQI3h27PsNgw=
SHA1 (qemu-0.13.0.tar.gz) = JQu6H9tQWnh8SDMbawL1QoLt/HY=
SHA256 (qemu-0.13.0.tar.gz) = Hm9YUbBc6m43fINfRmhAjUEkz7hF+ZSNkigIdDxf2Hc=
SIZE (qemu-0.13.0.tar.gz) = 5184531
MD5 (qemu-0.14.0.tar.gz) = +dFF1cCd6fCYT/6b0SKZcA==
RMD160 (qemu-0.14.0.tar.gz) = FAkmQ4fkz+RRQ+EN13sldJNeLXg=
SHA1 (qemu-0.14.0.tar.gz) = z42RZDbUuHdSiTmWSOHwyp2GfRg=
SHA256 (qemu-0.14.0.tar.gz) = uiHoTXhTIXgw4Wfa6Zmc2/9IEYnGoLtgCsf7cgFFMQg=
SIZE (qemu-0.14.0.tar.gz) = 5439695

53
emulators/qemu/patches/patch-configure
View File

@ -1,41 +1,30 @@
$OpenBSD: patch-configure,v 1.15 2010/11/22 11:32:01 fgsch Exp $
--- configure.orig Fri Oct 15 21:56:09 2010
+++ configure Thu Nov 18 21:05:53 2010
@@ -69,12 +69,12 @@ interp_prefix="/usr/gnemul/qemu-%M"
static="no"
sparc_cpu=""
cross_prefix=""
-cc="gcc"
+cc="${CC:-cc}"
audio_drv_list=""
audio_card_list="ac97 es1370 sb16"
audio_possible_cards="ac97 es1370 sb16 cs4231a adlib gus"
block_drv_whitelist=""
-host_cc="gcc"
+host_cc="${CC:-cc}"
ar="ar"
make="make"
install="install"
@@ -128,15 +128,15 @@ ld="${cross_prefix}${ld}"
$OpenBSD: patch-configure,v 1.16 2011/03/12 23:28:39 sthen Exp $
--- configure.orig Mon Feb 14 17:02:07 2011
+++ configure Tue Feb 15 20:46:07 2011
@@ -223,9 +223,8 @@ sdl_config="${cross_prefix}${SDL_CONFIG-sdl-config}"
# default flags for all hosts
QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
-CFLAGS="-g $CFLAGS"
+CFLAGS="$CFLAGS"
QEMU_CFLAGS="-Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
-QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
+QEMU_CFLAGS="-Wstrict-prototypes $QEMU_CFLAGS"
QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
QEMU_CFLAGS="-I. -I\$(SRC_PATH) $QEMU_CFLAGS"
LDFLAGS="-g $LDFLAGS"
QEMU_INCLUDES="-I. -I\$(SRC_PATH)"
@@ -931,10 +930,9 @@ else
exit 1
fi
-gcc_flags="-Wold-style-declaration -Wold-style-definition -fstack-protector-all"
+gcc_flags="-Wold-style-definition"
-gcc_flags="-Wold-style-declaration -Wold-style-definition -Wtype-limits"
+gcc_flags="-Wold-style-definition -Wtype-limits"
gcc_flags="-Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers $gcc_flags"
gcc_flags="-Wmissing-include-dirs -Wempty-body -Wnested-externs $gcc_flags"
-gcc_flags="-fstack-protector-all $gcc_flags"
cat > $TMPC << EOF
int main(void) { return 0; }
EOF
@@ -1300,7 +1300,7 @@ int main(void) {
@@ -1345,7 +1343,7 @@ int main(void) {
}
EOF
vnc_png_cflags=""
@ -44,7 +33,7 @@ $OpenBSD: patch-configure,v 1.15 2010/11/22 11:32:01 fgsch Exp $
if compile_prog "$vnc_png_cflags" "$vnc_png_libs" ; then
vnc_png=yes
libs_softmmu="$vnc_png_libs $libs_softmmu"
@@ -1677,7 +1677,7 @@ fi
@@ -1760,7 +1758,7 @@ fi
##########################################
# pthread probe
@ -53,18 +42,18 @@ $OpenBSD: patch-configure,v 1.15 2010/11/22 11:32:01 fgsch Exp $
pthread=no
cat > $TMPC << EOF
@@ -2061,7 +2061,9 @@ fi
@@ -2329,8 +2327,8 @@ fi
# End of CC checks
# After here, no more $cc or $ld runs
if test "$debug" = "no" ; then
-if test "$debug" = "no" ; then
- CFLAGS="-O2 $CFLAGS"
+ CFLAGS="$CFLAGS"
+else
+if test "$debug" = "yes" ; then
+ CFLAGS="-O0 -g $CFLAGS"
fi
# Consult white-list to determine whether to enable werror
@@ -2452,7 +2454,7 @@ echo "TOOLS=$tools" >> $config_host_mak
@@ -2788,7 +2786,7 @@ echo "TOOLS=$tools" >> $config_host_mak
echo "ROMS=$roms" >> $config_host_mak
echo "MAKE=$make" >> $config_host_mak
echo "INSTALL=$install" >> $config_host_mak
@ -73,7 +62,7 @@ $OpenBSD: patch-configure,v 1.15 2010/11/22 11:32:01 fgsch Exp $
echo "INSTALL_DATA=$install -m0644 -p" >> $config_host_mak
echo "INSTALL_PROG=$install -m0755 -p" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak
@@ -2889,7 +2891,11 @@ if test "$gprof" = "yes" ; then
@@ -3223,7 +3221,11 @@ if test "$gprof" = "yes" ; then
fi
fi

13
emulators/qemu/patches/patch-exec_c
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-exec_c,v 1.9 2010/11/22 11:32:01 fgsch Exp $
--- exec.c.orig Fri Oct 15 21:56:09 2010
+++ exec.c Thu Nov 18 09:21:58 2010
@@ -524,7 +524,8 @@ static void code_gen_alloc(unsigned long tb_size)
exit(1);
}
}
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
+ defined(__DragonFly__) || defined(__OpenBSD__)
{
int flags;
void *addr = NULL;

8
emulators/qemu/patches/patch-net_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-net_h,v 1.1 2010/05/27 17:55:05 fgsch Exp $
--- net.h.orig Tue Feb 23 20:54:38 2010
+++ net.h Mon Mar 22 20:26:50 2010
@@ -172,7 +172,7 @@ void net_host_device_remove(Monitor *mon, const QDict
$OpenBSD: patch-net_h,v 1.2 2011/03/12 23:28:39 sthen Exp $
--- net.h.orig Mon Feb 14 17:02:07 2011
+++ net.h Tue Feb 15 20:40:23 2011
@@ -174,7 +174,7 @@ int do_netdev_del(Monitor *mon, const QDict *qdict, QO
#ifdef __sun__
#define SMBD_COMMAND "/usr/sfw/sbin/smbd"
#else

8
emulators/qemu/patches/patch-net_socket_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-net_socket_c,v 1.1 2011/01/26 13:51:43 sthen Exp $
--- net/socket.c.orig Sat Oct 16 05:56:09 2010
+++ net/socket.c Tue Jan 25 05:57:04 2011
$OpenBSD: patch-net_socket_c,v 1.2 2011/03/12 23:28:39 sthen Exp $
--- net/socket.c.orig Mon Feb 14 17:02:07 2011
+++ net/socket.c Tue Feb 15 20:40:23 2011
@@ -154,6 +154,7 @@ static int net_socket_mcast_create(struct sockaddr_in
struct ip_mreq imr;
int fd;
@ -9,7 +9,7 @@ $OpenBSD: patch-net_socket_c,v 1.1 2011/01/26 13:51:43 sthen Exp $
if (!IN_MULTICAST(ntohl(mcastaddr->sin_addr.s_addr))) {
fprintf(stderr, "qemu: error: specified mcastaddr \"%s\" (0x%08x) does not contain a multicast address\n",
inet_ntoa(mcastaddr->sin_addr),
@@ -193,9 +194,9 @@ static int net_socket_mcast_create(struct sockaddr_in
@@ -197,9 +198,9 @@ static int net_socket_mcast_create(struct sockaddr_in
}
/* Force mcast msgs to loopback (eg. several QEMUs in same host */

24
emulators/qemu/patches/patch-net_tap-bsd_c
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-net_tap-bsd_c,v 1.2 2010/11/22 11:32:01 fgsch Exp $
--- net/tap-bsd.c.orig Fri Oct 15 21:56:09 2010
+++ net/tap-bsd.c Thu Nov 18 09:21:58 2010
@@ -47,7 +47,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_
char *dev;
struct stat s;
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
/* if no ifname is given, always start the search from tap0. */
int i;
char dname[100];
@@ -56,7 +56,11 @@ int tap_open(char *ifname, int ifname_size, int *vnet_
if (*ifname) {
snprintf(dname, sizeof dname, "/dev/%s", ifname);
} else {
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
snprintf(dname, sizeof dname, "/dev/tap%d", i);
+#else
+ snprintf(dname, sizeof dname, "/dev/tun%d", i);
+#endif
}
TFR(fd = open(dname, O_RDWR));
if (fd >= 0) {

8
emulators/qemu/patches/patch-qemu-options_hx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-qemu-options_hx,v 1.1 2010/05/27 17:55:05 fgsch Exp $
--- qemu-options.hx.orig Tue Feb 23 20:54:38 2010
+++ qemu-options.hx Mon Mar 22 20:26:50 2010
@@ -942,7 +942,7 @@ or @file{C:\WINNT\SYSTEM32\DRIVERS\ETC\LMHOSTS} (Windo
$OpenBSD: patch-qemu-options_hx,v 1.2 2011/03/12 23:28:39 sthen Exp $
--- qemu-options.hx.orig Mon Feb 14 17:02:07 2011
+++ qemu-options.hx Tue Feb 15 20:40:23 2011
@@ -1179,7 +1179,7 @@ or @file{C:\WINNT\SYSTEM32\DRIVERS\ETC\LMHOSTS} (Windo
Then @file{@var{dir}} can be accessed in @file{\\smbserver\qemu}.
Note that a SAMBA server must be installed on the host OS in

23
emulators/qemu/patches/patch-qemu-timer_c
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-qemu-timer_c,v 1.1 2010/11/22 11:32:01 fgsch Exp $
--- qemu-timer.c.orig Thu Nov 18 09:27:07 2010
+++ qemu-timer.c Thu Nov 18 09:27:26 2010
@@ -108,7 +108,8 @@ static void init_get_clock(void)
{
use_rt_clock = 0;
#if defined(__linux__) || (defined(__FreeBSD__) && __FreeBSD_version >= 500000) \
- || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+ || defined(__DragonFly__) || defined(__FreeBSD_kernel__) \
+ || defined(__OpenBSD__)
{
struct timespec ts;
if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) {
@@ -121,7 +122,8 @@ static void init_get_clock(void)
static int64_t get_clock(void)
{
#if defined(__linux__) || (defined(__FreeBSD__) && __FreeBSD_version >= 500000) \
- || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+ || defined(__DragonFly__) || defined(__FreeBSD_kernel__) \
+ || defined(__OpenBSD__)
if (use_rt_clock) {
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);

18
emulators/qemu/patches/patch-slirp_slirp_config_h
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-slirp_slirp_config_h,v 1.6 2010/11/22 11:32:01 fgsch Exp $
--- slirp/slirp_config.h.orig Fri Oct 15 21:56:09 2010
+++ slirp/slirp_config.h Thu Nov 18 09:21:58 2010
@@ -89,7 +89,7 @@
#undef BAD_SPRINTF
$OpenBSD: patch-slirp_slirp_config_h,v 1.7 2011/03/12 23:28:39 sthen Exp $
--- slirp/slirp_config.h.orig Mon Feb 14 17:02:07 2011
+++ slirp/slirp_config.h Tue Feb 15 20:40:23 2011
@@ -86,7 +86,7 @@
//#undef HOST_WORDS_BIGENDIAN
/* Define if you have readv */
-#undef HAVE_READV
@ -10,8 +10,8 @@ $OpenBSD: patch-slirp_slirp_config_h,v 1.6 2010/11/22 11:32:01 fgsch Exp $
/* Define if iovec needs to be declared */
#undef DECLARE_IOVEC
@@ -101,7 +101,7 @@
#undef DECLARE_SPRINTF
@@ -95,7 +95,7 @@
#endif
/* Define if you have a POSIX.1 sys/wait.h */
-#undef HAVE_SYS_WAIT_H
@ -19,7 +19,7 @@ $OpenBSD: patch-slirp_slirp_config_h,v 1.6 2010/11/22 11:32:01 fgsch Exp $
/* Define if you have sys/select.h */
#undef HAVE_SYS_SELECT_H
@@ -119,7 +119,7 @@
@@ -113,7 +113,7 @@
#endif
/* Define if you have sys/signal.h */
@ -28,7 +28,7 @@ $OpenBSD: patch-slirp_slirp_config_h,v 1.6 2010/11/22 11:32:01 fgsch Exp $
/* Define if you have sys/stropts.h */
#undef HAVE_SYS_STROPTS_H
@@ -188,7 +188,7 @@
@@ -182,7 +182,7 @@
#undef HAVE_GRANTPT
/* Define if you have fchmod */

8
emulators/qemu/patches/patch-target-i386_translate_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-target-i386_translate_c,v 1.3 2010/06/08 01:08:20 fgsch Exp $
--- target-i386/translate.c.orig Tue May 4 16:27:48 2010
+++ target-i386/translate.c Sun May 9 23:31:36 2010
@@ -4879,20 +4879,24 @@ static target_ulong disas_insn(DisasContext *s, target
$OpenBSD: patch-target-i386_translate_c,v 1.4 2011/03/12 23:28:39 sthen Exp $
--- target-i386/translate.c.orig Mon Feb 14 17:02:07 2011
+++ target-i386/translate.c Tue Feb 15 20:40:23 2011
@@ -4857,20 +4857,24 @@ static target_ulong disas_insn(DisasContext *s, target
tcg_gen_sub_tl(t2, cpu_regs[R_EAX], t0);
gen_extu(ot, t2);
tcg_gen_brcondi_tl(TCG_COND_EQ, t2, 0, label1);

7
emulators/qemu/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.16 2010/11/22 11:32:01 fgsch Exp $
@comment $OpenBSD: PLIST,v 1.17 2011/03/12 23:28:39 sthen Exp $
@conflict qemu-*
@pkgpath emulators/qemu,kqemu
@bin bin/qemu
@ -44,7 +44,6 @@ share/qemu/
share/qemu/bamboo.dtb
share/qemu/bios.bin
share/qemu/gpxe-eepro100-80861209.rom
share/qemu/gpxe-eepro100-80861229.rom
share/qemu/keymaps/
share/qemu/keymaps/ar
share/qemu/keymaps/common
@ -95,5 +94,7 @@ share/qemu/pxe-rtl8139.bin
share/qemu/pxe-virtio.bin
share/qemu/s390-zipl.rom
share/qemu/vgabios-cirrus.bin
share/qemu/vgabios-qxl.bin
share/qemu/vgabios-stdvga.bin
share/qemu/vgabios-vmware.bin
share/qemu/vgabios.bin
share/qemu/video.x