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

update to QEMU 0.15.1, from Brad (maintainer).

Browse Source
This commit is contained in:
sthen 2011-10-17 20:27:17 +00:00
parent ee5096377f
commit cf951198a2
9 changed files with 11 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emulators/qemu/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.76 2011/09/21 09:02:30 sthen Exp $
# $OpenBSD: Makefile,v 1.77 2011/10/17 20:27:17 sthen Exp $
# no success building on other archs yet
ONLY_FOR_ARCHS = amd64 arm i386 mips64 mips64el powerpc sparc sparc64
COMMENT = multi system emulator
DISTNAME = qemu-0.15.0
REVISION = 1
DISTNAME = qemu-0.15.1
CATEGORIES = emulators
MASTER_SITES = http://wiki.qemu.org/download/ \
${MASTER_SITE_SAVANNAH:=qemu/}

10
emulators/qemu/distinfo
View File

@ -1,5 +1,5 @@
MD5 (qemu-0.15.0.tar.gz) = 28VbAUvNIbmONH9qkPf7bQ==
RMD160 (qemu-0.15.0.tar.gz) = 8zBIdl5I4dxkE+8HnfmZRLIykhE=
SHA1 (qemu-0.15.0.tar.gz) = V6cmm1hUQFSpCxWCJfzgX+HQSoU=
SHA256 (qemu-0.15.0.tar.gz) = AZflLboHrrbf4DQ7DCrgjtN00ssK87uexz/tW6oMt00=
SIZE (qemu-0.15.0.tar.gz) = 9577243
MD5 (qemu-0.15.1.tar.gz) = NPF3N7qvGzSVyJzW1KYH7Q==
RMD160 (qemu-0.15.1.tar.gz) = /Rz96U+WVpr2ccyW0cLkutUk/WE=
SHA1 (qemu-0.15.1.tar.gz) = MM87Tau0tdjvrbIPNk64GB8xdoE=
SHA256 (qemu-0.15.1.tar.gz) = dwWxTZuOTfSgsXkJgOYYCEJh6NrvBnKhqnqDCg89tbo=
SIZE (qemu-0.15.1.tar.gz) = 9576745

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

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.19 2011/09/21 09:02:30 sthen Exp $
--- configure.orig Mon Aug 8 14:28:42 2011
+++ configure Tue Sep 6 22:49:25 2011
$OpenBSD: patch-configure,v 1.20 2011/10/17 20:27:17 sthen Exp $
--- configure.orig Wed Oct 12 12:41:43 2011
+++ configure Thu Oct 13 05:12:57 2011
@@ -229,13 +229,11 @@ sdl_config="${cross_prefix}${SDL_CONFIG-sdl-config}"
# default flags for all hosts
@ -37,67 +37,7 @@ $OpenBSD: patch-configure,v 1.19 2011/09/21 09:02:30 sthen Exp $
cpu="hppa"
;;
mips*)
@@ -409,6 +413,7 @@ SunOS)
make="${MAKE-gmake}"
install="${INSTALL-ginstall}"
ld="gld"
+ smbd="${SMBD-/usr/sfw/sbin/smbd}"
needs_libsunmath="no"
solarisrev=`uname -r | cut -f2 -d.`
# have to select again, because `uname -m` returns i86pc
@@ -477,6 +482,7 @@ fi
: ${make=${MAKE-make}}
: ${install=${INSTALL-install}}
: ${python=${PYTHON-python}}
+: ${smbd=${SMBD-/usr/sbin/smbd}}
if test "$mingw32" = "yes" ; then
EXESUF=".exe"
@@ -520,6 +526,8 @@ for opt do
;;
--python=*) python="$optarg"
;;
+ --smbd=*) smbd="$optarg"
+ ;;
--extra-cflags=*)
;;
--extra-ldflags=*)
@@ -932,6 +940,7 @@ echo " --extra-ldflags=LDFLAGS append extra linker f
echo " --make=MAKE use specified make [$make]"
echo " --install=INSTALL use specified install [$install]"
echo " --python=PYTHON use specified python [$python]"
+echo " --smbd=SMBD use specified smbd [$smbd]"
echo " --static enable static build [$static]"
echo " --mandir=PATH install man pages in PATH"
echo " --datadir=PATH install firmware in PATH"
@@ -1513,11 +1522,17 @@ int main(void) {
return 0;
}
EOF
+ if $pkg_config libpng --modversion >/dev/null 2>&1; then
+ vnc_png_cflags=`$pkg_config libpng --cflags 2> /dev/null`
+ vnc_png_libs=`$pkg_config libpng --libs 2> /dev/null`
+ else
vnc_png_cflags=""
vnc_png_libs="-lpng"
+ fi
if compile_prog "$vnc_png_cflags" "$vnc_png_libs" ; then
vnc_png=yes
libs_softmmu="$vnc_png_libs $libs_softmmu"
+ QEMU_CFLAGS="$QEMU_CFLAGS $vnc_png_cflags"
else
if test "$vnc_png" = "yes" ; then
feature_not_found "vnc-png"
@@ -1844,7 +1859,7 @@ fi
##########################################
# pthread probe
-PTHREADLIBS_LIST="-lpthread -lpthreadGC2"
+PTHREADLIBS_LIST="-pthread -lpthread -lpthreadGC2"
pthread=no
cat > $TMPC << EOF
@@ -2546,8 +2561,9 @@ fi
@@ -2557,8 +2561,9 @@ fi
# End of CC checks
# After here, no more $cc or $ld runs
@ -109,34 +49,3 @@ $OpenBSD: patch-configure,v 1.19 2011/09/21 09:02:30 sthen Exp $
fi
# Consult white-list to determine whether to enable werror
@@ -2638,6 +2654,9 @@ echo "LDFLAGS $LDFLAGS"
echo "make $make"
echo "install $install"
echo "python $python"
+if test "$slirp" = "yes" ; then
+ echo "smbd $smbd"
+fi
echo "host CPU $cpu"
echo "host big endian $bigendian"
echo "target list $target_list"
@@ -2796,6 +2815,7 @@ if test $profiler = "yes" ; then
fi
if test "$slirp" = "yes" ; then
echo "CONFIG_SLIRP=y" >> $config_host_mak
+ echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
QEMU_INCLUDES="-I\$(SRC_PATH)/slirp $QEMU_INCLUDES"
fi
if test "$vde" = "yes" ; then
@@ -3048,9 +3068,9 @@ echo "TOOLS=$tools" >> $config_host_mak
echo "ROMS=$roms" >> $config_host_mak
echo "MAKE=$make" >> $config_host_mak
echo "INSTALL=$install" >> $config_host_mak
-echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_host_mak
-echo "INSTALL_DATA=$install -m0644 -p" >> $config_host_mak
-echo "INSTALL_PROG=$install -m0755 -p" >> $config_host_mak
+echo "INSTALL_DIR=$install -d -m 0755" >> $config_host_mak
+echo "INSTALL_DATA=$install -c -m 0644" >> $config_host_mak
+echo "INSTALL_PROG=$install -c -m 0755" >> $config_host_mak
echo "PYTHON=$python" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak
echo "CC_I386=$cc_i386" >> $config_host_mak

