From owner-svn-ports-all@freebsd.org Sun Nov 22 03:40:58 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AF6A547B769; Sun, 22 Nov 2020 03:40:58 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cdwzt4fvmz4VSy; Sun, 22 Nov 2020 03:40:58 +0000 (UTC) (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9318A13C33; Sun, 22 Nov 2020 03:40:58 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AM3ewpe098938; Sun, 22 Nov 2020 03:40:58 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AM3ewFh098936; Sun, 22 Nov 2020 03:40:58 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202011220340.0AM3ewFh098936@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sun, 22 Nov 2020 03:40:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556027 - head/emulators/qemu-user-static X-SVN-Group: ports-head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/emulators/qemu-user-static X-SVN-Commit-Revision: 556027 X-SVN-Commit-Repository: ports 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.34 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: Sun, 22 Nov 2020 03:40:58 -0000 Author: kevans Date: Sun Nov 22 03:40:57 2020 New Revision: 556027 URL: https://svnweb.freebsd.org/changeset/ports/556027 Log: emulators/qemu-user-static: update to 6f1319e1138c Highlights: - Fix stack allocation to behave more like FreeBSD really does[*]. - Raised the stack size on ARM, which should solve some limited cases of mysterious segfaults (e.g. lang/gcc9). - Provide hw.ncpu and AT_NCPUS based on cpu affinity to more effectively limit cpu usage under qemu-user-static. [*] We start out with a limited initial stack size, then login(1) raises the stack size up to the maximum possible for the system (arch-based). qemu-user-static will now calculate a maximum stack size based on the host's configured rlimit and the qemu-bsd-user specified max for the arch in question, then immediately raise the stack allocation size to the maximum. This is especially important because we don't actually handle stack growth. post-patch is also dropped entirely, as these sed invocations have done nothing since versions of qemu back in ~2007, AFAICT. CFLAGS/LDFLAGS get sucked in during configure and qemu's built with -fno-strict-aliasing as a default for even longer. Modified: head/emulators/qemu-user-static/Makefile head/emulators/qemu-user-static/distinfo Modified: head/emulators/qemu-user-static/Makefile ============================================================================== --- head/emulators/qemu-user-static/Makefile Sun Nov 22 01:49:49 2020 (r556026) +++ head/emulators/qemu-user-static/Makefile Sun Nov 22 03:40:57 2020 (r556027) @@ -2,7 +2,7 @@ PORTNAME= qemu PORTVERSION= 3.1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= emulators PKGNAMESUFFIX= -user-static DIST_SUBDIR= qemu/${PORTVERSION} @@ -18,7 +18,7 @@ CONFLICTS_INSTALL= qemu-user-static-devel-[0-9]* USES= bison compiler:c11 gmake perl5 pkgconfig python:build USE_GITHUB= yes -GH_TUPLE= seanbruno:qemu-bsd-user:4ee077c7906fb \ +GH_TUPLE= seanbruno:qemu-bsd-user:6f1319e1138ccb97 \ qemu:keycodemapdb:10739aa:keycodemapdb/ui/keycodemapdb HAS_CONFIGURE= yes USE_PERL5= build @@ -67,16 +67,6 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} --cc=${CC} --enabl QEMU_ARCH= ${ARCH:C/amd64/x86_64/:C/powerpc/ppc/} MAKE_ARGS+= ARCH=${QEMU_ARCH} - -post-patch: - @${REINPLACE_CMD} -E \ - -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing|" \ - -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ - ${WRKSRC}/Makefile.target - @${REINPLACE_CMD} -E \ - -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing -I.|" \ - -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ - ${WRKSRC}/Makefile post-install: @${MV} ${STAGEDIR}${PREFIX}/etc/rc.d ${WRKDIR} Modified: head/emulators/qemu-user-static/distinfo ============================================================================== --- head/emulators/qemu-user-static/distinfo Sun Nov 22 01:49:49 2020 (r556026) +++ head/emulators/qemu-user-static/distinfo Sun Nov 22 03:40:57 2020 (r556027) @@ -1,5 +1,5 @@ -TIMESTAMP = 1605230189 -SHA256 (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-4ee077c7906fb_GH0.tar.gz) = f3376a8ebe41156d5a0a0dee73277307155daed4c0102b3f8b3ed19ab6ce966d -SIZE (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-4ee077c7906fb_GH0.tar.gz) = 16904468 +TIMESTAMP = 1606014699 +SHA256 (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-6f1319e1138ccb97_GH0.tar.gz) = b1446caf0f4a989d053b379ad1f90691821f7734ea4d6b70139bac609b13aa02 +SIZE (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-6f1319e1138ccb97_GH0.tar.gz) = 16908717 SHA256 (qemu/3.1.0/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a SIZE (qemu/3.1.0/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895