From nobody Wed Sep 06 14:57:42 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 4Rglpt4Qy3z4s054; Wed, 6 Sep 2023 14:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rglpt3bBDz4RLJ; Wed, 6 Sep 2023 14:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694012262; 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; bh=FeUvZ5DprvEmmjxDevw5hFsQKMbiwPPoAZ/buWH9BgM=; b=IjrjubUIy+IqiCmFkUFPP32i9ik6g3+Yy8fhYrp9CKn7cXebKH44VNOYUIBD+ndg9YNlBv w3T0YGea53m7QnpUL/zpTo0Lf0irs8j6duB58pD86bQHDWOwoNde7c8fu8FdVO5/AVmAWy uw19HaQ2u6IDAJElqWiuX9t/l2onw8GhxhCyAUxxp+y4jpdfdyklJi0cCBkcCz0Amhnk9y tAm/QNRxKqi1PEaKSa1rhMDiUebk3VttL6fwRQvVff9OtwgD+6hlq6yPErYLH3hp4/bTzF GlqJM2Q+NC0frbOP3SL8Uglfz03Q+6HvWqtZ6LMbyBeUeKsavAb8Wh0OHU6kig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694012262; a=rsa-sha256; cv=none; b=NyhWpxUZRRYC0aRKVIQo4W9aKgkfJEEZzXR8wIQYOFj7do6rrSzarJCF82/69PsEjMX3Od BXYQqqbhQJ6EUNwf45qukx5OOUviGSgBipSnlE1FfsRNbTdrgYheDL2gr51pzCE32pTiSX xtTstSwd00lV7/hh47VaphmwklTHE93QP0vSRgNth03VEdAMDI7mHDyyA1I6kCVEi2YyVr 093MpgbMbR3r/kbU2fL8EwKiydShlLhOcIhBOQurMBSRT+RkKOMCcTSQuvUdAFk4xDKLHm v+DYD+TVj0kXBdNolLN9+SpuvXINTMLDjf4Xcn+j5xi8+hSYQUKtrpAfGfnVLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694012262; 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; bh=FeUvZ5DprvEmmjxDevw5hFsQKMbiwPPoAZ/buWH9BgM=; b=YccZFVwajxWPDp9X8QRtweTMeC9zvp31NrJeAc5x8us+bwwwWfN3sHYHPRHyokKuRVKH3u M9P3o5N2nPl3IZxkyfHLXprnp2zxgroiMiLRVDeQ93BG4xNp0vLndLPwilajfa/W5a7Ats 1uQewC4VIv0HSsTCDW0RSvB5waG2H21bgj5eMQBM236SAh+0B3LCFDP8A4+vOzB2MTkIjN Ml8/BM5af5JmMKfna0Ab/5ByDNvqybpt66qTjKuLJH0fEzBg8f8nqqL+CTyzcrd6dRFf2E ViqaHu4JN5Hj4VrUl8tLCuBtSB4Wyrpu6A2n8zjnTlkk0/UMyOEpFGWaBJwa/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rglpt2XQKz5ch; Wed, 6 Sep 2023 14:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Evg54019515; Wed, 6 Sep 2023 14:57:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386EvgRN019511; Wed, 6 Sep 2023 14:57:42 GMT (envelope-from git) Date: Wed, 6 Sep 2023 14:57:42 GMT Message-Id: <202309061457.386EvgRN019511@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 512d100d0325 - main - cad/librnd: use a cleaner way to unbreak the build on recent -CURRENT 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 512d100d0325977600779484c18f0889caa3bf52 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=512d100d0325977600779484c18f0889caa3bf52 commit 512d100d0325977600779484c18f0889caa3bf52 Author: Alexey Dokuchaev AuthorDate: 2023-09-06 14:55:20 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-09-06 14:55:20 +0000 cad/librnd: use a cleaner way to unbreak the build on recent -CURRENT Relax the strictness of scconfig-based checks for various functions as it involves initializing `int (*)()' pointer with an incompatible expression which is no longer allowed by modern compilers. Fixes: 474cdc3f85b4 --- cad/librnd/Makefile | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/cad/librnd/Makefile b/cad/librnd/Makefile index 3f1da8ed6866..0754ebf37db9 100644 --- a/cad/librnd/Makefile +++ b/cad/librnd/Makefile @@ -68,15 +68,6 @@ STROKE_CONFIGURE_OFF= --disable-stroke WGET_RUN_DEPENDS= wget:ftp/wget WGET_CONFIGURE_OFF= --disable-lib_wget -.include - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -USES+= llvm:max=15 -CC= clang${LLVM_VERSION} -CPP= clang-cpp${LLVM_VERSION} -CXX= clang++${LLVM_VERSION} -.endif - .include .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK4} || ${PORT_OPTIONS:MMOTIF} @@ -85,6 +76,10 @@ PLIST_SUB+= GUI="" PLIST_SUB+= GUI="@comment " .endif +post-patch: + @${ECHO_CMD} 'USER_CFLAGS += -DSCCONFIG_ACCEPT_IMPLICIT' \ + >> ${WRKSRC}/scconfig/Makefile + pre-configure: ${REINPLACE_CMD} \ -e 's,%%LOCALBASE%%,${LOCALBASE},' \