Re: git: 6622ce688cfd - main - multimedia/libopenshot: Update to 0.3.0
Date: Thu, 29 Dec 2022 13:10:35 UTC
Nope. You can use the maintainer's version. If you append USES=compiler:c++14-lang for everyone, then without omp.h there will be USES=compiler:c++14-lang compiler:gcc-c++11-lib (two compiler parameters). I have tried that in the past and it doesn't work, only the first one will be used. On 22-12-29 09:31:44, Nuno Teixeira wrote: >maintainer is trying to "force" me to use: > >--- >.if !exists(/usr/include/omp.h) >USES+= gcc-c++11-lib >.else >USES+= compiler:c++14-lang >.endif >--- > >But I think we can avoid .else statement and use compiler:c++14-lang on >"normal" USES since compiler will be overrided by the .if condition. >Am I correct? > >Piotr Kubaj <pkubaj@anongoth.pl> escreveu no dia quinta, 29/12/2022 à(s) >01:52: > >> Yes, that is ok. >> >> On 22-12-29 00:26:01, Nuno Teixeira wrote: >> >(...) >> > >> >Got confused with that commit that have some months old. >> > >> >Current Makefile has: >> >--- >> >.if !exists(/usr/include/omp.h) >> >USES+= compiler:c++14-lang >> >USE_GCC= yes >> >.else >> >USES+= compiler:c++14-lang >> >.endif >> >--- >> >And it should be corrected to: >> >--- >> >.if !exists(/usr/include/omp.h) >> >USES+= compiler:gcc-c++11-lib >> >.endif >> >--- >> > >> >Is that ok? >> >Sorry because I've got confused >> > >> >Nuno Teixeira <eduardo@freebsd.org> escreveu no dia quarta, 28/12/2022 >> à(s) >> >23:59: >> > >> >> You have fixed it in >> >> >> https://cgit.freebsd.org/ports/commit/?id=b02f812b43870dc615b6fc713121a2e745ed4293 >> >> >> >> I think I understand it better now >> >> >> >> Thanks >> >> >> >> Piotr Kubaj <pkubaj@anongoth.pl> escreveu no dia quarta, 28/12/2022 >> à(s) >> >> 13:43: >> >> >> >>> It would and I was against removal of USES=compiler:openmp but it was >> >>> done anyway without any regard for architectures that don't have >> libomp. >> >>> >> >>> On 22-12-28 14:15:44, Thierry Thomas wrote: >> >>> >Le mer. 28 déc. 22 à 13:47:02 +0100, Piotr Kubaj <pkubaj@anongoth.pl> >> >>> écrivait : >> >>> > >> >>> >> If OpenMP is still necessary, then the best way would be: >> >>> >> .if !exists(/usr/include/omp.h) >> >>> >> USES+= compiler:gcc-c++11-lib >> >>> >> .else >> >>> >> USES+= compiler:c++14-lang >> >>> >> .endif >> >>> > >> >>> >It would be great to re-add an argument "openmp" in Mk/Uses/ >> compiler.mk >> >>> >to put this kind of code at a central place. >> >>> >-- >> >>> >Th. Thomas. >> >>> >> >> >> >> >> >> -- >> >> Nuno Teixeira >> >> FreeBSD Committer (ports) >> >> >> > >> > >> >-- >> >Nuno Teixeira >> >FreeBSD Committer (ports) >> > > >-- >Nuno Teixeira >FreeBSD Committer (ports)