| Message ID | 20191028112411.18817-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/libsigrok: fix libftdi support | expand |
On Mon, 28 Oct 2019 12:24:11 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> libsigrok optionally depends on libftdi1 not libftdi
Is this related to a recent change? When there's issue like this, it's
good to track down why/when it started occurring rather than just
fixing it "blindly", potentially papering over other issues.
Thomas
Dear Thomas, Le lun. 28 oct. 2019 à 14:00, Thomas Petazzoni <thomas.petazzoni@bootlin.com> a écrit : > > On Mon, 28 Oct 2019 12:24:11 +0100 > Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > > > libsigrok optionally depends on libftdi1 not libftdi > > Is this related to a recent change? When there's issue like this, it's > good to track down why/when it started occurring rather than just > fixing it "blindly", potentially papering over other issues. It's related to the commit 01b30e5d69f080853731736336298f6f0fdf24ce which fixes the configure options. Before this commit, this issue was not seen by the autobuilders. From my understanding libsigrok is using libftdi1 since a very long time. > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com Best Regards, Fabrice
On 28/10/2019 12:24, Fabrice Fontaine wrote: > libsigrok optionally depends on libftdi1 not libftdi > > Fixes: > - http://autobuild.buildroot.net/results/ec1f9f57944139b24738c1be529c4fc4b128a516 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Applied to master, thanks, with an extended commit log based on the explanation you gave by mail. Regards, Arnout > --- > package/libsigrok/libsigrok.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk > index c65d63eb2a..aa79191e94 100644 > --- a/package/libsigrok/libsigrok.mk > +++ b/package/libsigrok/libsigrok.mk > @@ -19,9 +19,9 @@ else > LIBSIGROK_CONF_OPTS += --without-libserialport > endif > > -ifeq ($(BR2_PACKAGE_LIBFTDI),y) > +ifeq ($(BR2_PACKAGE_LIBFTDI1),y) > LIBSIGROK_CONF_OPTS += --with-libftdi > -LIBSIGROK_DEPENDENCIES += libftdi > +LIBSIGROK_DEPENDENCIES += libftdi1 > else > LIBSIGROK_CONF_OPTS += --without-libftdi > endif >
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > libsigrok optionally depends on libftdi1 not libftdi > Fixes: > - http://autobuild.buildroot.net/results/ec1f9f57944139b24738c1be529c4fc4b128a516 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2019.02.x and 2019.08.x, thanks.
diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk index c65d63eb2a..aa79191e94 100644 --- a/package/libsigrok/libsigrok.mk +++ b/package/libsigrok/libsigrok.mk @@ -19,9 +19,9 @@ else LIBSIGROK_CONF_OPTS += --without-libserialport endif -ifeq ($(BR2_PACKAGE_LIBFTDI),y) +ifeq ($(BR2_PACKAGE_LIBFTDI1),y) LIBSIGROK_CONF_OPTS += --with-libftdi -LIBSIGROK_DEPENDENCIES += libftdi +LIBSIGROK_DEPENDENCIES += libftdi1 else LIBSIGROK_CONF_OPTS += --without-libftdi endif
libsigrok optionally depends on libftdi1 not libftdi Fixes: - http://autobuild.buildroot.net/results/ec1f9f57944139b24738c1be529c4fc4b128a516 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/libsigrok/libsigrok.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)