From nobody Thu May 04 19:29:12 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 4QC3lx5QzRz49RWb; Thu, 4 May 2023 19:29:17 +0000 (UTC) (envelope-from leres@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QC3lx4vl3z4Nrj; Thu, 4 May 2023 19:29:17 +0000 (UTC) (envelope-from leres@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683228557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MrkseTIuHzlFVvJt6xOxwMWninQFIj4ScRiWs1y4Ph8=; b=uZXH7I6mEHTgnNTxzqWvYHYL/cWI6wYv3zALozQx0ESuWalnPumxNUxGlDaD1VQYk4OVCb O32XaOYlwomR6fD1jnPzZKOGl8+vjr6i/PiHqJ5ezMBxcKJ5qMbEprBsTSDxNKKgVgbBH7 ts6i6jzjFvb0fPyYUgDqgZCJZeq+zVrKa5fjK/fT++5MlR2//PFg5JlGaJ3IsmCHMidWIM wt2gXkhWgb8K2yZ9L2pNT8TnMWoFNeqOfUO88qaYQyE26OAuH/VRy7ZSm3ahBULgDbroGh MVkwfe8Z34DhDtTz8VJYVhEeP57JZGrhjSLnQZkaLUOYgFJ1KYY5aLvRT6bIfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683228557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MrkseTIuHzlFVvJt6xOxwMWninQFIj4ScRiWs1y4Ph8=; b=dmYnqS4qUrsbiJKLf2ZXRma1NEOrhPMhRl29SRf+Ah8ELXYvWL9c7aQD0+ptFyAB8oEhAm 35xdWnd7Aa3yyvjjfXZImvTb0fQrUn2alCHl0KEa6avVHJdC3HJ9b0kkxRjtTRV/IBXZmz 3TzOZKxaKg3cbaD5jABy2r8TTsj1jut9LW8VDOLpDHv2T1Ad6txurH349FAgiqJRrZq6YJ zPc1R2HSQjkqu6nw+un9ui/d5H2N5AHd5Xsdyi5E5wSMhq2jSRS7fljMF+1L1GutaQH4lB h3H5AFNyEJzrZ5MIch2nHlaxQKfMEgh1buqT0dzMf87qhP8GXFcTnyNRvBfBCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683228557; a=rsa-sha256; cv=none; b=xmgi9MBtnRNpIn82zVDZpBvd9jDo7PRRJhB/J5+ieCOIbL6zNWF9taUMw7g95sePkD24/D ueg7EVn0zlmnVWDxHkaiVTXh06Q7ahdOLfQp0hVOYaZ5xaTm+JeDPWQJ7PigzWfkg/6tmu jWKbyXyT8OxV4My6/Kuj7jawCaCd+MCvCqzZha/oSKW1MDK7WoMAp+IZPJgIQXz4qj7DUK 97Zj4WYhyWDExMkuFYedksnI70vW1iRkAEzsGrfXqT+onEZNluJgZddteCeq6hsuXAC/zL yPn1xKe3QU2bgNJb5dTJr6MB86bJ707D+cG7EIA7FluF/F6wjLFD84ZEkZC7IA== Received: from [IPV6:2620:83:8000:102::cb] (hot.ee.lbl.gov [IPv6:2620:83:8000:102::cb]) (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 did not present a certificate) (Authenticated sender: leres) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QC3lx0ZBlz1HMd; Thu, 4 May 2023 19:29:16 +0000 (UTC) (envelope-from leres@freebsd.org) Message-ID: <5a8be5a0-e859-8311-8be8-7c42c684f5ff@freebsd.org> Date: Thu, 4 May 2023 12:29:12 -0700 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 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: Re: git: 0eb6406f6594 - main - devel/opencl: Update OpenCL to 3.0.14 Content-Language: en-US To: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org, ohartmann@walstatt.org References: <202305030805.34385s1e032836@gitrepo.freebsd.org> From: Craig Leres In-Reply-To: <202305030805.34385s1e032836@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N On 5/3/23 01:05, Fernando Apesteguía wrote: > The branch main has been updated by fernape: > > URL:https://cgit.FreeBSD.org/ports/commit/?id=0eb6406f6594c96bef9b692cd7e4fa763a653cd7 > > commit 0eb6406f6594c96bef9b692cd7e4fa763a653cd7 > Author: O. Hartmann > AuthorDate: 2023-05-02 10:38:39 +0000 > Commit: Fernando Apesteguía > 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. 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=1, ^ /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=2, ^ /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=3, ^ /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=4, ^ /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.