From owner-svn-ports-all@FreeBSD.ORG Tue Dec 9 14:06:59 2014 Return-Path: Delivered-To: svn-ports-all@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 9F49CC4C; Tue, 9 Dec 2014 14:06:59 +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 7128A97D; Tue, 9 Dec 2014 14:06:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB9E6xW3082902; Tue, 9 Dec 2014 14:06:59 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB9E6xju082899; Tue, 9 Dec 2014 14:06:59 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201412091406.sB9E6xju082899@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Tue, 9 Dec 2014 14:06:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374392 - head/games/0ad/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-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2014 14:06:59 -0000 Author: madpilot Date: Tue Dec 9 14:06:58 2014 New Revision: 374392 URL: https://svnweb.freebsd.org/changeset/ports/374392 QAT: https://qat.redports.org/buildarchive/r374392/ Log: Fix build on recent head by removing references to the MAP_NORESERVE flag to mmap(2). It has never been implemented in FreeBSD and thus was being ignored before anyway. No functional change, so no PORTREVISION bump. PR: 193961 (related) Added: head/games/0ad/files/patch-source_lib_allocators_page__aligned.cpp (contents, props changed) head/games/0ad/files/patch-source_lib_sysdep_os_unix_uvm.cpp (contents, props changed) Added: head/games/0ad/files/patch-source_lib_allocators_page__aligned.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/0ad/files/patch-source_lib_allocators_page__aligned.cpp Tue Dec 9 14:06:58 2014 (r374392) @@ -0,0 +1,20 @@ +--- source/lib/allocators/page_aligned.cpp.orig 2011-05-03 12:38:42 UTC ++++ source/lib/allocators/page_aligned.cpp +@@ -49,7 +49,7 @@ static const int mmap_flags = MAP_PRIVAT + Status mem_Reserve(size_t size, u8** pp) + { + errno = 0; +- void* ret = mmap(0, size, PROT_NONE, mmap_flags|MAP_NORESERVE, -1, 0); ++ void* ret = mmap(0, size, PROT_NONE, mmap_flags, -1, 0); + *pp = (u8*)ret; + return StatusFromMap(ret); + } +@@ -76,7 +76,7 @@ Status mem_Commit(u8* p, size_t size, in + Status mem_Decommit(u8* p, size_t size) + { + errno = 0; +- void* ret = mmap(p, size, PROT_NONE, mmap_flags|MAP_NORESERVE|MAP_FIXED, -1, 0); ++ void* ret = mmap(p, size, PROT_NONE, mmap_flags|MAP_FIXED, -1, 0); + return StatusFromMap(ret); + } + Added: head/games/0ad/files/patch-source_lib_sysdep_os_unix_uvm.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/0ad/files/patch-source_lib_sysdep_os_unix_uvm.cpp Tue Dec 9 14:06:58 2014 (r374392) @@ -0,0 +1,20 @@ +--- source/lib/sysdep/os/unix/uvm.cpp.orig 2013-12-06 00:42:50 UTC ++++ source/lib/sysdep/os/unix/uvm.cpp +@@ -40,7 +40,7 @@ namespace vm { + void* ReserveAddressSpace(size_t size, size_t UNUSED(commitSize), PageType UNUSED(pageType), int UNUSED(prot)) + { + errno = 0; +- void* p = mmap(0, size, PROT_NONE, mmap_flags|MAP_NORESERVE, -1, 0); ++ void* p = mmap(0, size, PROT_NONE, mmap_flags, -1, 0); + if(p == MAP_FAILED) + return 0; + return p; +@@ -77,7 +77,7 @@ bool Commit(uintptr_t address, size_t si + bool Decommit(uintptr_t address, size_t size) + { + errno = 0; +- if(mmap((void*)address, size, PROT_NONE, mmap_flags|MAP_NORESERVE|MAP_FIXED, -1, 0) == MAP_FAILED) ++ if(mmap((void*)address, size, PROT_NONE, mmap_flags|MAP_FIXED, -1, 0) == MAP_FAILED) + return false; + return true; + }