From nobody Thu May 11 07:00:15 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 4QH2pR2Gylz49qGh; Thu, 11 May 2023 07:00:15 +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 4QH2pR1nZxz3HNY; Thu, 11 May 2023 07:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683788415; 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=Jxp5vPlc7uOlly4uYp8jT4+0GTy2PhgapyTmXglPUd8=; b=DI2ui1S1saPlIUFZ22Bg9UliqM062waYZrZeCgZZTjrQhCxgm+tVx7NyafsTTOkohh3/eP 3rzJqrw64Qqda4m1WpBWIUcJ80p/IbgbWFdZsPooEbMmrl+Uy85+eIVVZrbzHXKVSRP6do FkooghbXC59dXdHw+eedL+Z2dfpV7evMWAO60BY+wK1WZMRKfdI7gVZNh9sdTgeyXyNGkA dyd6tU7me0U08y15lTBBopeTOsS0oKVXzSayDf8Mbwe5B/ONvwRB2XfnOJR6zmnY7B3Xpy W5IMoJVaRHKt5oa9kJhVmIZ6vbAlCrGuF0IWAqcX+lBNf/hbQRWXc7UaaKFQGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683788415; 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=Jxp5vPlc7uOlly4uYp8jT4+0GTy2PhgapyTmXglPUd8=; b=pNKkq2pGO9KLxi58Do5YcTpOavD1j8YZ9bUdoHryoyVYt1cXECAxtrV57kRhqjt/vMR7ah jsSkoyJyD2j6G9rnW/V13/Ah44TQD+4aHWdhl0pkVjACpio+Te5PD5oOa3Y0OJRmTnyt5l 5/YB33+ENBkgwe1Zf6nJh92Spitfn6UYdE6zHd29tPvPQxCXqGhB411uRlnRgqkAUx0f1B /4a9uy1io4tG6WTyEwRuwK9eTiSkXCwC9XuowsHs/E72kIlvQOGjZEyXL5i1Cos6srQsVS SVe6Sk+2tqjFlYS5u9oOtkjwxo8xCSrOFPRRRLPU1ituV6UKSS2Wg6m71h9Mlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683788415; a=rsa-sha256; cv=none; b=Ag125Z8Ow1CkFTQxqFe/aE19H5NIHjnibkQWDsfoHlggcSEFasaCKYhXK7ztgBN/y9UXjk Wwz9NG0lg0oZjRxT3rT5Vlr4Iy8fbOKojdZhUCHMFdqSnxPuaD/o2VsQF4WfWlxuz5eSec FGkqasGoaBrvOEtJ+XVKTw8DZmrocaclS9WFwWh5lcU1ApDedwL5CTxReBTC0Ksxn4ansM LgnboY5FkaUhdN8AiFE57Q3k/93J9GC5aAAACm5T2LHpbiamRP/3kABRdjzAa0laIbHj6z yXI9L6c239EXrztTTM/FEM/pxZ5oyO+XHT5EofO0DcqAifX65sQfPuMqHaCi6w== 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 4QH2pR0rQPzjbD; Thu, 11 May 2023 07:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34B70FQl024780; Thu, 11 May 2023 07:00:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34B70FSc024777; Thu, 11 May 2023 07:00:15 GMT (envelope-from git) Date: Thu, 11 May 2023 07:00:15 GMT Message-Id: <202305110700.34B70FSc024777@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: 43b9c52026ff - main - devel/apr1: unbreak the port's build against enforced ccache 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: 43b9c52026ff6e3d0921efee780f67e2d0865127 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=43b9c52026ff6e3d0921efee780f67e2d0865127 commit 43b9c52026ff6e3d0921efee780f67e2d0865127 Author: Alexey Dokuchaev AuthorDate: 2023-05-11 06:59:10 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-05-11 06:59:10 +0000 devel/apr1: unbreak the port's build against enforced ccache Without setting CC_FOR_BUILD the configure script will try to search for suitable compiler, and if `devel/ccache` is packaged with compiler symlinks, its `gcc' would be detected first thus breaking the port's build. This only applies to APR_CONF_ENV, not APU_CONF_ENV. --- devel/apr1/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index b6841930df3c..233168dbcb4e 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -112,7 +112,8 @@ SQLITE_VARS_OFF= APU_CONF_ARGS+=--without-sqlite3 ${db}_VARS_OFF= APU_CONF_ARGS+=--without-${db:tl} .endfor -APR_CONF_ENV+= ${CONFIGURE_ENV:O:u} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" +APR_CONF_ENV+= ${CONFIGURE_ENV:O:u} CC="${CC}" CC_FOR_BUILD="${CC}" \ + CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" # include apu specific CPPFLAGS 1st! APU_CONF_ENV+= ${CONFIGURE_ENV:O:u} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${APU_CPPFLAGS} ${CPPFLAGS}"