From nobody Mon Nov 18 07:43:21 2024 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 4XsKPL0jJLz5f0TF; Mon, 18 Nov 2024 07:43:34 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-ua1-f45.google.com (mail-ua1-f45.google.com [209.85.222.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XsKPK3YdPz54kl; Mon, 18 Nov 2024 07:43:33 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ua1-f45.google.com with SMTP id a1e0cc1a2514c-84ff43e87cbso575810241.1; Sun, 17 Nov 2024 23:43:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731915813; x=1732520613; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Uz5897z9/xDeHn5H3Ht7I+gvkOnIm13BTKEOQgdly30=; b=ET50byUXUIfnpLESsutD43LIsXU6V5yp81YvbMzid6oHNwu+Bdrf2ojXjQiFwTPgKO S5bRE9ig1vdyix1lR4rL7MdfjyYncDwt6Odslr0gXfa+vNOKlIa5svUfptEKoNP8XdGR mk2sJZ/xK/l7nf1QNM1Lz/d7b/fx/Oei/ds1o1M+3Wn+p7F1T0x1RzpTc6Oxsc8O7Hvd LVJUwdTq3RJPESb697mqWUAimjvDS5cbK0gIdN+5yiMwXKxGOJowb+fsMGscHkTZjFba ZgXtd1oPCO/NT9VBv9wUO8p+rqw+rbbsm+cd2ViugEC03yalN1lThcdYN+pn+q4RYCuJ fuwQ== X-Forwarded-Encrypted: i=1; AJvYcCUX9ZiQaCHSd0O6Lpb+7wgYeYrFrf9ZDjgZjvrVYIpSLRwidy99hZ3jPaxBOxj5o3h/lnuhPFP18P9QSTgJi0U7LB9yX5M=@freebsd.org, AJvYcCUfe8mNyruHYzg73r+BIeFN5LR0qUgtZ5yVgQu7eLnaExRuUOmrMJZJOFU5jG5lr4NWWJSiobZqQE3mDYE+ZNAEug==@freebsd.org, AJvYcCWUTj7OcepR64W1WL9bgqwFbwSTsjFkRNJ9q3eDfsu8xI3FIfqxhULOXkybBe9yqBHelWhA1yuhv4Ag2lowT7t7s/3YlG3sdA==@freebsd.org X-Gm-Message-State: AOJu0YySX7nLqaFMw3ZAd6LD8lUyomzt/x7A8fIYyC/l7pg52JZ+xa1b MBoNEMQn6s5YJeFVA/wWGNdn/UuuhXYnK2g7zbx8j88l6hMXABmevK1pAzG++imZ+7/NsBV7ONs AhSiUvhddHNCAQxhCPhwF3x8oi06GUJ0V X-Google-Smtp-Source: AGHT+IGbcU93CkwSDsjOh9qanZrMMhfrRS4/tHPPOMJ8d46ikI6yNlkB4yGdO6dGDSIsTxrFG4XrrhkqsfvlesInhlw= X-Received: by 2002:a05:6102:dcb:b0:4ad:4f0b:d187 with SMTP id ada2fe7eead31-4ad62bfa7dbmr8897471137.12.1731915812709; Sun, 17 Nov 2024 23:43:32 -0800 (PST) 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 References: <202411180312.4AI3CmVm002646@gitrepo.freebsd.org> <3e942296a4626a377de1c333441e26ea@mail.infomaniak.com> In-Reply-To: <3e942296a4626a377de1c333441e26ea@mail.infomaniak.com> From: "Jason E. Hale" Date: Mon, 18 Nov 2024 02:43:21 -0500 Message-ID: Subject: Re: git: f7c59ccf4e1c - main - devel/cmake-core: Remove CPACK option To: Daniel Engberg Cc: "Jason E. Hale" , ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4XsKPK3YdPz54kl X-Spamd-Bar: ---- On Mon, Nov 18, 2024 at 12:26=E2=80=AFAM Daniel Engberg wrote: > > On 2024-11-18T04:12:48.000+01:00, Jason E. Hale wrote= : > > > The branch main has been updated by jhale: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3Df7c59ccf4e1c6758d0365980= 4f6877a483fac10a > > commit f7c59ccf4e1c6758d03659804f6877a483fac10a > Author: Jason E. Hale > AuthorDate: 2024-11-18 02:55:11 +0000 > Commit: Jason E. Hale > CommitDate: 2024-11-18 03:11:40 +0000 > > devel/cmake-core: Remove CPACK option > > This option has been a point of confusion several times. It was once = an > experimental feature, but it has been on by default for many years an= d > there is really no point in disabling it anymore. > > Make sure we are always linking to libarchive from base. This was > previously conditionalized to only happen if the CPACK option was > enabled, so if the user had the CPACK option disabled and had libarch= ive > from ports installed, the ports version would be linked to. [1] > > Add missing dns/libidn2 dependency. This is an optional dependency th= at > didn't manifest itself in poudriere, but it gets linked to if previou= sly > installed on a live system build. > > Reported by: vvd on #freebsd-desktop [1] > --- > devel/cmake-core/Makefile | 11 ++++------- > devel/cmake-core/files/InitialCache.cmake.in | 20 +++++++++----------- > 2 files changed, 13 insertions(+), 18 deletions(-) > > diff --git a/devel/cmake-core/Makefile b/devel/cmake-core/Makefile > index 632bdc648a07..bdf931045533 100644 > --- a/devel/cmake-core/Makefile > +++ b/devel/cmake-core/Makefile > @@ -1,5 +1,6 @@ > PORTNAME=3D cmake > DISTVERSION=3D ${_CMAKE_VERSION} > +PORTREVISION=3D 1 > CATEGORIES=3D devel > PKGNAMESUFFIX=3D -core > > @@ -11,7 +12,9 @@ LICENSE=3D BSD3CLAUSE > LICENSE_FILE=3D ${WRKSRC}/Copyright.txt > > LIB_DEPENDS=3D libexpat.so:textproc/expat2 \ > + libidn2.so:dns/libidn2 \ > libjsoncpp.so:devel/jsoncpp \ > + libpkg.so:${PKG_ORIGIN} \ > librhash.so:security/rhash \ > libuv.so:devel/libuv > > @@ -55,15 +58,9 @@ BUILD_WRKSRC=3D ${WRKDIR}/.build > CONFIGURE_WRKSRC=3D ${BUILD_WRKSRC} > INSTALL_WRKSRC=3D ${BUILD_WRKSRC} > > -OPTIONS_DEFINE=3D DOCS CPACK > -OPTIONS_DEFAULT=3D CPACK > +OPTIONS_DEFINE=3D DOCS > OPTIONS_SUB=3D yes > > -CPACK_DESC=3D Enable FreeBSD generator in CPack > -CPACK_LIB_DEPENDS=3D libpkg.so:${PKG_ORIGIN} > -CPACK_SUB_LIST=3D CPACK_OPTION_VALUE=3D"ON" > -CPACK_SUB_LIST_OFF=3D CPACK_OPTION_VALUE=3D"OFF" > - > post-patch: > @(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \ > ${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \ > diff --git a/devel/cmake-core/files/InitialCache.cmake.in b/devel/cmake-c= ore/files/InitialCache.cmake.in > index 7532a7832dc9..15977658349d 100644 > --- a/devel/cmake-core/files/InitialCache.cmake.in > +++ b/devel/cmake-core/files/InitialCache.cmake.in > @@ -1,17 +1,15 @@ > # TODO: Add TEST option to enable regression tests. The tests require > # additional packages to be installed and a small amount of patching > # to account for our local changes. > -set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.") > +set(BUILD_TESTING OFF CACHE BOOL > + "Build the testing tree.") > > -# Toggled by the CPACK option. Set to ON by default. > -set(CPACK_ENABLE_FREEBSD_PKG %%CPACK_OPTION_VALUE%% CACHE BOOL > +set(CPACK_ENABLE_FREEBSD_PKG ON CACHE BOOL > "Enable pkg(8) generator in CPack") > > -if(CPACK_ENABLE_FREEBSD_PKG) > -# Use base libarchive instead of the ports or bundled version, because > -# libpkg links against base. > - set(LibArchive_INCLUDE_DIR "/usr/include" CACHE PATH > - "Directory where LibArchive headers are located.") > - set(LibArchive_LIBRARY "/usr/lib/libarchive.so" CACHE PATH > - "LibArchive library to link against.") > -endif(CPACK_ENABLE_FREEBSD_PKG) > +# Use base libarchive instead of the ports or bundled version, because > +# libpkg links against base. > +set(LibArchive_INCLUDE_DIR "/usr/include" CACHE PATH > + "Directory where LibArchive headers are located.") > +set(LibArchive_LIBRARY "/usr/lib/libarchive.so" CACHE PATH > + "LibArchive library to link against.") > > Hi, > > Do we need to pull in libidn2 as a dependency? It's never(?) been there a= s far as I know and we'll likely never need it? > > Best regards, > Daniel I'm just going with the upstream defaults for cmcurl. [1] This didn't really work until [2], though. [1] https://gitlab.kitware.com/cmake/cmake/-/commit/24f3388fa415d45a2f83cfc= bcf88deee5ad469dd [2] https://gitlab.kitware.com/cmake/cmake/-/commit/ce908c42a37fd56325aff80= d2c63a4a811ce9389 - Jason