Date: Fri, 30 Aug 2024 14:08:39 +0200 From: Jan Beich <jbeich@FreeBSD.org> To: Gleb Popov <arrowd@freebsd.org> Cc: Nicola Vitale <nivit@freebsd.org>, 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 Message-ID: <zfou-5i2g-wny@FreeBSD.org> In-Reply-To: <CALH631=%2BWXQQ5Bg1GWiOXcfoNWkkc7OhzVy=E4VaNWFWEA41=w__26255.5701586948$1725002793$gmane$org@mail.gmail.com> (Gleb Popov's message of "Fri, 30 Aug 2024 10:25:53 %2B0300") References: <202408292017.47TKHMcD004669@gitrepo.freebsd.org> <CALH631=%2BWXQQ5Bg1GWiOXcfoNWkkc7OhzVy=E4VaNWFWEA41=w__26255.5701586948$1725002793$gmane$org@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
Gleb Popov <arrowd@freebsd.org> writes: > On Thu, Aug 29, 2024 at 11:17 PM Nicola Vitale <nivit@freebsd.org> wrote: > >> >> The branch main has been updated by nivit: >> >> URL: https://cgit.FreeBSD.org/ports/commit/?id=35db13a201c4e9314accbf051083265e45dee758 >> >> commit 35db13a201c4e9314accbf051083265e45dee758 >> Author: Nicola Vitale <nivit@FreeBSD.org> >> AuthorDate: 2024-08-29 20:07:37 +0000 >> Commit: Nicola Vitale <nivit@FreeBSD.org> >> 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 poudriere >> "because the pkg-config executable isn't there at the time the variable >> 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-module-sndio/Makefile index 6c2cb3d3a3bc..6da1e3229d48 100644 --- a/audio/pulseaudio-module-sndio/Makefile +++ b/audio/pulseaudio-module-sndio/Makefile @@ -22,7 +22,7 @@ PLIST_FILES= ${PULSE_MODDIR}/module-sndio.so PULSE_MODDIR= `${LOCALBASE}/bin/pkg-config --variable=modlibexecdir libpulse` PULSE_VERSION= `${LOCALBASE}/bin/pkg-config --modversion libpulse` -post-patch: +pre-configure: ${REINPLACE_CMD} \ -e "/^PA_MODULE_VERSION/s/0.0/${PULSE_VERSION}/1" \ ${WRKSRC}/module-sndio.chome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?zfou-5i2g-wny>