24
emulators/qemu/patches/patch-i386_ld
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-i386_ld,v 1.1 2011/09/21 09:02:30 sthen Exp $
--- i386.ld.orig Sat Aug 27 18:03:15 2011
+++ i386.ld Sat Aug 27 18:03:33 2011
@@ -42,16 +42,16 @@ SECTIONS
.rel.plt :
{
*(.rel.plt)
- PROVIDE_HIDDEN (__rel_iplt_start = .);
+ PROVIDE (__rel_iplt_start = .);
*(.rel.iplt)
- PROVIDE_HIDDEN (__rel_iplt_end = .);
+ PROVIDE (__rel_iplt_end = .);
}
.rela.plt :
{
*(.rela.plt)
- PROVIDE_HIDDEN (__rela_iplt_start = .);
+ PROVIDE (__rela_iplt_start = .);
*(.rela.iplt)
- PROVIDE_HIDDEN (__rela_iplt_end = .);
+ PROVIDE (__rela_iplt_end = .);
}
.init : { *(.init) } =0x47ff041f
.text :

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

@ -1,15 +0,0 @@
$OpenBSD: patch-net_h,v 1.4 2011/09/21 09:02:30 sthen Exp $
--- net.h.orig Mon Aug 8 14:28:42 2011
+++ net.h Tue Sep 6 22:49:37 2011
@@ -174,11 +174,6 @@ int do_netdev_del(Monitor *mon, const QDict *qdict, QO
#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
-#ifdef __sun__
-#define SMBD_COMMAND "/usr/sfw/sbin/smbd"
-#else
-#define SMBD_COMMAND "/usr/sbin/smbd"
-#endif
void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);

