From nobody Fri May 5 07:14:31 2023 X-Original-To: dev-commits-ports-main@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 4QCMWK6csPz48vr8; Fri, 5 May 2023 07:19:25 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QCMWK3V7Pz4HMm; Fri, 5 May 2023 07:19:25 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-4f139de8cefso13438892e87.0; Fri, 05 May 2023 00:19:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683271163; x=1685863163; h=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=Ee/sb4FHSedOkBcpXW8eu9unpS1/87Caw/i+1ZANJT0=; b=hYU8IPo+BHhSskTohNYeHiIf/tFTf8hHMi3FU0hZuMGLx+YNulEdRrD+c/h39ILTnL DBTirOcE839+FD8eU3NSsTGCvqpLwrdKDXqvUTk7u6D22RbnBbxaH8s/vOUXTEsQc1UR WFWwB2Yg2Qi9u4CJbEjhNMUFJvNJrxEPkzcnnR7vOsYh1zjVQm9ePEAWAphIbJIAm1Nn e8Tt+phs3tndtBu0toJapPEhdufuvOv6XBw+HpnRve5ujkRYroBTPZiIfPg84+oTlsdj TyVLk18hrEWq/V0/E/ZQSSWWVWQNqRnzSvybJloKe1hun55F5/jeVsgZVPXcI3N2p9eQ e88Q== X-Gm-Message-State: AC+VfDzGyvFvqGAmH/jt12FGm1msz4YbK/86A3FHN2HVmEbQvQBVDbUf nKyX34rYhqAFUEvItri0eLJwcciFlsfXjtlf X-Google-Smtp-Source: ACHHUZ5RMb+SjV0YPenysDlPReWZcmjMvpnp3PIyiZioEABtjZn5eJujllCTYSn4CzDYvd0G++ez7g== X-Received: by 2002:a05:6512:505:b0:4ec:9310:ad4e with SMTP id o5-20020a056512050500b004ec9310ad4emr249200lfb.33.1683271162441; Fri, 05 May 2023 00:19:22 -0700 (PDT) Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com. [209.85.167.50]) by smtp.gmail.com with ESMTPSA id i14-20020ac2522e000000b004eb018fac57sm176029lfl.191.2023.05.05.00.19.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 May 2023 00:19:21 -0700 (PDT) Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-4f139de8cefso13438806e87.0; Fri, 05 May 2023 00:19:21 -0700 (PDT) X-Received: by 2002:ac2:4c36:0:b0:4f1:4a5f:8595 with SMTP id u22-20020ac24c36000000b004f14a5f8595mr242106lfq.15.1683271161367; Fri, 05 May 2023 00:19:21 -0700 (PDT) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 References: <202305030805.34385s1e032836@gitrepo.freebsd.org> <5a8be5a0-e859-8311-8be8-7c42c684f5ff@freebsd.org> In-Reply-To: <5a8be5a0-e859-8311-8be8-7c42c684f5ff@freebsd.org> From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Fri, 5 May 2023 09:14:31 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 0eb6406f6594 - main - devel/opencl: Update OpenCL to 3.0.14 To: Craig Leres Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org, ohartmann@walstatt.org Content-Type: multipart/alternative; boundary="000000000000a2565205faed1b0e" X-Rspamd-Queue-Id: 4QCMWK3V7Pz4HMm X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --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 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 > > AuthorDate: 2023-05-02 10:38:39 +0000 > > Commit: Fernando Apestegu=C3=ADa > > 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


=
On Thu, May 4, 2023 at 9:29=E2=80=AFP= M Craig Leres <leres@freebsd.org> wrote:
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=3D0eb6406f6594c96bef9b692cd7e4fa763a653c= d7
>
> commit 0eb6406f6594c96bef9b692cd7e4fa763a653cd7
> Author:=C2=A0 =C2=A0 =C2=A0O. Hartmann<ohartmann@walstatt.org>
> AuthorDate: 2023-05-02 10:38:39 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Fernando Apestegu=C3=ADa<fernape@FreeBSD= .org>
> CommitDate: 2023-05-03 08:01:08 +0000
>
>=C2=A0 =C2=A0 =C2=A0 devel/opencl: Update OpenCL to 3.0.14
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0271158
>=C2=A0 =C2=A0 =C2=A0 Reported by:ohartmann@walstatt.org=C2=A0 (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= .


=
I was able to build in 12.4 {adm64,i386}, 13.1 amd64 and -current(ish)= amd64

Cheers
=C2=A0

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.

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Craig

ocl_icd_loader.c:895:3: error: expected identifier
=C2=A0 =C2=A0CL_ICDL_OCL_VERSION=3D1,
=C2=A0 =C2=A0^
/usr/local/include/CL/cl_ext.h:3181:61: note: expanded from macro
'CL_ICDL_OCL_VERSION'
#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
=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^
ocl_icd_loader.c:896:3: error: expected identifier
=C2=A0 =C2=A0CL_ICDL_VERSION=3D2,
=C2=A0 =C2=A0^
/usr/local/include/CL/cl_ext.h:3182:61: note: expanded from macro
'CL_ICDL_VERSION'
#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
=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^
ocl_icd_loader.c:897:3: error: expected identifier
=C2=A0 =C2=A0CL_ICDL_NAME=3D3,
=C2=A0 =C2=A0^
/usr/local/include/CL/cl_ext.h:3183:61: note: expanded from macro
'CL_ICDL_NAME'
#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
=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^
ocl_icd_loader.c:898:3: error: expected identifier
=C2=A0 =C2=A0CL_ICDL_VENDOR=3D4,
=C2=A0 =C2=A0^
/usr/local/include/CL/cl_ext.h:3184:61: note: expanded from macro
'CL_ICDL_VENDOR'
#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
=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^
ocl_icd_loader.c:899:3: error: typedef redefinition with different types ('enum cl_icdl_info' vs 'cl_uint' (aka 'unsigned int= 9;))
} cl_icdl_info;
=C2=A0 =C2=A0^
/usr/local/include/CL/cl_ext.h:3178:29: note: previous definition is here typedef cl_uint=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cl_icdl_info= ;
=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^
ocl_icd_loader.c:901:15: error: static declaration of
'clGetICDLoaderInfoOCLICD' follows non-static declaration
static cl_int clGetICDLoaderInfoOCLICD(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^
/usr/local/include/CL/cl_ext.h:3197:1: note: previous declaration is here clGetICDLoaderInfoOCLICD(
^
6 errors generated.
--000000000000a2565205faed1b0e--