| Message ID | 29cf408194b46abbbb75c15a833197b226477246.1521571596.git.baruch@tkos.co.il |
|---|---|
| State | Accepted |
| Commit | d769377a41e172e1963351c168c97a1212561133 |
| Headers | show |
| Series | [1/2] libssh2: fix pkg-config info for mbedtls backend | expand |
Hi Baruch, Le 20/03/2018 à 19:46, Baruch Siach a écrit : > Make sure that qemu uses libssh2 when libssh2 is enabled, for build > consistency. > > Cc: Francois Perrad <francois.perrad@gadz.org> > Signed-off-by: Baruch Siach <baruch@tkos.co.il> Reviewed-by: Romain Naour <romain.naour@gmail.com> Best regards, Romain > --- > package/qemu/qemu.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk > index 345ef526681a..c3a7e7738ee6 100644 > --- a/package/qemu/qemu.mk > +++ b/package/qemu/qemu.mk > @@ -212,6 +212,13 @@ else > QEMU_OPTS += --disable-tools > endif > > +ifeq ($(BR2_PACKAGE_LIBSSH2),y) > +QEMU_OPTS += --enable-libssh2 > +QEMU_DEPENDENCIES += libssh2 > +else > +QEMU_OPTS += --disable-libssh2 > +endif > + > # Override CPP, as it expects to be able to call it like it'd > # call the compiler. > define QEMU_CONFIGURE_CMDS >
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes: > Make sure that qemu uses libssh2 when libssh2 is enabled, for build > consistency. > Cc: Francois Perrad <francois.perrad@gadz.org> > Signed-off-by: Baruch Siach <baruch@tkos.co.il> Committed, thanks.
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes: > Make sure that qemu uses libssh2 when libssh2 is enabled, for build > consistency. > Cc: Francois Perrad <francois.perrad@gadz.org> > Signed-off-by: Baruch Siach <baruch@tkos.co.il> Committed to 2018.02.x, thanks.
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 345ef526681a..c3a7e7738ee6 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -212,6 +212,13 @@ else QEMU_OPTS += --disable-tools endif +ifeq ($(BR2_PACKAGE_LIBSSH2),y) +QEMU_OPTS += --enable-libssh2 +QEMU_DEPENDENCIES += libssh2 +else +QEMU_OPTS += --disable-libssh2 +endif + # Override CPP, as it expects to be able to call it like it'd # call the compiler. define QEMU_CONFIGURE_CMDS
Make sure that qemu uses libssh2 when libssh2 is enabled, for build consistency. Cc: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- package/qemu/qemu.mk | 7 +++++++ 1 file changed, 7 insertions(+)