From nobody Sun Nov 02 09:39:54 2025 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 4czqSV4lQqz6FNs8; Sun, 02 Nov 2025 09:39:54 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4czqSV3lRkz3Dg8; Sun, 02 Nov 2025 09:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762076394; 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=Bif0j5O+tYPiyTrLbLRTebwHktQsyAFgaC26s1CiMts=; b=O88+nQdhgiQqyg/3qhBxF8sfios4UeIoVlUdz8+yAbuRQ8D/8jS2LkGCPKTGdXwtF0DHgO LukN1YAQOyyaz2DX18OzEgsBLbnbUebdPBaviFXym8O5Bc1rIvAT7mdNtsvQY4htAQCDXm zyAQd2J110fK+g/7T1x4xG/jnuqxvbO6CD6ad8XXAfIz/l3+STjUjUFQ2CM/i7EfvU2dVV 8/w8ml3iyxuT3yAALSd3zWjHYLr/JxoYWkNbrPZF9Prs6Xo6sJWjfQ9thEZazFx8SpqCGJ GiTAVc/mJFtKcihEQ4lbUsqhlEugRfZnEkeXXTwkic3KGqZJHIorW0gvI5Bzfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762076394; 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=Bif0j5O+tYPiyTrLbLRTebwHktQsyAFgaC26s1CiMts=; b=vJ+kEKbA+ZI70m9kWnT0UHLIK44tgI4BTV6GT7O5HSZxNz2M5mTsGFgCcW/dhMpVkjHhmb OJcWKh4MaA6X5VSNMlJEOdxWVTd62llQH0IvLyhXHMs1cFdtUIEajgtvthTXnz6uT3ix2P B5N5goNjQNDL5c5efAaKHWYBctmHwbzvOjwHEVTykR4iE22Dp2HpZBnCxzpPsO1aw/w4Jn 6aFCDEnzctDMFyHzLPLbl1qZsKZBP4lnjv8kFffoAAaVa3+etmvXci+jI1aThyxUkrkh9I 9CKgvUEBC4zF2ztUrrNq+NxojTFdswlEitjF0tRCN7yc/RAzhrtpIL+4IRwMDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762076394; a=rsa-sha256; cv=none; b=u7KPgVfqIatY3YgxKw7cdrXc7AJmCqD1lilUGh8Qx2EiDXw9UMDNsHD81hE87DpsrFRL9d g+iCzkCdJVR28L25FmvicyU7egfBokCCAYz9LiC+tc0FDtvu04tmc8aNvr7cq7ZXRXigBm vUm9XlYeeIAlRZlh/Orfwx9YnQEgGF6tVj1gTbaNIutLM+XLT9NoUPUAcCNR32H2TrB+bj ljl/hC3AXwo015QoE9k6exM7RJVez44wSObiPi61BRRvy9UC0aSl1rR15XV5lhVrClkgxz 3BKkY7NeUxvygsVEq8RDAqCYh0zXs5SpbNngKxehDGVYfTcqQpYGu5Uv0gqjgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4czqSV39Nxz4nl; Sun, 02 Nov 2025 09:39:54 +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 5A29dsGi016316; Sun, 2 Nov 2025 09:39:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A29dscG016313; Sun, 2 Nov 2025 09:39:54 GMT (envelope-from git) Date: Sun, 2 Nov 2025 09:39:54 GMT Message-Id: <202511020939.5A29dscG016313@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 9942b0aef604 - main - archivers/liblz4: revert switch to meson 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9942b0aef6049d260a451b255faf4cadeb44b7b0 Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=9942b0aef6049d260a451b255faf4cadeb44b7b0 commit 9942b0aef6049d260a451b255faf4cadeb44b7b0 Author: Matthias Andree AuthorDate: 2025-11-02 09:24:36 +0000 Commit: Matthias Andree CommitDate: 2025-11-02 09:37:50 +0000 archivers/liblz4: revert switch to meson This partially reverts commit 7d6061f15551dcde40cf70fd743d631095360a23 made in the year 2020. Reason: lang/python314 newly depends on archivers/zstd, which depends on archivers/liblz4, so neither of the latter two can use any Python to build lest we create a circular dependency when Python 3.14 is made the default. Note: make-based builds remain the documented way to build/test lz4 1.10.0 in their primary documentation. Note also that the meson build installed one file less than the make-based build, which gets re-added, hence bumping PORTREVISION. PR: 251183 PR: 290732 Approved by: portmgr@ (just-fix-it blanket) --- archivers/liblz4/Makefile | 41 +++++++++------------- .../liblz4/files/patch-meson-programs-meson.build | 24 ------------- archivers/liblz4/pkg-plist | 1 + 3 files changed, 18 insertions(+), 48 deletions(-) diff --git a/archivers/liblz4/Makefile b/archivers/liblz4/Makefile index 857fe6dfecc1..679868ef0d64 100644 --- a/archivers/liblz4/Makefile +++ b/archivers/liblz4/Makefile @@ -1,5 +1,6 @@ PORTNAME= lz4 PORTVERSION= 1.10.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= archivers MASTER_SITES= https://github.com/lz4/lz4/releases/download/v${PORTVERSION}/ @@ -12,37 +13,29 @@ WWW= https://lz4.org/ \ LICENSE= BSD2CLAUSE GPLv2 LICENSE_COMB= multi -LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/../../lib/LICENSE -LICENSE_FILE_GPLv2= ${WRKSRC}/../../programs/COPYING - -USES= cpe meson pkgconfig python:build - -MESON_ARGS= --default-library=both \ - -Dalign-test=true \ - -Dcontrib=false \ - -Ddebug-level=1 \ - -Ddistance-max=65535 \ - -Denable_multithread=true \ - -Dexamples=false \ - -Dfast-dec-loop='auto' \ - -Dforce-sw-bitcount=false \ - -Dfreestanding=false \ - -Dmemory-usage=0 \ - -Dossfuzz=true \ - -Dprograms=true \ - -Dunstable=false \ - -Duser-memory-functions=false +LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/lib/LICENSE +LICENSE_FILE_GPLv2= ${WRKSRC}/programs/COPYING + +# Note this port is in the dependency chain of lang/python314 +# via archivers/zstd and cannot use meson or python to build +USES= cpe gmake pkgconfig +CPE_VENDOR= lz4_project USE_LDCONFIG= yes -WRKSRC_SUBDIR= build/meson -PLIST_SUB= PORTVERSION=${PORTVERSION} +MAKE_ARGS= PREFIX="${PREFIX}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + MANDIR="${PREFIX}/share/man" +MAKE_ENV+= TARGET_ARCH= -CPE_VENDOR= lz4_project +TEST_TARGET= check PORTSCOUT= limit:^[0-9]*\. +PLIST_SUB= PORTVERSION=${PORTVERSION} + OPTIONS_DEFINE= TEST +TEST_DESC= Run complete tests -TEST_MESON_TRUE= tests +TEST_TEST_TARGET=test .include diff --git a/archivers/liblz4/files/patch-meson-programs-meson.build b/archivers/liblz4/files/patch-meson-programs-meson.build deleted file mode 100644 index 1e04f406f8fc..000000000000 --- a/archivers/liblz4/files/patch-meson-programs-meson.build +++ /dev/null @@ -1,24 +0,0 @@ ---- meson/programs/meson.build.orig 2024-07-21 17:29:49 UTC -+++ meson/programs/meson.build -@@ -49,8 +49,8 @@ lz4cat = custom_target( - output: 'lz4cat', - command: [ - 'ln', -- '--symbolic', -- '--force', -+ '-s', -+ '-f', - fs.name(lz4.full_path()), - '@OUTPUT@' - ] -@@ -62,8 +62,8 @@ unlz4 = custom_target( - output: 'unlz4', - command: [ - 'ln', -- '--symbolic', -- '--force', -+ '-s', -+ '-f', - fs.name(lz4.full_path()), - '@OUTPUT@' - ] diff --git a/archivers/liblz4/pkg-plist b/archivers/liblz4/pkg-plist index 9b7308e7d257..782d464e1133 100644 --- a/archivers/liblz4/pkg-plist +++ b/archivers/liblz4/pkg-plist @@ -3,6 +3,7 @@ bin/lz4c bin/lz4cat bin/unlz4 include/lz4.h +include/lz4file.h include/lz4frame.h include/lz4frame_static.h include/lz4hc.h