12
emulators/qemu/patches/patch-net_slirp_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-net_slirp_c,v 1.1 2011/09/21 09:02:30 sthen Exp $
--- net/slirp.c.orig Tue Sep 6 22:49:47 2011
+++ net/slirp.c Tue Sep 6 22:50:01 2011
@@ -529,7 +529,7 @@ static int slirp_smb(SlirpState* s, const char *export
fclose(f);
snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -s %s",
- SMBD_COMMAND, smb_conf);
+ CONFIG_SMBD_COMMAND, smb_conf);
if (slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 139) < 0) {
slirp_smb_cleanup(s);

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

@ -1,28 +0,0 @@
$OpenBSD: patch-net_socket_c,v 1.3 2011/08/16 21:24:42 sthen Exp $
--- net/socket.c.orig Fri Jul 29 18:14:49 2011
+++ net/socket.c Sat Jul 30 15:32:58 2011
@@ -154,6 +154,12 @@ static int net_socket_mcast_create(struct sockaddr_in
struct ip_mreq imr;
int fd;
int val, ret;
+#ifdef __OpenBSD__
+ unsigned char loop;
+#else
+ int loop;
+#endif
+
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),
@@ -197,9 +203,9 @@ static int net_socket_mcast_create(struct sockaddr_in
}
/* Force mcast msgs to loopback (eg. several QEMUs in same host */
- val = 1;
+ loop = 1;
ret=setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP,
- (const char *)&val, sizeof(val));
+ (const char *)&loop, sizeof(loop));
if (ret < 0) {
perror("setsockopt(SOL_IP, IP_MULTICAST_LOOP)");
goto fail;

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

@ -1,16 +0,0 @@
$OpenBSD: patch-qemu-options_hx,v 1.4 2011/09/21 09:02:30 sthen Exp $
--- qemu-options.hx.orig Mon Aug 8 14:28:42 2011
+++ qemu-options.hx Tue Sep 6 22:51:02 2011
@@ -1256,9 +1256,9 @@ 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
-@file{/usr/sbin/smbd}. QEMU was tested successfully with smbd versions from
-Red Hat 9, Fedora Core 3 and OpenSUSE 11.x.
+Note that a SAMBA server must be installed on the host OS.
+QEMU was tested successfully with smbd versions from Red Hat 9,
+Fedora Core 3 and OpenSUSE 11.x.
@item hostfwd=[tcp|udp]:[@var{hostaddr}]:@var{hostport}-[@var{guestaddr}]:@var{guestport}
Redirect incoming TCP or UDP connections to the host port @var{hostport} to

44
emulators/qemu/patches/patch-x86_64_ld
View File

@ -1,44 +0,0 @@
$OpenBSD: patch-x86_64_ld,v 1.1 2011/09/21 09:02:30 sthen Exp $
--- x86_64.ld.orig Sat Aug 27 18:03:20 2011
+++ x86_64.ld Sat Aug 27 18:03:40 2011
@@ -38,16 +38,16 @@ SECTIONS
.rel.plt :
{
*(.rel.plt)
- PROVIDE_HIDDEN (__rel_iplt_start = .);
+ PROVIDE (__rel_iplt_start = .);
*(.rel.iplt)
- PROVIDE_HIDDEN (__rel_iplt_end = .);
+ PROVIDE (__rel_iplt_end = .);
}
.rela.plt :
{
*(.rela.plt)
- PROVIDE_HIDDEN (__rela_iplt_start = .);
+ PROVIDE (__rela_iplt_start = .);
*(.rela.iplt)
- PROVIDE_HIDDEN (__rela_iplt_end = .);
+ PROVIDE (__rela_iplt_end = .);
}
.init :
{
@@ -70,8 +70,6 @@ SECTIONS
.rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
.rodata1 : { *(.rodata1) }
.eh_frame_hdr : { *(.eh_frame_hdr) }
- .eh_frame : ONLY_IF_RO { KEEP (*(.eh_frame)) }
- .gcc_except_table : ONLY_IF_RO { *(.gcc_except_table) }
/* Adjust the address for the data segment. We want to adjust up to
the same address within the page on the next page up. */
. = ALIGN (0x100000) - ((0x100000 - .) & (0x100000 - 1)); . = DATA_SEGMENT_ALIGN (0x100000, 0x1000);
@@ -97,8 +95,8 @@ SECTIONS
.data1 : { *(.data1) }
.tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
.tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
- .eh_frame : ONLY_IF_RW { KEEP (*(.eh_frame)) }
- .gcc_except_table : ONLY_IF_RW { *(.gcc_except_table) }
+ .eh_frame : { KEEP (*(.eh_frame)) }
+ .gcc_except_table : { *(.gcc_except_table) }
.dynamic : { *(.dynamic) }
.ctors :
{