From nobody Fri Jan 07 19:36:51 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 35B7D193CBD7 for ; Fri, 7 Jan 2022 19:36:52 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: from mail.tarsnap.com (mail.tarsnap.com [54.86.246.204]) by mx1.freebsd.org (Postfix) with SMTP id 4JVtl80s2Hz4stP for ; Fri, 7 Jan 2022 19:36:52 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: (qmail 97276 invoked from network); 7 Jan 2022 19:36:51 -0000 Received: from unknown (HELO dell7390.daemonology.net) (127.0.0.1) by mail.tarsnap.com with SMTP; 7 Jan 2022 19:36:51 -0000 Received: (qmail 34439 invoked from network); 7 Jan 2022 19:36:51 -0000 Received: from unknown (HELO ?127.0.0.1?) (127.0.0.1) by localhost with SMTP; 7 Jan 2022 19:36:51 -0000 Message-ID: <5e8045db-a551-2596-0d65-a12101e9821a@freebsd.org> Date: Fri, 7 Jan 2022 11:36:51 -0800 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: git: 688bd028652d - main - emulators/qemu-user-static: Fix build on recent FreeBSD Content-Language: en-US To: Larry Rosenman , Warner Losh Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org References: <202201070432.2074Wp5h014501@gitrepo.freebsd.org> From: Colin Percival In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4JVtl80s2Hz4stP X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N Ah, I forgot that the swapoff API change was MFCed... Warner, it looks like #if __FreeBSD_version >= 1400044 needs to be #if __FreeBSD_version >= 1400044 || \ (__FreeBSD_version >= 1300523 && __FreeBSD_version < 1400000) If you can make that change upstream I can bump the port again (or you can, whatever works for you). Colin Percival On 1/7/22 11:24, Larry Rosenman wrote: > this fails on my 13.0-STABLE Jail (LATEST): > https://home.lerctr.org:8888/data/p130-S-amd64-host-ports/2022-01-07_12h58m11s/logs/errors/qemu-user-static-3.1.0_13.log > > > > > On 01/06/2022 10:32 pm, Colin Percival wrote: >> The branch main has been updated by cperciva: >> >> URL: >> https://cgit.FreeBSD.org/ports/commit/?id=688bd028652dc3c6bfe606fd690359060bbd949d >> >> >> commit 688bd028652dc3c6bfe606fd690359060bbd949d >> Author:     Colin Percival >> AuthorDate: 2022-01-07 04:27:11 +0000 >> Commit:     Colin Percival >> CommitDate: 2022-01-07 04:32:45 +0000 >> >>     emulators/qemu-user-static: Fix build on recent FreeBSD >> >>     The swapoff(2) syscall recently changed from taking a single >>     argument to taking two (adding a field used for a "force" flag); >>     this broke qemu-user, since it translates system calls from >>     guest to host architecture. >> >>     Thanks to:      imp >>     With hat:       re@ >>     Sponsored by:   https://www.patreon.com/cperciva > -- Colin Percival Security Officer Emeritus, FreeBSD | The power to serve Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid