From nobody Fri Nov 08 21:40:07 2024 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 4XlXRD0qClz5cq8w; Fri, 08 Nov 2024 21:40:08 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XlXRD0Hh8z4N4R; Fri, 8 Nov 2024 21:40:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731102008; 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=KW5BuYcbvlEg16tQd6nxEAOt1Ugvzrg1tZLTk2Ldr4c=; b=LjKXM5fKmgOf5pIfajUrL7kML9f4PuKc0elylKyXxFbI0cEw1VFFgYc2bceOifuW3fsOde gYhyzLoXLBebPrTDPAcdld2AsrO4dMQKSy9a6vuiypoRJ2ilC9QZWMRe+oDTb8WJ3zfFn5 X7gU7nqwGIMmkJicwCTt/kdkoRy9Fsp0CcMLJ2ScMcZ0EkcM7T5pzwE6is6oXYk1PiPU2p ++p0EhtjiAubwfSpMvE8b1tNm39yVYojmgBHeUWhyL3ogZ4ikYnKtcqgl6fKX+kik5XHCQ y/qbGHCYijsqZckck6ojYy3xg3mlSOgv+hMEsOxi8+P+He+f0Iwh4/1D2hBghw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731102008; 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=KW5BuYcbvlEg16tQd6nxEAOt1Ugvzrg1tZLTk2Ldr4c=; b=x01ds5OOxo2D3f12qaYj6CqgP1z5Gsp97vhUmGsNwAgN+1ZQsD/v2yd4RGUcjhG5NO01CH vAeMcFLsZlSQYuYGQTGtlWOkeVE22M+d4e4qCb8vXnPeHyj9JRXLRD21UAzFHuOv049DPh lQUCTOk87grZWsqWAlpUWdIxSOopV9tsTlSU8fuuBXyp2xMiA4ujfmThuoDIT5pRf/FVZB CR/4BHdl8UdS+m/dNtoXu+eE9EpInP1PxrnkblnCk6HKTw6evj31b+iRohiB2jn97X/LNB +mZIA+Zz+iIOQ3oRoWbI5jiDYre3bSVJ22uRe+0qxgmXdB0CQO1RFBwEBER0Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731102008; a=rsa-sha256; cv=none; b=ldfeMJO03Ig5OOONNfmQkn1coQIV/VecqGA22PE77RoeCgZWxpmE9yZ8CPCXnMPy7idDDc iCKI8/VqtxbaYVOZUfy1NcCvSvfEfRB+beGIYCPUYGQWZP4J8CJlKXQ09MlBxbtJoVUEMW LsjuvSgcpqRShp6hXeks9obtfwlAWJoXlTgtKYUvBrmCFsmS2U1XQIDAhrxtrxPwEgaISX d9aF0KzCs0gDxclth2RQvc+7rhAsxYRmerUaru1Sq3owRd9BCiX7LA1nqGNlVeBSp3nfTi 0Wv4QGvfFVPQsh65sYfDiligHHfgm/4+aatFDtNPMmrMIwoncv6o4/8MTwSp0A== 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 4XlXRC6t3BzlmS; Fri, 8 Nov 2024 21:40:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A8Le7Rw011355; Fri, 8 Nov 2024 21:40:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A8Le7sQ011350; Fri, 8 Nov 2024 21:40:07 GMT (envelope-from git) Date: Fri, 8 Nov 2024 21:40:07 GMT Message-Id: <202411082140.4A8Le7sQ011350@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 3f187b59479d - main - lang/luajit-devel: update to the recent snapshot 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f187b59479db8e6712a491f4660830a705ecf74 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f187b59479db8e6712a491f4660830a705ecf74 commit 3f187b59479db8e6712a491f4660830a705ecf74 Author: Sergey A. Osokin AuthorDate: 2024-11-08 21:38:54 +0000 Commit: Sergey A. Osokin CommitDate: 2024-11-08 21:39:53 +0000 lang/luajit-devel: update to the recent snapshot Regenerate patches. Pet portlint(1). --- lang/luajit-devel/Makefile | 9 +++++---- lang/luajit-devel/distinfo | 6 +++--- lang/luajit-devel/files/patch-Makefile | 20 ++++++++++---------- lang/luajit-devel/files/patch-src_Makefile | 8 ++++---- lang/luajit-devel/files/patch-src_lj__prng.c | 12 ++++++------ 5 files changed, 28 insertions(+), 27 deletions(-) diff --git a/lang/luajit-devel/Makefile b/lang/luajit-devel/Makefile index 3d1b225cfe5c..b311ee4a2994 100644 --- a/lang/luajit-devel/Makefile +++ b/lang/luajit-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= luajit -DISTVERSION= 2.1.0.20240821 +DISTVERSION= 2.1.0.20241002 CATEGORIES= lang PKGNAMESUFFIX= -devel DISTNAME= LuaJIT-${DISTVERSION} @@ -14,17 +14,18 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT IGNORE_riscv64= fails to compile: lj_arch.h:73:2: No support for this architecture (yet) +USES= compiler cpe gmake + CONFLICTS_INSTALL= luajit luajit-openresty -USES= compiler cpe gmake USE_LDCONFIG= yes MAKE_ARGS= CC=${CC} CCOPT= CCOPT_x86= Q= USE_GITHUB= yes -GH_TUPLE= LuaJIT:LuaJIT:c68711c +GH_TUPLE= LuaJIT:LuaJIT:97813fb LUAJIT_VERSION= 2.1 -LUAJIT_SOVERSION= 2.1.1724232689 +LUAJIT_SOVERSION= 2.1.1727870382 PLIST_SUB+= VERSION=${LUAJIT_VERSION} SOVERSION=${LUAJIT_SOVERSION} diff --git a/lang/luajit-devel/distinfo b/lang/luajit-devel/distinfo index 4718aa5fb716..2bfa1582c7d5 100644 --- a/lang/luajit-devel/distinfo +++ b/lang/luajit-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1724338730 -SHA256 (LuaJIT-LuaJIT-2.1.0.20240821-c68711c_GH0.tar.gz) = b9539aa2c18f91d00909b32c36a03c5fa23c75e282d2db1736c366f5d1a4d1cb -SIZE (LuaJIT-LuaJIT-2.1.0.20240821-c68711c_GH0.tar.gz) = 1081813 +TIMESTAMP = 1731095485 +SHA256 (LuaJIT-LuaJIT-2.1.0.20241002-97813fb_GH0.tar.gz) = c96d2b0697c42e7d5da24e273e1d829c77971866be1b49abfa10dacedb661e47 +SIZE (LuaJIT-LuaJIT-2.1.0.20241002-97813fb_GH0.tar.gz) = 1081689 diff --git a/lang/luajit-devel/files/patch-Makefile b/lang/luajit-devel/files/patch-Makefile index e0027fc261c3..fdfc4c47f503 100644 --- a/lang/luajit-devel/files/patch-Makefile +++ b/lang/luajit-devel/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2022-08-15 08:16:58.000000000 -0400 -+++ Makefile 2022-08-23 10:24:42.806504000 -0400 -@@ -25,7 +25,7 @@ +--- Makefile.orig 2024-10-02 11:59:42 UTC ++++ Makefile +@@ -30,7 +30,7 @@ VERSION= $(MMVERSION).$(RELVER) # Change the installation path as needed. This automatically adjusts # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path! # @@ -9,15 +9,15 @@ export MULTILIB= lib ############################################################################## -@@ -35,6 +35,7 @@ +@@ -40,6 +40,7 @@ INSTALL_INC= $(INSTALL_DEFINC) INSTALL_SHARE= $(DPREFIX)/share - INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) + INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION) INSTALL_INC= $(INSTALL_DEFINC) +INSTALL_LIBD= $(DPREFIX)/libdata - INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) + export INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION) INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit -@@ -42,8 +43,7 @@ +@@ -47,8 +48,7 @@ INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER) INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) INSTALL_CMODD= $(INSTALL_LIB)/lua INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER) @@ -27,7 +27,7 @@ INSTALL_TNAME= luajit-$(VERSION) INSTALL_TSYMNAME= luajit -@@ -64,8 +64,8 @@ +@@ -69,8 +69,8 @@ INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) @@ -38,7 +38,7 @@ UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \ $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD) -@@ -125,10 +125,8 @@ +@@ -134,10 +134,8 @@ install: $(INSTALL_DEP) $(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) cd src && test -f $(FILE_SO) && \ $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ @@ -49,7 +49,7 @@ cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \ $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \ $(RM) $(FILE_PC).tmp -@@ -152,7 +150,6 @@ +@@ -155,7 +153,6 @@ uninstall: for file in $(FILES_INC); do \ $(UNINSTALL) $(INSTALL_INC)/$$file; \ done diff --git a/lang/luajit-devel/files/patch-src_Makefile b/lang/luajit-devel/files/patch-src_Makefile index 88511431f17a..ef9c346256f2 100644 --- a/lang/luajit-devel/files/patch-src_Makefile +++ b/lang/luajit-devel/files/patch-src_Makefile @@ -1,6 +1,6 @@ ---- src/Makefile.orig 2019-06-26 21:12:49 UTC +--- src/Makefile.orig 2024-10-02 11:59:42 UTC +++ src/Makefile -@@ -24,7 +24,7 @@ NODOTABIVER= 51 +@@ -23,7 +23,7 @@ NODOTABIVER= 51 # removing the '#' in front of them. Make sure you force a full recompile # with "make clean", followed by "make" if you change any options. # @@ -9,7 +9,7 @@ # # LuaJIT builds as a native 32 or 64 bit binary by default. CC= $(DEFAULT_CC) -@@ -36,7 +36,7 @@ CC= $(DEFAULT_CC) +@@ -35,7 +35,7 @@ CC= $(DEFAULT_CC) # to slow down the C part by not omitting it. Debugging, tracebacks and # unwinding are not affected -- the assembler part has frame unwind # information and GCC emits it where needed (x64) or with -g (see CCDEBUG). @@ -18,7 +18,7 @@ # Use this if you want to generate a smaller binary (but it's slower): #CCOPT= -Os -fomit-frame-pointer # Note: it's no longer recommended to use -O3 with GCC 4.x. -@@ -47,7 +47,7 @@ CCOPT= -O2 -fomit-frame-pointer +@@ -46,7 +46,7 @@ CCOPT= -O2 -fomit-frame-pointer # x86/x64 only: For GCC 4.2 or higher and if you don't intend to distribute # the binaries to a different machine you could also use: -march=native # diff --git a/lang/luajit-devel/files/patch-src_lj__prng.c b/lang/luajit-devel/files/patch-src_lj__prng.c index f22f32475546..0a83880e65d7 100644 --- a/lang/luajit-devel/files/patch-src_lj__prng.c +++ b/lang/luajit-devel/files/patch-src_lj__prng.c @@ -1,6 +1,6 @@ ---- src/lj_prng.c.orig 2021-10-27 20:58:55.107726000 -0400 -+++ src/lj_prng.c 2021-10-27 21:00:37.533971000 -0400 -@@ -109,6 +109,7 @@ +--- src/lj_prng.c.orig 2024-10-02 11:59:42 UTC ++++ src/lj_prng.c +@@ -113,6 +113,7 @@ static PRGR libfunc_rgr; #include #else @@ -8,11 +8,11 @@ #if LJ_TARGET_OSX && !LJ_TARGET_IOS /* ** In their infinite wisdom Apple decided to disallow getentropy() in the -@@ -120,6 +121,7 @@ +@@ -124,6 +125,7 @@ static PRGR libfunc_rgr; #include #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 #define LJ_TARGET_HAS_GETENTROPY 1 +#endif #endif - #endif - #elif (LJ_TARGET_BSD && !defined(__NetBSD__)) || LJ_TARGET_SOLARIS || LJ_TARGET_CYGWIN + #elif (LJ_TARGET_BSD && !defined(__NetBSD__)) || LJ_TARGET_SOLARIS || LJ_TARGET_CYGWIN || LJ_TARGET_QNX + #define LJ_TARGET_HAS_GETENTROPY 1