Date: Mon, 18 Nov 2024 06:26:40 +0100 From: Daniel Engberg <daniel.engberg.lists@pyret.net> To: "Jason E. Hale" <jhale@FreeBSD.org> Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: f7c59ccf4e1c - main - devel/cmake-core: Remove CPACK option Message-ID: <3e942296a4626a377de1c333441e26ea@mail.infomaniak.com> In-Reply-To: <202411180312.4AI3CmVm002646@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On 2024-11-18T04:12:48.000+01:00, Jason E. Hale <jhale@FreeBSD.org> wrote: > The branch main has been updated by jhale: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=f7c59ccf4e1c6758d03659804f6877a483fac10a > > commit f7c59ccf4e1c6758d03659804f6877a483fac10a > > Author: Jason E. Hale <jhale@FreeBSD.org> > > AuthorDate: 2024-11-18 02:55:11 +0000 > > Commit: Jason E. Hale <jhale@FreeBSD.org> > > 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 and > > 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 libarchive > > from ports installed, the ports version would be linked to. [1] > > > > Add missing dns/libidn2 dependency. This is an optional dependency that > > didn't manifest itself in poudriere, but it gets linked to if previously > > 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 [http://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= cmake > > DISTVERSION= ${_CMAKE_VERSION} > > +PORTREVISION= 1 > > CATEGORIES= devel > > PKGNAMESUFFIX= -core > > > > @@ -11,7 +12,9 @@ LICENSE= BSD3CLAUSE > > LICENSE_FILE= ${WRKSRC}/Copyright.txt > > > > LIB_DEPENDS= libexpat.so:textproc/expat2 [http://libexpat.so:textproc/expat2] \ > > + libidn2.so:dns/libidn2 [http://libidn2.so:dns/libidn2] \ > > libjsoncpp.so:devel/jsoncpp [http://libjsoncpp.so:devel/jsoncpp] \ > > + libpkg.so [http://libpkg.so]:${PKG_ORIGIN} \ > > librhash.so:security/rhash [http://librhash.so:security/rhash] \ > > libuv.so:devel/libuv [http://libuv.so:devel/libuv] > > > > @@ -55,15 +58,9 @@ BUILD_WRKSRC= ${WRKDIR}/.build > > CONFIGURE_WRKSRC= ${BUILD_WRKSRC} > > INSTALL_WRKSRC= ${BUILD_WRKSRC} > > > > -OPTIONS_DEFINE= DOCS CPACK > > -OPTIONS_DEFAULT= CPACK > > +OPTIONS_DEFINE= DOCS > > OPTIONS_SUB= yes > > > > -CPACK_DESC= Enable FreeBSD generator in CPack > > -CPACK_LIB_DEPENDS= libpkg.so [http://libpkg.so]:${PKG_ORIGIN} > > -CPACK_SUB_LIST= CPACK_OPTION_VALUE="ON" > > -CPACK_SUB_LIST_OFF= CPACK_OPTION_VALUE="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 [http://InitialCache.cmake.in] b/devel/cmake-core/files/InitialCache.cmake.in [http://InitialCache.cmake.in] > > index 7532a7832dc9..15977658349d 100644 > > --- a/devel/cmake-core/files/InitialCache.cmake.in [http://InitialCache.cmake.in] > > +++ b/devel/cmake-core/files/InitialCache.cmake.in [http://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 [http://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 [http://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 as far as I know and we'll likely never need it? Best regards, Daniel [-- Attachment #2 --] <html><body><div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px">On 2024-11-18T04:12:48.000+01:00, Jason E. Hale <jhale@FreeBSD.org> wrote:<br></div><div ><div><br></div></div><div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px"><br></div><div class="ik_mail_quote answerContentMessage"><blockquote class="ws-ng-quote"><pre style="white-space: normal;"><div>The branch main has been updated by jhale:<br></div><div><br></div><div>URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=f7c59ccf4e1c6758d03659804f6877a483fac10a" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=f7c59ccf4e1c6758d03659804f6877a483fac10a</a><br></div><div><br></div><div>commit f7c59ccf4e1c6758d03659804f6877a483fac10a<br></div><div>Author: Jason E. Hale <<a href="mailto:jhale@FreeBSD.org" class="defaultMailLink">jhale@FreeBSD.org</a>><br></div><div>AuthorDate: 2024-11-18 02:55:11 +0000<br></div><div>Commit: Jason E. Hale <<a href="mailto:jhale@FreeBSD.org" class="defaultMailLink">jhale@FreeBSD.org</a>><br></div><div>CommitDate: 2024-11-18 03:11:40 +0000<br></div><div><br></div><div> devel/cmake-core: Remove CPACK option<br></div><div> <br></div><div> This option has been a point of confusion several times. It was once an<br></div><div> experimental feature, but it has been on by default for many years and<br></div><div> there is really no point in disabling it anymore.<br></div><div> <br></div><div> Make sure we are always linking to libarchive from base. This was<br></div><div> previously conditionalized to only happen if the CPACK option was<br></div><div> enabled, so if the user had the CPACK option disabled and had libarchive<br></div><div> from ports installed, the ports version would be linked to. [1]<br></div><div> <br></div><div> Add missing dns/libidn2 dependency. This is an optional dependency that<br></div><div> didn't manifest itself in poudriere, but it gets linked to if previously<br></div><div> installed on a live system build.<br></div><div> <br></div><div> Reported by: vvd on #freebsd-desktop [1]<br></div><div>---<br></div><div> devel/cmake-core/Makefile | 11 ++++-------<br></div><div> devel/cmake-core/files/<a href="http://InitialCache.cmake.in" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">InitialCache.cmake.in</a> | 20 +++++++++-----------<br></div><div> 2 files changed, 13 insertions(+), 18 deletions(-)<br></div><div><br></div><div>diff --git a/devel/cmake-core/Makefile b/devel/cmake-core/Makefile<br></div><div>index 632bdc648a07..bdf931045533 100644<br></div><div>--- a/devel/cmake-core/Makefile<br></div><div>+++ b/devel/cmake-core/Makefile<br></div><div>@@ -1,5 +1,6 @@<br></div><div> PORTNAME= cmake<br></div><div> DISTVERSION= ${_CMAKE_VERSION}<br></div><div>+PORTREVISION= 1<br></div><div> CATEGORIES= devel<br></div><div> PKGNAMESUFFIX= -core<br></div><div> <br></div><div>@@ -11,7 +12,9 @@ LICENSE= BSD3CLAUSE<br></div><div> LICENSE_FILE= ${WRKSRC}/Copyright.txt<br></div><div> <br></div><div> LIB_DEPENDS= <a href="http://libexpat.so:textproc/expat2" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">libexpat.so:textproc/expat2</a> \<br></div><div>+ <a href="http://libidn2.so:dns/libidn2" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">libidn2.so:dns/libidn2</a> \<br></div><div> <a href="http://libjsoncpp.so:devel/jsoncpp" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">libjsoncpp.so:devel/jsoncpp</a> \<br></div><div>+ <a href="http://libpkg.so" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">libpkg.so</a>:${PKG_ORIGIN} \<br></div><div> <a href="http://librhash.so:security/rhash" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">librhash.so:security/rhash</a> \<br></div><div> <a href="http://libuv.so:devel/libuv" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">libuv.so:devel/libuv</a><br></div><div> <br></div><div>@@ -55,15 +58,9 @@ BUILD_WRKSRC= ${WRKDIR}/.build<br></div><div> CONFIGURE_WRKSRC= ${BUILD_WRKSRC}<br></div><div> INSTALL_WRKSRC= ${BUILD_WRKSRC}<br></div><div> <br></div><div>-OPTIONS_DEFINE= DOCS CPACK<br></div><div>-OPTIONS_DEFAULT= CPACK<br></div><div>+OPTIONS_DEFINE= DOCS<br></div><div> OPTIONS_SUB= yes<br></div><div> <br></div><div>-CPACK_DESC= Enable FreeBSD generator in CPack<br></div><div>-CPACK_LIB_DEPENDS= <a href="http://libpkg.so" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">libpkg.so</a>:${PKG_ORIGIN}<br></div><div>-CPACK_SUB_LIST= CPACK_OPTION_VALUE="ON"<br></div><div>-CPACK_SUB_LIST_OFF= CPACK_OPTION_VALUE="OFF"<br></div><div>-<br></div><div> post-patch:<br></div><div> @(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \<br></div><div> ${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \<br></div><div>diff --git a/devel/cmake-core/files/<a href="http://InitialCache.cmake.in" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">InitialCache.cmake.in</a> b/devel/cmake-core/files/<a href="http://InitialCache.cmake.in" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">InitialCache.cmake.in</a><br></div><div>index 7532a7832dc9..15977658349d 100644<br></div><div>--- a/devel/cmake-core/files/<a href="http://InitialCache.cmake.in" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">InitialCache.cmake.in</a><br></div><div>+++ b/devel/cmake-core/files/<a href="http://InitialCache.cmake.in" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">InitialCache.cmake.in</a><br></div><div>@@ -1,17 +1,15 @@<br></div><div> # TODO: Add TEST option to enable regression tests. The tests require<br></div><div> # additional packages to be installed and a small amount of patching<br></div><div> # to account for our local changes.<br></div><div>-set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")<br></div><div>+set(BUILD_TESTING OFF CACHE BOOL<br></div><div>+ "Build the testing tree.")<br></div><div> <br></div><div>-# Toggled by the CPACK option. Set to ON by default.<br></div><div>-set(CPACK_ENABLE_FREEBSD_PKG %%CPACK_OPTION_VALUE%% CACHE BOOL<br></div><div>+set(CPACK_ENABLE_FREEBSD_PKG ON CACHE BOOL<br></div><div> "Enable pkg(8) generator in CPack")<br></div><div> <br></div><div>-if(CPACK_ENABLE_FREEBSD_PKG)<br></div><div>-# Use base libarchive instead of the ports or bundled version, because<br></div><div>-# libpkg links against base.<br></div><div>- set(LibArchive_INCLUDE_DIR "/usr/include" CACHE PATH<br></div><div>- "Directory where LibArchive headers are located.")<br></div><div>- set(LibArchive_LIBRARY "/usr/lib/<a href="http://libarchive.so" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">libarchive.so</a>" CACHE PATH<br></div><div>- "LibArchive library to link against.")<br></div><div>-endif(CPACK_ENABLE_FREEBSD_PKG)<br></div><div>+# Use base libarchive instead of the ports or bundled version, because<br></div><div>+# libpkg links against base.<br></div><div>+set(LibArchive_INCLUDE_DIR "/usr/include" CACHE PATH<br></div><div>+ "Directory where LibArchive headers are located.")<br></div><div>+set(LibArchive_LIBRARY "/usr/lib/<a href="http://libarchive.so" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">libarchive.so</a>" CACHE PATH<br></div><div>+ "LibArchive library to link against.")<br></div></pre></blockquote></div><div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px">Hi,<br></div><div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px"><br></div><div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px">Do we need to pull in libidn2 as a dependency? It's never(?) been there as far as I know and we'll likely never need it?<br></div><div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px"><br></div><div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px">Best regards,<br></div><div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px">Daniel<br></div></body></html>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3e942296a4626a377de1c333441e26ea>