Date: Fri, 5 May 2023 09:14:31 +0200 From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= <fernape@freebsd.org> To: Craig Leres <leres@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org, ohartmann@walstatt.org Subject: Re: git: 0eb6406f6594 - main - devel/opencl: Update OpenCL to 3.0.14 Message-ID: <CAGwOe2by65o0fFat0eQunsQHk7Sns9NG-qr_vrBQcBpA%2BtV_Cg@mail.gmail.com> In-Reply-To: <5a8be5a0-e859-8311-8be8-7c42c684f5ff@freebsd.org> References: <202305030805.34385s1e032836@gitrepo.freebsd.org> <5a8be5a0-e859-8311-8be8-7c42c684f5ff@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000a2565205faed1b0e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, May 4, 2023 at 9:29=E2=80=AFPM Craig Leres <leres@freebsd.org> wrot= e: > On 5/3/23 01:05, Fernando Apestegu=C3=ADa wrote: > > The branch main has been updated by fernape: > > > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3D0eb6406f6594c96bef9b692cd7e4f= a763a653cd7 > > > > commit 0eb6406f6594c96bef9b692cd7e4fa763a653cd7 > > Author: O. Hartmann<ohartmann@walstatt.org> > > AuthorDate: 2023-05-02 10:38:39 +0000 > > Commit: Fernando Apestegu=C3=ADa<fernape@FreeBSD.org> > > CommitDate: 2023-05-03 08:01:08 +0000 > > > > devel/opencl: Update OpenCL to 3.0.14 > > > > PR: 271158 > > Reported by:ohartmann@walstatt.org (maintainer) > > --- > > Unfortunately this breaks building devel/ocl-icd for me (see appended). > Looks like some things ocl-icd was defining in (ocl-idcd) > ocl_icd_loader.c are conflicting with a new version in (opencl) > CL/cl_ext.h. > Can you try this patch https://people.freebsd.org/~fernape/patches/devel_ocl-icd.patch I was able to build in 12.4 {adm64,i386}, 13.1 amd64 and -current(ish) amd6= 4 Cheers > > I took a stab at ifdef'ing out the enum that conflicts with the define > but that just uncovers other incompatibilities; the problem is beyond my > understanding of these packages. > > devel/ocl-icd is already at the last upstream release of ocl-icd. > > Note that this breaks building things like firefox and thunderbird. > > Craig > > ocl_icd_loader.c:895:3: error: expected identifier > CL_ICDL_OCL_VERSION=3D1, > ^ > /usr/local/include/CL/cl_ext.h:3181:61: note: expanded from macro > 'CL_ICDL_OCL_VERSION' > #define CL_ICDL_OCL_VERSION 1 > ^ > ocl_icd_loader.c:896:3: error: expected identifier > CL_ICDL_VERSION=3D2, > ^ > /usr/local/include/CL/cl_ext.h:3182:61: note: expanded from macro > 'CL_ICDL_VERSION' > #define CL_ICDL_VERSION 2 > ^ > ocl_icd_loader.c:897:3: error: expected identifier > CL_ICDL_NAME=3D3, > ^ > /usr/local/include/CL/cl_ext.h:3183:61: note: expanded from macro > 'CL_ICDL_NAME' > #define CL_ICDL_NAME 3 > ^ > ocl_icd_loader.c:898:3: error: expected identifier > CL_ICDL_VENDOR=3D4, > ^ > /usr/local/include/CL/cl_ext.h:3184:61: note: expanded from macro > 'CL_ICDL_VENDOR' > #define CL_ICDL_VENDOR 4 > ^ > ocl_icd_loader.c:899:3: error: typedef redefinition with different types > ('enum cl_icdl_info' vs 'cl_uint' (aka 'unsigned int')) > } cl_icdl_info; > ^ > /usr/local/include/CL/cl_ext.h:3178:29: note: previous definition is here > typedef cl_uint cl_icdl_info; > ^ > ocl_icd_loader.c:901:15: error: static declaration of > 'clGetICDLoaderInfoOCLICD' follows non-static declaration > static cl_int clGetICDLoaderInfoOCLICD( > ^ > /usr/local/include/CL/cl_ext.h:3197:1: note: previous declaration is here > clGetICDLoaderInfoOCLICD( > ^ > 6 errors generated. > --000000000000a2565205faed1b0e Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">= <div dir=3D"ltr" class=3D"gmail_attr">On Thu, May 4, 2023 at 9:29=E2=80=AFP= M Craig Leres <<a href=3D"mailto:leres@freebsd.org">leres@freebsd.org</a= >> wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px= 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On = 5/3/23 01:05, Fernando Apestegu=C3=ADa wrote:<br> > The branch main has been updated by fernape:<br> > <br> > URL:<a href=3D"https://cgit.FreeBSD.org/ports/commit/?id=3D0eb6406f659= 4c96bef9b692cd7e4fa763a653cd7" rel=3D"noreferrer" target=3D"_blank">https:/= /cgit.FreeBSD.org/ports/commit/?id=3D0eb6406f6594c96bef9b692cd7e4fa763a653c= d7</a><br> > <br> > commit 0eb6406f6594c96bef9b692cd7e4fa763a653cd7<br> > Author:=C2=A0 =C2=A0 =C2=A0O. Hartmann<<a href=3D"mailto:ohartmann@= walstatt.org" target=3D"_blank">ohartmann@walstatt.org</a>><br> > AuthorDate: 2023-05-02 10:38:39 +0000<br> > Commit:=C2=A0 =C2=A0 =C2=A0Fernando Apestegu=C3=ADa<fernape@FreeBSD= .org><br> > CommitDate: 2023-05-03 08:01:08 +0000<br> > <br> >=C2=A0 =C2=A0 =C2=A0 devel/opencl: Update OpenCL to 3.0.14<br> >=C2=A0 =C2=A0 =C2=A0 <br> >=C2=A0 =C2=A0 =C2=A0 PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0271158<br> >=C2=A0 =C2=A0 =C2=A0 Reported <a href=3D"mailto:by%3Aohartmann@walstatt= .org" target=3D"_blank">by:ohartmann@walstatt.org</a>=C2=A0 (maintainer)<br= > > ---<br> <br> Unfortunately this breaks building devel/ocl-icd for me (see appended). <br= > Looks like some things ocl-icd was defining in (ocl-idcd) <br> ocl_icd_loader.c are conflicting with a new version in (opencl) CL/cl_ext.h= .<br></blockquote><div><br></div><div>Can you try this patch <a href=3D"htt= ps://people.freebsd.org/~fernape/patches/devel_ocl-icd.patch">https://peopl= e.freebsd.org/~fernape/patches/devel_ocl-icd.patch</a></div><div><br></div>= <div>I was able to build in 12.4 {adm64,i386}, 13.1 amd64 and -current(ish)= amd64</div><div><br></div><div>Cheers<br></div><div>=C2=A0</div><blockquot= e class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px s= olid rgb(204,204,204);padding-left:1ex"> <br> I took a stab at ifdef'ing out the enum that conflicts with the define = <br> but that just uncovers other incompatibilities; the problem is beyond my <b= r> understanding of these packages.<br> <br> devel/ocl-icd is already at the last upstream release of ocl-icd.<br> <br> Note that this breaks building things like firefox and thunderbird.<br> <br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Craig<br> <br> ocl_icd_loader.c:895:3: error: expected identifier<br> =C2=A0 =C2=A0CL_ICDL_OCL_VERSION=3D1,<br> =C2=A0 =C2=A0^<br> /usr/local/include/CL/cl_ext.h:3181:61: note: expanded from macro <br> 'CL_ICDL_OCL_VERSION'<br> #define CL_ICDL_OCL_VERSION=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=A01<br> =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=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^<br> ocl_icd_loader.c:896:3: error: expected identifier<br> =C2=A0 =C2=A0CL_ICDL_VERSION=3D2,<br> =C2=A0 =C2=A0^<br> /usr/local/include/CL/cl_ext.h:3182:61: note: expanded from macro <br> 'CL_ICDL_VERSION'<br> #define CL_ICDL_VERSION=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=A02<br> =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=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^<br> ocl_icd_loader.c:897:3: error: expected identifier<br> =C2=A0 =C2=A0CL_ICDL_NAME=3D3,<br> =C2=A0 =C2=A0^<br> /usr/local/include/CL/cl_ext.h:3183:61: note: expanded from macro <br> 'CL_ICDL_NAME'<br> #define CL_ICDL_NAME=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 3<br> =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=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^<br> ocl_icd_loader.c:898:3: error: expected identifier<br> =C2=A0 =C2=A0CL_ICDL_VENDOR=3D4,<br> =C2=A0 =C2=A0^<br> /usr/local/include/CL/cl_ext.h:3184:61: note: expanded from macro <br> 'CL_ICDL_VENDOR'<br> #define CL_ICDL_VENDOR=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 4<br> =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=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^<br> ocl_icd_loader.c:899:3: error: typedef redefinition with different types <b= r> ('enum cl_icdl_info' vs 'cl_uint' (aka 'unsigned int= 9;))<br> } cl_icdl_info;<br> =C2=A0 =C2=A0^<br> /usr/local/include/CL/cl_ext.h:3178:29: note: previous definition is here<b= r> typedef cl_uint=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cl_icdl_info= ;<br> =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^<br> ocl_icd_loader.c:901:15: error: static declaration of <br> 'clGetICDLoaderInfoOCLICD' follows non-static declaration<br> static cl_int clGetICDLoaderInfoOCLICD(<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^<br> /usr/local/include/CL/cl_ext.h:3197:1: note: previous declaration is here<b= r> clGetICDLoaderInfoOCLICD(<br> ^<br> 6 errors generated.<br> </blockquote></div></div> --000000000000a2565205faed1b0e--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGwOe2by65o0fFat0eQunsQHk7Sns9NG-qr_vrBQcBpA%2BtV_Cg>