From nobody Tue Nov 30 00:57:21 2021 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 5F58B18951C1; Tue, 30 Nov 2021 00:57:22 +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 4J33hx60PVz3H6b; Tue, 30 Nov 2021 00:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 46A4A4AE5; Tue, 30 Nov 2021 00:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AU0vL4r001267; Tue, 30 Nov 2021 00:57:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AU0vLNo001266; Tue, 30 Nov 2021 00:57:21 GMT (envelope-from git) Date: Tue, 30 Nov 2021 00:57:21 GMT Message-Id: <202111300057.1AU0vLNo001266@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: 8050337467a5 - main - emulators/rpcs3: unbreak on FreeBSD 12.2 after 49f593b2f77f 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 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: 8050337467a5a8b817b917fb83f492fdc3924d8a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638233842; 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=GISsxrZUtuhkQC04yml2Stop0Pgy8B2Z4fvD6gSUOH8=; b=kDapg4AGU+DyoHUvtOap9Q41rDaYNfzUlQXNYRQGTFywFmiiAccoQR9ABlgDePq4+OUec3 oxI093no+Aei/TMJ5+smImxHMsZikyOLVZIiGj2nkQFcnhp3thZDhZPBFR/Yc1ETatRwqe znQeSAPLfwyCZLfBooGx7YKGQkKQEO50bDTE9SnaQlsxEe1s+C+bXJccZLJw8DVimqAcxe 9hQWjbcdyc2RdwFmLvjGdLJbWuQFF9i2Hw+ivDUWRTsEq++g4JKuQIMfZbB+zs3eF0FMCX j5oBVe10LAlyEg8s64JOlJYPFZPXlDtbo72Qe5oF6BKt4re3ztu1NgzjHs3kgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638233842; a=rsa-sha256; cv=none; b=SXuMDwUbHRHVozUgBUyUiIbeayTQgIdmWCzHecwr7aa67Pj8FXR8PG6SSKPJCKe/m+bAwJ 4zqirv8tJz6Kc4dP2UkBnMG6lyan/4cnjjdMmbQSvwp/AKlJyccaGKQZZ+0rNnWgC8Awrd QCL/Yjdw4JOgUer2KA6kHpUiCQb+APx2shZP4+j22vfA/f6dZX4Lpaooi2WS3vROB8Cevg jlI4cTnw3KCdm/aX5dH1Y0V3kTkinId8ksTRQgF3wrKqlngTV9cyEkg7ZQSFmrS4aPW6PH M5lmSmtLaUu9enMUdJAaVVfEOlqeOZ3hOuAUEzvN1KdQ5BBa6tpA3Hxn1fJz/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=8050337467a5a8b817b917fb83f492fdc3924d8a commit 8050337467a5a8b817b917fb83f492fdc3924d8a Author: Jan Beich AuthorDate: 2021-11-30 00:53:39 +0000 Commit: Jan Beich CommitDate: 2021-11-30 00:57:08 +0000 emulators/rpcs3: unbreak on FreeBSD 12.2 after 49f593b2f77f elfctl -e +noaslr /wrkdirs/usr/ports/emulators/rpcs3/work/stage/usr/local/bin/rpcs3 elfctl: noaslr is not a valid feature *** Error code 1 --- emulators/rpcs3/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 0f36939fa0f0..6761d27c7c7f 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -82,7 +82,12 @@ post-patch: post-install: .if exists(/usr/bin/elfctl) +. if 0 elfctl -e +noaslr ${STAGEDIR}${PREFIX}/bin/${PORTNAME} +. else +# FreeBSD 12.2 lacks https://cgit.freebsd.org/src/commit/?id=f56d7f838f5b + elfctl -e +aslr ${STAGEDIR}${PREFIX}/bin/${PORTNAME} +. endif .endif .include