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> References: <202411180312.4AI3CmVm002646@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--_=_swift_1731907600_ecdadcd2245a1190dd2a9f1e62e38894_=_ Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2024-11-18T04:12:48.000+01:00, Jason E. Hale <jhale@FreeBSD.org> wrote= : >=C2=A0The=C2=A0branch=C2=A0main=C2=A0has=C2=A0been=C2=A0updated= =C2=A0by=C2=A0jhale: >=C2=A0 >=C2=A0URL:=C2=A0https://cgit.FreeBSD.org/= ports/commit/?id=3Df7c59ccf4e1c6758d03659804f6877a483fac10a >=C2=A0 >= =C2=A0commit=C2=A0f7c59ccf4e1c6758d03659804f6877a483fac10a >=C2=A0 >= =C2=A0Author:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Jason=C2=A0E.=C2=A0Hale=C2=A0<jh= ale@FreeBSD.org> >=C2=A0 >=C2=A0AuthorDate:=C2=A02024-11-18=C2=A002:55:= 11=C2=A0+0000 >=C2=A0 >=C2=A0Commit:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Jason= =C2=A0E.=C2=A0Hale=C2=A0<jhale@FreeBSD.org> >=C2=A0 >=C2=A0CommitDate:= =C2=A02024-11-18=C2=A003:11:40=C2=A0+0000 >=C2=A0 >=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0devel/cmake-core:=C2=A0Remove=C2=A0CPACK=C2=A0option >= =C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 >=C2=A0 >=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0This=C2=A0option=C2=A0has=C2=A0been=C2=A0a=C2=A0point=C2=A0of= =C2=A0confusion=C2=A0several=C2=A0times.=C2=A0It=C2=A0was=C2=A0once=C2= =A0an >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0experimental=C2=A0feature,= =C2=A0but=C2=A0it=C2=A0has=C2=A0been=C2=A0on=C2=A0by=C2=A0default=C2=A0for= =C2=A0many=C2=A0years=C2=A0and >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0there=C2=A0is=C2=A0really=C2=A0no=C2=A0point=C2=A0in=C2=A0disabling= =C2=A0it=C2=A0anymore. >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 >= =C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Make=C2=A0sure=C2=A0we=C2=A0are= =C2=A0always=C2=A0linking=C2=A0to=C2=A0libarchive=C2=A0from=C2=A0base.= =C2=A0This=C2=A0was >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0previously= =C2=A0conditionalized=C2=A0to=C2=A0only=C2=A0happen=C2=A0if=C2=A0the=C2= =A0CPACK=C2=A0option=C2=A0was >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0enabled,=C2=A0so=C2=A0if=C2=A0the=C2=A0user=C2=A0had=C2=A0the=C2=A0CPACK= =C2=A0option=C2=A0disabled=C2=A0and=C2=A0had=C2=A0libarchive >=C2=A0 >= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0from=C2=A0ports=C2=A0installed,=C2=A0the= =C2=A0ports=C2=A0version=C2=A0would=C2=A0be=C2=A0linked=C2=A0to.=C2=A0[1]= >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 >=C2=A0 >=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0Add=C2=A0missing=C2=A0dns/libidn2=C2=A0dependency.=C2= =A0This=C2=A0is=C2=A0an=C2=A0optional=C2=A0dependency=C2=A0that >=C2= =A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0didn't=C2=A0manifest=C2=A0itself=C2= =A0in=C2=A0poudriere,=C2=A0but=C2=A0it=C2=A0gets=C2=A0linked=C2=A0to=C2= =A0if=C2=A0previously >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0installed= =C2=A0on=C2=A0a=C2=A0live=C2=A0system=C2=A0build. >=C2=A0 >=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Reported= =C2=A0by:=C2=A0=C2=A0=C2=A0=C2=A0vvd=C2=A0on=C2=A0#freebsd-desktop=C2=A0[1]= >=C2=A0 >=C2=A0--- >=C2=A0 >=C2=A0=C2=A0devel/cmake-core/Makefile= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A011=C2=A0++++-------= >=C2=A0 >=C2=A0=C2=A0devel/cmake-core/files/InitialCache.cmake.in= =C2=A0[http://InitialCache.cmake.in]=C2=A0|=C2=A020=C2=A0+++++++++---------= -- >=C2=A0 >=C2=A0=C2=A02=C2=A0files=C2=A0changed,=C2=A013=C2=A0inserti= ons(+),=C2=A018=C2=A0deletions(-) >=C2=A0 >=C2=A0diff=C2=A0--git=C2= =A0a/devel/cmake-core/Makefile=C2=A0b/devel/cmake-core/Makefile >=C2= =A0 >=C2=A0index=C2=A0632bdc648a07..bdf931045533=C2=A0100644 >=C2=A0 = >=C2=A0---=C2=A0a/devel/cmake-core/Makefile >=C2=A0 >=C2=A0+++=C2=A0b/d= evel/cmake-core/Makefile >=C2=A0 >=C2=A0@@=C2=A0-1,5=C2=A0+1,6=C2=A0@@= >=C2=A0 >=C2=A0=C2=A0PORTNAME=3D=C2=A0=C2=A0=C2=A0=C2=A0cmake >= =C2=A0 >=C2=A0=C2=A0DISTVERSION=3D=C2=A0=C2=A0=C2=A0=C2=A0${_CMAKE_VERSIO= N} >=C2=A0 >=C2=A0+PORTREVISION=3D=C2=A0=C2=A0=C2=A0=C2=A01 >=C2= =A0 >=C2=A0=C2=A0CATEGORIES=3D=C2=A0=C2=A0=C2=A0=C2=A0devel >=C2=A0 >= =C2=A0=C2=A0PKGNAMESUFFIX=3D=C2=A0=C2=A0=C2=A0=C2=A0-core >=C2=A0 >= =C2=A0=C2=A0 >=C2=A0 >=C2=A0@@=C2=A0-11,7=C2=A0+12,9=C2=A0@@=C2=A0LICEN= SE=3D=C2=A0=C2=A0=C2=A0=C2=A0BSD3CLAUSE >=C2=A0 >=C2=A0=C2=A0LICENSE_FI= LE=3D=C2=A0=C2=A0=C2=A0=C2=A0${WRKSRC}/Copyright.txt >=C2=A0 >=C2=A0= =C2=A0 >=C2=A0 >=C2=A0=C2=A0LIB_DEPENDS=3D=C2=A0=C2=A0=C2=A0=C2=A0libex= pat.so:textproc/expat2=C2=A0[http://libexpat.so:textproc/expat2]=C2=A0\ >= =C2=A0 >=C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0libidn2.so= :dns/libidn2=C2=A0[http://libidn2.so:dns/libidn2]=C2=A0\ >=C2=A0 >= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0libjsoncpp.so:d= evel/jsoncpp=C2=A0[http://libjsoncpp.so:devel/jsoncpp]=C2=A0\ >=C2=A0 >= =C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0libpkg.so=C2=A0[http= ://libpkg.so]:${PKG_ORIGIN}=C2=A0\ >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0librhash.so:security/rhash=C2=A0[http:/= /librhash.so:security/rhash]=C2=A0\ >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0libuv.so:devel/libuv=C2=A0[http://li= buv.so:devel/libuv] >=C2=A0 >=C2=A0=C2=A0 >=C2=A0 >=C2=A0@@=C2= =A0-55,15=C2=A0+58,9=C2=A0@@=C2=A0BUILD_WRKSRC=3D=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0${WRKDIR}/.build >=C2=A0 >=C2=A0=C2=A0CONFIG= URE_WRKSRC=3D=C2=A0=C2=A0=C2=A0=C2=A0${BUILD_WRKSRC} >=C2=A0 >=C2=A0= =C2=A0INSTALL_WRKSRC=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0${BU= ILD_WRKSRC} >=C2=A0 >=C2=A0=C2=A0 >=C2=A0 >=C2=A0-OPTIONS_DEFINE=3D= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0DOCS=C2=A0CPACK >=C2= =A0 >=C2=A0-OPTIONS_DEFAULT=3D=C2=A0=C2=A0=C2=A0=C2=A0CPACK >=C2=A0 >= =C2=A0+OPTIONS_DEFINE=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0DOC= S >=C2=A0 >=C2=A0=C2=A0OPTIONS_SUB=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0yes >=C2=A0 >=C2=A0=C2=A0 >=C2=A0 >=C2=A0-CPACK_D= ESC=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Enable=C2=A0FreeBSD= =C2=A0generator=C2=A0in=C2=A0CPack >=C2=A0 >=C2=A0-CPACK_LIB_DEPENDS=3D= =C2=A0=C2=A0=C2=A0=C2=A0libpkg.so=C2=A0[http://libpkg.so]:${PKG_ORIGIN} >= =C2=A0 >=C2=A0-CPACK_SUB_LIST=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0CPACK_OPTION_VALUE=3D"ON" >=C2=A0 >=C2=A0-CPACK_SUB_LIST_OF= F=3D=C2=A0=C2=A0=C2=A0=C2=A0CPACK_OPTION_VALUE=3D"OFF" >=C2=A0 >=C2= =A0- >=C2=A0 >=C2=A0=C2=A0post-patch: >=C2=A0 >=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0@(${FIND}=C2=A0${WRKSRC}/Modules=C2=A0-name=C2=A0"*.cm= ake"=C2=A0-print0;=C2=A0\ >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0${FIND}=C2=A0${WRKSRC}/Tests=C2=A0-name=C2=A0"CM= akeLists.txt"=C2=A0-print0=C2=A0)=C2=A0|=C2=A0\ >=C2=A0 >=C2=A0diff= =C2=A0--git=C2=A0a/devel/cmake-core/files/InitialCache.cmake.in=C2=A0[http:= //InitialCache.cmake.in]=C2=A0b/devel/cmake-core/files/InitialCache.cmake.i= n=C2=A0[http://InitialCache.cmake.in] >=C2=A0 >=C2=A0index=C2=A07532a78= 32dc9..15977658349d=C2=A0100644 >=C2=A0 >=C2=A0---=C2=A0a/devel/cmake-c= ore/files/InitialCache.cmake.in=C2=A0[http://InitialCache.cmake.in] >= =C2=A0 >=C2=A0+++=C2=A0b/devel/cmake-core/files/InitialCache.cmake.in= =C2=A0[http://InitialCache.cmake.in] >=C2=A0 >=C2=A0@@=C2=A0-1,17=C2= =A0+1,15=C2=A0@@ >=C2=A0 >=C2=A0=C2=A0#=C2=A0TODO:=C2=A0Add=C2=A0TEST= =C2=A0option=C2=A0to=C2=A0enable=C2=A0regression=C2=A0tests.=C2=A0The=C2= =A0tests=C2=A0require >=C2=A0 >=C2=A0=C2=A0#=C2=A0additional=C2=A0packa= ges=C2=A0to=C2=A0be=C2=A0installed=C2=A0and=C2=A0a=C2=A0small=C2=A0amount= =C2=A0of=C2=A0patching >=C2=A0 >=C2=A0=C2=A0#=C2=A0to=C2=A0account= =C2=A0for=C2=A0our=C2=A0local=C2=A0changes. >=C2=A0 >=C2=A0-set(BUILD_T= ESTING=C2=A0OFF=C2=A0CACHE=C2=A0BOOL=C2=A0"Build=C2=A0the=C2=A0testing= =C2=A0tree.") >=C2=A0 >=C2=A0+set(BUILD_TESTING=C2=A0OFF=C2=A0CACHE= =C2=A0BOOL >=C2=A0 >=C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0"Build=C2=A0the= =C2=A0testing=C2=A0tree.") >=C2=A0 >=C2=A0=C2=A0 >=C2=A0 >=C2=A0-#= =C2=A0Toggled=C2=A0by=C2=A0the=C2=A0CPACK=C2=A0option.=C2=A0Set=C2=A0to= =C2=A0ON=C2=A0by=C2=A0default. >=C2=A0 >=C2=A0-set(CPACK_ENABLE_FREEBSD= _PKG=C2=A0%%CPACK_OPTION_VALUE%%=C2=A0CACHE=C2=A0BOOL >=C2=A0 >=C2= =A0+set(CPACK_ENABLE_FREEBSD_PKG=C2=A0ON=C2=A0CACHE=C2=A0BOOL >=C2=A0 >= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0"Enable=C2=A0pkg(8)=C2=A0generator= =C2=A0in=C2=A0CPack") >=C2=A0 >=C2=A0=C2=A0 >=C2=A0 >=C2=A0-if(CPAC= K_ENABLE_FREEBSD_PKG) >=C2=A0 >=C2=A0-#=C2=A0=C2=A0=C2=A0Use=C2=A0base= =C2=A0libarchive=C2=A0instead=C2=A0of=C2=A0the=C2=A0ports=C2=A0or=C2=A0bund= led=C2=A0version,=C2=A0because >=C2=A0 >=C2=A0-#=C2=A0=C2=A0=C2=A0libpk= g=C2=A0links=C2=A0against=C2=A0base. >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2= =A0=C2=A0set(LibArchive_INCLUDE_DIR=C2=A0"/usr/include"=C2=A0CACHE=C2=A0PAT= H >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0"Dire= ctory=C2=A0where=C2=A0LibArchive=C2=A0headers=C2=A0are=C2=A0located.") >= =C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0set(LibArchive_LIBRARY=C2=A0"/usr/= lib/libarchive.so=C2=A0[http://libarchive.so]"=C2=A0CACHE=C2=A0PATH >= =C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0"LibArchiv= e=C2=A0library=C2=A0to=C2=A0link=C2=A0against.") >=C2=A0 >=C2=A0-endif(= CPACK_ENABLE_FREEBSD_PKG) >=C2=A0 >=C2=A0+#=C2=A0Use=C2=A0base=C2=A0lib= archive=C2=A0instead=C2=A0of=C2=A0the=C2=A0ports=C2=A0or=C2=A0bundled=C2= =A0version,=C2=A0because >=C2=A0 >=C2=A0+#=C2=A0libpkg=C2=A0links=C2= =A0against=C2=A0base. >=C2=A0 >=C2=A0+set(LibArchive_INCLUDE_DIR=C2= =A0"/usr/include"=C2=A0CACHE=C2=A0PATH >=C2=A0 >=C2=A0+=C2=A0=C2=A0= =C2=A0=C2=A0"Directory=C2=A0where=C2=A0LibArchive=C2=A0headers=C2=A0are= =C2=A0located.") >=C2=A0 >=C2=A0+set(LibArchive_LIBRARY=C2=A0"/usr/lib/= libarchive.so=C2=A0[http://libarchive.so]"=C2=A0CACHE=C2=A0PATH >=C2= =A0 >=C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0"LibArchive=C2=A0library=C2=A0to= =C2=A0link=C2=A0against.") 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 n= ever need it? Best regards, Daniel --_=_swift_1731907600_ecdadcd2245a1190dd2a9f1e62e38894_=_ Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable <html><body><div style=3D"font-family: 'Helvetica Neue', Helvetica, Arial, = sans-serif; font-size: 14px">On 2024-11-18T04:12:48.000+01:00, Jason E. Hal= e <jhale@FreeBSD.org> wrote:<br></div><div ><div><br></div></div><div= style=3D"font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font= -size: 14px"><br></div><div class=3D"ik_mail_quote answerContentMessage"><b= lockquote class=3D"ws-ng-quote"><pre style=3D"white-space: normal;"><div>Th= e branch main has been updated by jhale:<br></div><div><br></div><div>URL: = <a href=3D"https://cgit.FreeBSD.org/ports/commit/?id=3Df7c59ccf4e1c6758d036= 59804f6877a483fac10a" class=3D"defaultMailLink" rel=3D"noopener noreferrer"= data-ik=3D"ik-secure" target=3D"_blank">https://cgit.FreeBSD.org/ports/com= mit/?id=3Df7c59ccf4e1c6758d03659804f6877a483fac10a</a><br></div><div><br></= div><div>commit f7c59ccf4e1c6758d03659804f6877a483fac10a<br></div><div>Auth= or: Jason E. Hale <<a href=3D"mailto:jhale@FreeBSD.org" class=3D"def= aultMailLink">jhale@FreeBSD.org</a>><br></div><div>AuthorDate: 2024-11-1= 8 02:55:11 +0000<br></div><div>Commit: Jason E. Hale <<a href=3D"mai= lto:jhale@FreeBSD.org" class=3D"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 o= nce an<br></div><div> experimental feature, but it has been on by defaul= t for many years and<br></div><div> there is really no point in disablin= g it anymore.<br></div><div> <br></div><div> Make sure we are always = linking to libarchive from base. This was<br></div><div> previously cond= itionalized to only happen if the CPACK option was<br></div><div> enable= d, 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]<b= r></div><div> <br></div><div> Add missing dns/libidn2 dependency. Thi= s is an optional dependency that<br></div><div> didn't manifest itself i= n poudriere, but it gets linked to if previously<br></div><div> installe= d 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/cmak= e-core/Makefile | 11 ++++-------<br></div><div> devel/cm= ake-core/files/<a href=3D"http://InitialCache.cmake.in" class=3D"defaultMai= lLink" rel=3D"noopener noreferrer" data-ik=3D"ik-secure" target=3D"_blank">= InitialCache.cmake.in</a> | 20 +++++++++-----------<br></div><div> 2 files = changed, 13 insertions(+), 18 deletions(-)<br></div><div><br></div><div>dif= f --git a/devel/cmake-core/Makefile b/devel/cmake-core/Makefile<br></div><d= iv>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=3D=09cmake<br></div><div> DISTVERSIO= N=3D=09${_CMAKE_VERSION}<br></div><div>+PORTREVISION=3D=091<br></div><div> = CATEGORIES=3D=09devel<br></div><div> PKGNAMESUFFIX=3D=09-core<br></div><div= > <br></div><div>@@ -11,7 +12,9 @@ LICENSE=3D=09BSD3CLAUSE<br></div><div> L= ICENSE_FILE=3D=09${WRKSRC}/Copyright.txt<br></div><div> <br></div><div> LIB= _DEPENDS=3D=09<a href=3D"http://libexpat.so:textproc/expat2" class=3D"defau= ltMailLink" rel=3D"noopener noreferrer" data-ik=3D"ik-secure" target=3D"_bl= ank">libexpat.so:textproc/expat2</a> \<br></div><div>+=09=09<a href=3D"http= ://libidn2.so:dns/libidn2" class=3D"defaultMailLink" rel=3D"noopener norefe= rrer" data-ik=3D"ik-secure" target=3D"_blank">libidn2.so:dns/libidn2</a> \<= br></div><div> =09=09<a href=3D"http://libjsoncpp.so:devel/jsoncpp" class= =3D"defaultMailLink" rel=3D"noopener noreferrer" data-ik=3D"ik-secure" targ= et=3D"_blank">libjsoncpp.so:devel/jsoncpp</a> \<br></div><div>+=09=09<a hre= f=3D"http://libpkg.so" class=3D"defaultMailLink" rel=3D"noopener noreferrer= " data-ik=3D"ik-secure" target=3D"_blank">libpkg.so</a>:${PKG_ORIGIN} \<br>= </div><div> =09=09<a href=3D"http://librhash.so:security/rhash" class=3D"de= faultMailLink" rel=3D"noopener noreferrer" data-ik=3D"ik-secure" target=3D"= _blank">librhash.so:security/rhash</a> \<br></div><div> =09=09<a href=3D"ht= tp://libuv.so:devel/libuv" class=3D"defaultMailLink" rel=3D"noopener norefe= rrer" data-ik=3D"ik-secure" target=3D"_blank">libuv.so:devel/libuv</a><br><= /div><div> <br></div><div>@@ -55,15 +58,9 @@ BUILD_WRKSRC=3D=09=09${WRKDIR}= /.build<br></div><div> CONFIGURE_WRKSRC=3D=09${BUILD_WRKSRC}<br></div><div>= INSTALL_WRKSRC=3D=09=09${BUILD_WRKSRC}<br></div><div> <br></div><div>-OPTI= ONS_DEFINE=3D=09=09DOCS CPACK<br></div><div>-OPTIONS_DEFAULT=3D=09CPACK<br>= </div><div>+OPTIONS_DEFINE=3D=09=09DOCS<br></div><div> OPTIONS_SUB=3D=09=09= yes<br></div><div> <br></div><div>-CPACK_DESC=3D=09=09Enable FreeBSD genera= tor in CPack<br></div><div>-CPACK_LIB_DEPENDS=3D=09<a href=3D"http://libpkg= .so" class=3D"defaultMailLink" rel=3D"noopener noreferrer" data-ik=3D"ik-se= cure" target=3D"_blank">libpkg.so</a>:${PKG_ORIGIN}<br></div><div>-CPACK_SU= B_LIST=3D=09=09CPACK_OPTION_VALUE=3D"ON"<br></div><div>-CPACK_SUB_LIST_OFF= =3D=09CPACK_OPTION_VALUE=3D"OFF"<br></div><div>-<br></div><div> post-patch:= <br></div><div> =09@(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \<b= r></div><div> =09=09${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 = ) | \<br></div><div>diff --git a/devel/cmake-core/files/<a href=3D"http://I= nitialCache.cmake.in" class=3D"defaultMailLink" rel=3D"noopener noreferrer"= data-ik=3D"ik-secure" target=3D"_blank">InitialCache.cmake.in</a> b/devel/= cmake-core/files/<a href=3D"http://InitialCache.cmake.in" class=3D"defaultM= ailLink" rel=3D"noopener noreferrer" data-ik=3D"ik-secure" target=3D"_blank= ">InitialCache.cmake.in</a><br></div><div>index 7532a7832dc9..15977658349d = 100644<br></div><div>--- a/devel/cmake-core/files/<a href=3D"http://Initial= Cache.cmake.in" class=3D"defaultMailLink" rel=3D"noopener noreferrer" data-= ik=3D"ik-secure" target=3D"_blank">InitialCache.cmake.in</a><br></div><div>= +++ b/devel/cmake-core/files/<a href=3D"http://InitialCache.cmake.in" class= =3D"defaultMailLink" rel=3D"noopener noreferrer" data-ik=3D"ik-secure" targ= et=3D"_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 r= equire<br></div><div> # additional packages to be installed and a small amo= unt 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 testi= ng tree.")<br></div><div> <br></div><div>-# Toggled by the CPACK option. Se= t to ON by default.<br></div><div>-set(CPACK_ENABLE_FREEBSD_PKG %%CPACK_OPT= ION_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 l= ibarchive 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 LibArchi= ve headers are located.")<br></div><div>- set(LibArchive_LIBRARY "/usr/l= ib/<a href=3D"http://libarchive.so" class=3D"defaultMailLink" rel=3D"noopen= er noreferrer" data-ik=3D"ik-secure" target=3D"_blank">libarchive.so</a>" C= ACHE PATH<br></div><div>- "LibArchive library to link against.")<br>= </div><div>-endif(CPACK_ENABLE_FREEBSD_PKG)<br></div><div>+# Use base libar= chive instead of the ports or bundled version, because<br></div><div>+# lib= pkg links against base.<br></div><div>+set(LibArchive_INCLUDE_DIR "/usr/inc= lude" CACHE PATH<br></div><div>+ "Directory where LibArchive headers are= located.")<br></div><div>+set(LibArchive_LIBRARY "/usr/lib/<a href=3D"http= ://libarchive.so" class=3D"defaultMailLink" rel=3D"noopener noreferrer" dat= a-ik=3D"ik-secure" target=3D"_blank">libarchive.so</a>" CACHE PATH<br></div= ><div>+ "LibArchive library to link against.")<br></div></pre></blockquo= te></div><div style=3D"font-family: 'Helvetica Neue', Helvetica, Arial, san= s-serif; font-size: 14px">Hi,<br></div><div style=3D"font-family: 'Helvetic= a Neue', Helvetica, Arial, sans-serif; font-size: 14px"><br></div><div styl= e=3D"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 t= here as far as I know and we'll likely never need it?<br></div><div style= =3D"font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size:= 14px"><br></div><div style=3D"font-family: 'Helvetica Neue', Helvetica, Ar= ial, sans-serif; font-size: 14px">Best regards,<br></div><div style=3D"font= -family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px">D= aniel<br></div></body></html> --_=_swift_1731907600_ecdadcd2245a1190dd2a9f1e62e38894_=_--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3e942296a4626a377de1c333441e26ea>