Date: Sat, 27 Aug 2016 17:15:51 +0000 (UTC) From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420986 - in head/emulators/qemu: . files Message-ID: <201608271715.u7RHFp2R047605@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608271715.u7RHFp2R047605>