From owner-svn-ports-head@freebsd.org Sat Aug 27 17:15:52 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1FB7EB77260; Sat, 27 Aug 2016 17:15:52 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F1A93D29; Sat, 27 Aug 2016 17:15:51 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7RHFps7047607; Sat, 27 Aug 2016 17:15:51 GMT (envelope-from bofh@FreeBSD.org) Received: (from bofh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7RHFp2R047605; Sat, 27 Aug 2016 17:15:51 GMT (envelope-from bofh@FreeBSD.org) Message-Id: <201608271715.u7RHFp2R047605@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bofh set sender to bofh@FreeBSD.org using -f From: Muhammad Moinur Rahman Date: Sat, 27 Aug 2016 17:15:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420986 - in head/emulators/qemu: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Aug 2016 17:15:52 -0000 Author: bofh Date: Sat Aug 27 17:15:50 2016 New Revision: 420986 URL: https://svnweb.freebsd.org/changeset/ports/420986 Log: emulators/qemu: Unbreak in 11+ [1] - Fix ncurses build uses to use base version and remove from CONFIGURE_ARGS for OPTIONS usage [2] PR: 212057 [1] 211973 [2] Submitted by: mat [1] ilavsky.martin@gmail.com [2] Added: head/emulators/qemu/files/patch-include_qemu_atomic.h (contents, props changed) Modified: head/emulators/qemu/Makefile Modified: head/emulators/qemu/Makefile ============================================================================== --- head/emulators/qemu/Makefile Sat Aug 27 16:58:48 2016 (r420985) +++ head/emulators/qemu/Makefile Sat Aug 27 17:15:50 2016 (r420986) @@ -3,6 +3,7 @@ PORTNAME= qemu PORTVERSION= 2.6.1 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/ DIST_SUBDIR= qemu/${PORTVERSION} @@ -61,7 +62,7 @@ PCAP_EXTRA_PATCHES= ${FILESDIR}/pcap-pat STATIC_LINK_CONFIGURE_ON= --static STATIC_LINK_PREVENTS= GTK2 X11 STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static -NCURSES_USES= ncurses +NCURSES_USES= ncurses:base SAMBA_RUN_DEPENDS= ${LOCALBASE}/sbin/smbd:net/samba36 DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html DOCS_USES= makeinfo @@ -72,7 +73,7 @@ PORTDOCS= docs qemu-doc.html qemu-tech.h WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} CONFIGURE_ARGS+=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \ - --disable-libssh2 --enable-debug --enable-curses \ + --disable-libssh2 --enable-debug \ --prefix=${PREFIX} --cc=${CC} --enable-docs --disable-kvm \ --disable-linux-user --disable-linux-aio --disable-xen \ --smbd=${LOCALBASE}/sbin/smbd --enable-debug-info --python=${PYTHON_CMD} \ Added: head/emulators/qemu/files/patch-include_qemu_atomic.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/qemu/files/patch-include_qemu_atomic.h Sat Aug 27 17:15:50 2016 (r420986) @@ -0,0 +1,28 @@ +--- include/qemu/atomic.h.orig 2016-06-02 18:20:47 UTC ++++ include/qemu/atomic.h +@@ -136,10 +136,12 @@ + /* Provide shorter names for GCC atomic builtins, return old value */ + #define atomic_fetch_inc(ptr) __atomic_fetch_add(ptr, 1, __ATOMIC_SEQ_CST) + #define atomic_fetch_dec(ptr) __atomic_fetch_sub(ptr, 1, __ATOMIC_SEQ_CST) ++#ifndef __cplusplus + #define atomic_fetch_add(ptr, n) __atomic_fetch_add(ptr, n, __ATOMIC_SEQ_CST) + #define atomic_fetch_sub(ptr, n) __atomic_fetch_sub(ptr, n, __ATOMIC_SEQ_CST) + #define atomic_fetch_and(ptr, n) __atomic_fetch_and(ptr, n, __ATOMIC_SEQ_CST) + #define atomic_fetch_or(ptr, n) __atomic_fetch_or(ptr, n, __ATOMIC_SEQ_CST) ++#endif + + /* And even shorter names that return void. */ + #define atomic_inc(ptr) ((void) __atomic_fetch_add(ptr, 1, __ATOMIC_SEQ_CST)) +@@ -330,10 +332,12 @@ + /* Provide shorter names for GCC atomic builtins. */ + #define atomic_fetch_inc(ptr) __sync_fetch_and_add(ptr, 1) + #define atomic_fetch_dec(ptr) __sync_fetch_and_add(ptr, -1) ++#ifndef __cplusplus + #define atomic_fetch_add __sync_fetch_and_add + #define atomic_fetch_sub __sync_fetch_and_sub + #define atomic_fetch_and __sync_fetch_and_and + #define atomic_fetch_or __sync_fetch_and_or ++#endif + #define atomic_cmpxchg __sync_val_compare_and_swap + + /* And even shorter names that return void. */