From owner-svn-ports-head@FreeBSD.ORG Thu Feb 19 00:25:58 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D0672E49; Thu, 19 Feb 2015 00:25:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 BA7F0945; Thu, 19 Feb 2015 00:25:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1J0PwbI001446; Thu, 19 Feb 2015 00:25:58 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1J0PwZD001444; Thu, 19 Feb 2015 00:25:58 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201502190025.t1J0PwZD001444@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 19 Feb 2015 00:25:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379329 - in head/emulators: virtualbox-ose-additions virtualbox-ose/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.18-1 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: Thu, 19 Feb 2015 00:25:59 -0000 Author: jkim Date: Thu Feb 19 00:25:57 2015 New Revision: 379329 URL: https://svnweb.freebsd.org/changeset/ports/379329 QAT: https://qat.redports.org/buildarchive/r379329/ Log: Make the previous patch conditional as we always did. Added: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h - copied unchanged from r379327, head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h Deleted: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h Modified: head/emulators/virtualbox-ose-additions/Makefile Modified: head/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- head/emulators/virtualbox-ose-additions/Makefile Thu Feb 19 00:08:23 2015 (r379328) +++ head/emulators/virtualbox-ose-additions/Makefile Thu Feb 19 00:25:57 2015 (r379329) @@ -106,7 +106,8 @@ KMK_ARCH= freebsd.${ARCH} .if ${COMPILER_TYPE} == clang EXTRA_PATCHES= ${PATCHDIR}/extrapatch-Config.kmk \ - ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk + ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk \ + ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h .if ${COMPILER_FEATURES:Mlibc++} EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk .endif Copied: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h (from r379327, head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h Thu Feb 19 00:25:57 2015 (r379329, copy of r379327, head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h) @@ -0,0 +1,51 @@ +--- src/VBox/Additions/x11/x11include/xorg-server-1.17.1/compiler.h.orig 2015-02-12 11:08:51.000000000 -0500 ++++ src/VBox/Additions/x11/x11include/xorg-server-1.17.1/compiler.h 2015-02-18 17:44:16.919457000 -0500 +@@ -972,26 +972,26 @@ + static __inline__ void + outb(unsigned short port, unsigned char val) + { +- __asm__ __volatile__("out%B0 (%1)"::"a"(val), "d"(port)); ++ __asm__ __volatile__("outb %0,%1"::"a"(val), "d"(port)); + } + + static __inline__ void + outw(unsigned short port, unsigned short val) + { +- __asm__ __volatile__("out%W0 (%1)"::"a"(val), "d"(port)); ++ __asm__ __volatile__("outw %0,%1"::"a"(val), "d"(port)); + } + + static __inline__ void + outl(unsigned short port, unsigned int val) + { +- __asm__ __volatile__("out%L0 (%1)"::"a"(val), "d"(port)); ++ __asm__ __volatile__("outl %0,%1"::"a"(val), "d"(port)); + } + + static __inline__ unsigned int + inb(unsigned short port) + { + unsigned char ret; +- __asm__ __volatile__("in%B0 (%1)":"=a"(ret):"d"(port)); ++ __asm__ __volatile__("inb %1,%0":"=a"(ret):"d"(port)); + + return ret; + } +@@ -1000,7 +1000,7 @@ + inw(unsigned short port) + { + unsigned short ret; +- __asm__ __volatile__("in%W0 (%1)":"=a"(ret):"d"(port)); ++ __asm__ __volatile__("inw %1,%0":"=a"(ret):"d"(port)); + + return ret; + } +@@ -1009,7 +1009,7 @@ + inl(unsigned short port) + { + unsigned int ret; +- __asm__ __volatile__("in%L0 (%1)":"=a"(ret):"d"(port)); ++ __asm__ __volatile__("inl %1,%0":"=a"(ret):"d"(port)); + + return ret; + }