From owner-dev-commits-ports-all@freebsd.org Sun Jul 11 17:56:16 2021 Return-Path: Delivered-To: dev-commits-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 1E6C266BE19; Sun, 11 Jul 2021 17:56:16 +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 4GNF273PnPz4dl2; Sun, 11 Jul 2021 17:56:15 +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 34497200DE; Sun, 11 Jul 2021 17:56:15 +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 16BHuFpv058805; Sun, 11 Jul 2021 17:56:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16BHuFl2058804; Sun, 11 Jul 2021 17:56:15 GMT (envelope-from git) Date: Sun, 11 Jul 2021 17:56:15 GMT Message-Id: <202107111756.16BHuFl2058804@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Lewis Cook Subject: git: a3c6016fadb2 - main - misc/xplr: Unbreak build on FreeBSD 11-{i386, amd64} MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lcook X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3c6016fadb2d5a19fba9230cf49f17be1241f8f Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2021 17:56:16 -0000 The branch main has been updated by lcook: URL: https://cgit.FreeBSD.org/ports/commit/?id=a3c6016fadb2d5a19fba9230cf49f17be1241f8f commit a3c6016fadb2d5a19fba9230cf49f17be1241f8f Author: Lewis Cook AuthorDate: 2021-07-11 17:54:05 +0000 Commit: Lewis Cook CommitDate: 2021-07-11 17:55:24 +0000 misc/xplr: Unbreak build on FreeBSD 11-{i386,amd64} getentropy(3) did not appear until FreeBSD 12, anything lower will not compile, throwing an undefined reference to `getentropy'. We can safely remove this once FreeBSD 11 is EOL. Reported-by: pkg-fallout --- misc/xplr/Makefile | 13 +++++++++++-- ...s_luajit-src-210.1.3+restyfe08842_luajit2_src_lj__prng.c | 11 +++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/misc/xplr/Makefile b/misc/xplr/Makefile index 2355a074c27c..7071eab71790 100644 --- a/misc/xplr/Makefile +++ b/misc/xplr/Makefile @@ -1,7 +1,7 @@ PORTNAME= xplr DISTVERSIONPREFIX= v DISTVERSION= 0.14.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc MAINTAINER= lcook@FreeBSD.org @@ -177,4 +177,13 @@ post-install-EXAMPLES-on: ${INSTALL_DATA} ${_EXAMPLES} \ ${STAGEDIR}${EXAMPLESDIR} -.include +.include + +# XXX: getentropy(3) did not appear until FreeBSD 12, anything lower will +# not compile, throwing an undefined reference to `getentropy'. We can +# safely remove this once FreeBSD 11 is EOL. +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200000 +EXTRA_PATCHES= ${PATCHDIR}/extra-cargo-crates_luajit-src-210.1.3+restyfe08842_luajit2_src_lj__prng.c +.endif + +.include diff --git a/misc/xplr/files/extra-cargo-crates_luajit-src-210.1.3+restyfe08842_luajit2_src_lj__prng.c b/misc/xplr/files/extra-cargo-crates_luajit-src-210.1.3+restyfe08842_luajit2_src_lj__prng.c new file mode 100644 index 000000000000..f47decc315a6 --- /dev/null +++ b/misc/xplr/files/extra-cargo-crates_luajit-src-210.1.3+restyfe08842_luajit2_src_lj__prng.c @@ -0,0 +1,11 @@ +--- cargo-crates/luajit-src-210.1.3+restyfe08842/luajit2/src/lj_prng.c.orig 2021-07-11 17:23:58 UTC ++++ cargo-crates/luajit-src-210.1.3+restyfe08842/luajit2/src/lj_prng.c +@@ -116,7 +116,7 @@ static PRGR libfunc_rgr; + #define LJ_TARGET_HAS_GETENTROPY 1 + #endif + #elif LJ_TARGET_BSD || LJ_TARGET_SOLARIS || LJ_TARGET_CYGWIN +-#define LJ_TARGET_HAS_GETENTROPY 1 ++#define LJ_TARGET_HAS_GETENTROPY 0 + #endif + + #if LJ_TARGET_HAS_GETENTROPY