From nobody Mon Sep 11 22:03:43 2023 X-Original-To: dev-commits-ports-all@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 4Rl1282jcVz4tQwg; Mon, 11 Sep 2023 22:03:44 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl1281GTfz3Tlr; Mon, 11 Sep 2023 22:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XEhQ3atjba9znKvbwvy0s95bgf8lHYYDhfocgL/vM3c=; b=qkBeb44H+oJDIBFlUKrELyKDzCXVjp3frpEG3UtVmB1sX9ctco4Hszn+ss/fnNaavPXQmc nTUHnBa3vqjLPSDgusavaz/DULh0IxPsoS9It0YEULqiLaWXZ9B4UF6MxglqQSgp48AmgJ ruPWaB76Uz4WI8OR3I641j9+1Tq65L3sVKUESWCP1DRJDI1ZiMSNV2xQaO4QDZKbvB1oQP HBe1lPObbcSWpkSTVxsgBAfdeM9Wh5PmEUH74rfzKKwo5c8kQ9TPJlvAnqSUgmKm71s379 sZnTwkRAsVMJRL15Dkj935fVyQVsqA9zCYHqoCi0bjL0Cb+PP9hEmX6trFOlUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694469824; a=rsa-sha256; cv=none; b=gpb5QfbmcMAPeNiYhyBGWXz7kBwfLIMt9g9+73bFhVVcv7MtzfLOQO9E1kgSJUSfZephkA c7wj9eFdufU/MB+3qexykVBDsCmZUQJRH/7qoDcFWxl8+d9yaNj8zj9Z34f/VBRAYOq5kO opvIUJd+63h5WlhZgSavW+Zm3UxI/SthIxqOckcpIuSgTowtcuTTq94Ad5sqf4KcVDIeGE XvpD1QBSbhZjNLU/mR5eaY3aZjPirvkfyeDpLbE4U12apeScWdnNoeZ8HFskmUDvRaQVH7 SophPIbjO6dp8mFlsIVdIR7hC12+xDAbWR0PdYelpefc2IrXpVx4rjl0FermAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XEhQ3atjba9znKvbwvy0s95bgf8lHYYDhfocgL/vM3c=; b=lbQwrFV6mFCLXK6ekrM8Lo+T+8wEfwbgOfArk72AOKO6sySYF8D86wQuYHK/Y3FJRpP6LX ADSEkgIBtVNcu3dLDEnxpK70Shd1rTburbGLALxlKxGnR5N2/r0OKfRvy2rjR0T+zQS4gs dzoJvzh73NNOcX7bYzyRvsUisDGhN/VVwMDgmUgf9pzpJSLx/L8wL9EkRaH5fo4FxKVDbe 1wWoyEQG/66eSCeg4LWxXzIxB6EZMN1lc2Kw0lOV5a+Fii4robDd7KS+3owDoGj57YN+jN c+D2rI5esVeBc0J0U9NZaF3PMneSW4whTRAVJ0WFe5YdN4m27+oTUf8ZrlbKoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl12804DJz15ww; Mon, 11 Sep 2023 22:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BM3hmF006682; Mon, 11 Sep 2023 22:03:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BM3h6I006679; Mon, 11 Sep 2023 22:03:43 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:03:43 GMT Message-Id: <202309112203.38BM3h6I006679@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 8bd17eb4fc9f - main - emulators/qemu-user-static: unbreak with kern.elf64.allow_wx=0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8bd17eb4fc9ff06ef48956ddd6299b5d4871b713 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=8bd17eb4fc9ff06ef48956ddd6299b5d4871b713 commit 8bd17eb4fc9ff06ef48956ddd6299b5d4871b713 Author: Jan Beich AuthorDate: 2023-09-11 20:26:38 +0000 Commit: Jan Beich CommitDate: 2023-09-11 21:15:38 +0000 emulators/qemu-user-static: unbreak with kern.elf64.allow_wx=0 $ qemu-aarch64-static /dev/null qemu_mprotect__osdep: mprotect failed: Permission denied mprotect of jit buffer: Permission denied --- emulators/qemu-user-static-devel/Makefile | 6 ++++-- emulators/qemu-user-static/Makefile | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/emulators/qemu-user-static-devel/Makefile b/emulators/qemu-user-static-devel/Makefile index 8969ee4d55e4..cc9cb0c72d8e 100644 --- a/emulators/qemu-user-static-devel/Makefile +++ b/emulators/qemu-user-static-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= qemu PORTVERSION= 6.2.50 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators PKGNAMESUFFIX= -user-static-devel DIST_SUBDIR= qemu/${PORTVERSION} @@ -21,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libglib-2.0.a:devel/glib20 \ bash:shells/bash \ meson>=0.57.1_1:devel/meson -USES= bison compiler:c11 cpe gmake ninja:build perl5 pkgconfig python:build +USES= bison compiler:c11 cpe elfctl gmake ninja:build perl5 pkgconfig python:build USE_GITHUB= yes GH_TUPLE= qemu-bsd-user:qemu-bsd-user:64ff0f053df \ @@ -49,6 +49,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --cc=${CC} \ --disable-capstone \ --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" +ELF_FEATURES= +wxneeded:*-bsd-user/qemu-* + TEST_TARGET= check .include diff --git a/emulators/qemu-user-static/Makefile b/emulators/qemu-user-static/Makefile index e070be60d3bf..ddb9ebef1478 100644 --- a/emulators/qemu-user-static/Makefile +++ b/emulators/qemu-user-static/Makefile @@ -1,6 +1,6 @@ PORTNAME= qemu PORTVERSION= 3.1.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= emulators PKGNAMESUFFIX= -user-static DIST_SUBDIR= qemu/${PORTVERSION} @@ -15,13 +15,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 powerpc powerpc64 CONFLICTS_INSTALL= qemu-user-static-devel -USES= bison compiler:c11 cpe gmake perl5 pkgconfig python:build +USES= bison compiler:c11 cpe elfctl gmake perl5 pkgconfig python:build USE_GITHUB= yes GH_TUPLE= qemu-bsd-user:qemu-bsd-user:527096e0c8 \ qemu:keycodemapdb:10739aa:keycodemapdb/ui/keycodemapdb HAS_CONFIGURE= yes USE_PERL5= build MAKE_ENV+= BSD_MAKE="${MAKE}" V=1 +ELF_FEATURES= +wxneeded:*-bsd-user/qemu-* USE_RC_SUBR= qemu_user_static SUB_LIST= NAME=qemu_user_static