From nobody Fri Aug 30 12:08:39 2024 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 4WwH4C6xR4z5MV6d; Fri, 30 Aug 2024 12:08:43 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WwH4C4HyPz4lw5; Fri, 30 Aug 2024 12:08:43 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725019723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1nOv28fyHTrIDbkU6RWa23rPwwVsc2QnHWbDk2XHVC4=; b=l0GAGt0sEx85XEb7KU0C2hrZmqnmxTG3Sz/l/Ucos32yO8G9gLwVmFAgSvxfA6t5KWbeMl Cu03DU/MK9/4tLgDAqzX8PWbLh5rZ6xriBdJPByfoyQ0+yJkP5r5kqxHPTIp/hnk4o936n 4+m88Gz2FQbSWrqRJNsxiS2D38q1ZV6u8nd38iqUjIlOOgkqubE9ZAzGP/gy5wcVrB7CUx BqP76rGFFBq14+C/pi0kP6I/1wgWO6gCven81ihtgBAX9LHfiwoRBhHSjHf73E4Calbgl5 rLTgdBG1ci2SUy+4Z+FqbA6omY4a3jg9BsRYH7Dt7ssbFWsMOcw5E7112dGVvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725019723; a=rsa-sha256; cv=none; b=nNJScKDluWDWO26Gr7QFn9rhgmztevPHrj+zwSzJX1pFnANOxqdEGVH7v7r1OkmSkItymi xPUbEyJZkVA6VJw1Hb/woT3oemEBnLKOdGuH2VaQyp6p83ZzZaw/XfH0kiJOGoVcl81J1u qn/7zQZQMscyYq0qQJvuQDsD0jKLin98dqGEDW/eUP40NsDATFC6IAurkYygHTE7XCNicR Pzdu8W/6ARt/iDK6+j5gJG8LFETDVKtXDSutWHYWRyqCLf+5GT6w6HKVBIaCAWNmOWmTcq YEAefntWhVWbliIqZZUZmooL4D/8Ibezui2RMa07VsBA4B3Rl7KXLahp8rJSHA== 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=1725019723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1nOv28fyHTrIDbkU6RWa23rPwwVsc2QnHWbDk2XHVC4=; b=eDsKhcTbHFbnqC9cwXJHBnz1uBfbRToah9Col245n1T5Ak6aTlJS4wGPcyikjYyh0Cj+Uw D5i9jACbuaOzWRi7WqdX41/U05KVD9Otdj4rojwhTFKqNPr5+G0EAldh2sE817ImVwkrny 0Y9HFhjVtWfZ2FHqGoMvZcIzpZb5Yx7yaiiDTCl5f1YUdGXP51pRbBlpHbyIc7ObaYbThU kY6Nl0q9yCz5a/FGIArLfeBi9K34a1Z8qxIoncpquNOwKr0KOT7njKcIbjNden8mcLmOAg ElXY7+NaVI1zE6G+tmL9TdaPfebl/X9bEayNc+1tWU4DmAuAM0fiTXCcObuyvg== Received: by freefall.freebsd.org (Postfix, from userid 1354) id 8219B15AE4; Fri, 30 Aug 2024 12:08:43 +0000 (UTC) From: Jan Beich To: Gleb Popov Cc: Nicola Vitale , ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 35db13a201c4 - main - audio/pulseaudio-module-sndio: Fix build with poudriere In-Reply-To: (Gleb Popov's message of "Fri, 30 Aug 2024 10:25:53 +0300") References: <202408292017.47TKHMcD004669@gitrepo.freebsd.org> Date: Fri, 30 Aug 2024 14:08:39 +0200 Message-ID: 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Gleb Popov writes: > On Thu, Aug 29, 2024 at 11:17=E2=80=AFPM Nicola Vitale wrote: > >> >> The branch main has been updated by nivit: >> >> URL: https://cgit.FreeBSD.org/ports/commit/?id=3D35db13a201c4e9314accbf0= 51083265e45dee758 >> >> commit 35db13a201c4e9314accbf051083265e45dee758 >> Author: Nicola Vitale >> AuthorDate: 2024-08-29 20:07:37 +0000 >> Commit: Nicola Vitale >> CommitDate: 2024-08-29 20:07:37 +0000 >> >> audio/pulseaudio-module-sndio: Fix build with poudriere >> >> As pointed out by arrowd@, the previous patch doesn't work in poudri= ere >> "because the pkg-config executable isn't there at the time the varia= ble >> value is evaluated". So put the variables in the standard position in >> the Makefile and fix the regular expression of sed(1). > > It still doesn't work, unfortunately - the order in which variables > are defined doesn't matter here. > The root of the problem is that pkg-config is called during the fetch > stage, but it gets checked for as a dependency and installed during > the later build stage. > It works if you already have pkg-config installed, but in the > Poudriere case we always start from an empty system. Why not evaluate slightly later, during build phase? diff --git a/audio/pulseaudio-module-sndio/Makefile b/audio/pulseaudio-modu= le-sndio/Makefile index 6c2cb3d3a3bc..6da1e3229d48 100644 --- a/audio/pulseaudio-module-sndio/Makefile +++ b/audio/pulseaudio-module-sndio/Makefile @@ -22,7 +22,7 @@ PLIST_FILES=3D ${PULSE_MODDIR}/module-sndio.so PULSE_MODDIR=3D `${LOCALBASE}/bin/pkg-config --variable=3Dmodlibexecdir li= bpulse` PULSE_VERSION=3D `${LOCALBASE}/bin/pkg-config --modversion libpulse` =20 -post-patch: +pre-configure: ${REINPLACE_CMD} \ -e "/^PA_MODULE_VERSION/s/0.0/${PULSE_VERSION}/1" \ ${WRKSRC}/module-sndio.c