| Message ID | 20180513190737.26079-4-thomas.petazzoni@bootlin.com |
|---|---|
| State | Accepted |
| Commit | dc4e4aac03eab81228841749aeb19b9fcb9fedb5 |
| Headers | show |
| Series | Fix the Config.in prefix of a number of options | expand |
Thomas, All, On 2018-05-13 21:07 +0200, Thomas Petazzoni spake thusly: > The option name BR2_PACKAGE_LIBTFDI_CPP obviously had a typo: it > should have been named BR2_PACKAGE_LIBFTDI_CPP, and add the necessary > Config.in.legacy handling. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN. > --- > Config.in.legacy | 9 +++++++++ > package/libftdi/Config.in | 2 +- > package/libftdi/libftdi.mk | 2 +- > 3 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index 4283888c72..72563031ce 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -145,6 +145,15 @@ endif > ############################################################################### > comment "Legacy options removed in 2018.05" > > +config BR2_PACKAGE_LIBTFDI_CPP > + bool "libftdi C++ bindings option renamed" > + select BR2_LEGACY > + select BR2_PACKAGE_LIBFTDI_CPP > + help > + The option BR2_PACKAGE_LIBTFDI_CPP was renamed to > + BR2_PACKAGE_LIBFTDI_CPP in order to fix a typo in the option > + name. > + > config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE > bool "jquery-ui-themes option black-tie renamed" > select BR2_LEGACY > diff --git a/package/libftdi/Config.in b/package/libftdi/Config.in > index beb42d34c5..23dae1be1f 100644 > --- a/package/libftdi/Config.in > +++ b/package/libftdi/Config.in > @@ -10,7 +10,7 @@ config BR2_PACKAGE_LIBFTDI > > if BR2_PACKAGE_LIBFTDI > > -config BR2_PACKAGE_LIBTFDI_CPP > +config BR2_PACKAGE_LIBFTDI_CPP > bool "C++ bindings" > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_USE_WCHAR > diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk > index c1952ac68b..cdd77c2e68 100644 > --- a/package/libftdi/libftdi.mk > +++ b/package/libftdi/libftdi.mk > @@ -15,7 +15,7 @@ LIBFTDI_AUTORECONF = YES > LIBFTDI_CONF_OPTS = --without-examples > > # configure detect it automaticaly so we need to force it > -ifeq ($(BR2_PACKAGE_LIBTFDI_CPP),y) > +ifeq ($(BR2_PACKAGE_LIBFTDI_CPP),y) > LIBFTDI_DEPENDENCIES += boost > LIBFTDI_CONF_OPTS += --enable-libftdipp > else > -- > 2.14.3 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/Config.in.legacy b/Config.in.legacy index 4283888c72..72563031ce 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,15 @@ endif ############################################################################### comment "Legacy options removed in 2018.05" +config BR2_PACKAGE_LIBTFDI_CPP + bool "libftdi C++ bindings option renamed" + select BR2_LEGACY + select BR2_PACKAGE_LIBFTDI_CPP + help + The option BR2_PACKAGE_LIBTFDI_CPP was renamed to + BR2_PACKAGE_LIBFTDI_CPP in order to fix a typo in the option + name. + config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE bool "jquery-ui-themes option black-tie renamed" select BR2_LEGACY diff --git a/package/libftdi/Config.in b/package/libftdi/Config.in index beb42d34c5..23dae1be1f 100644 --- a/package/libftdi/Config.in +++ b/package/libftdi/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_LIBFTDI if BR2_PACKAGE_LIBFTDI -config BR2_PACKAGE_LIBTFDI_CPP +config BR2_PACKAGE_LIBFTDI_CPP bool "C++ bindings" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk index c1952ac68b..cdd77c2e68 100644 --- a/package/libftdi/libftdi.mk +++ b/package/libftdi/libftdi.mk @@ -15,7 +15,7 @@ LIBFTDI_AUTORECONF = YES LIBFTDI_CONF_OPTS = --without-examples # configure detect it automaticaly so we need to force it -ifeq ($(BR2_PACKAGE_LIBTFDI_CPP),y) +ifeq ($(BR2_PACKAGE_LIBFTDI_CPP),y) LIBFTDI_DEPENDENCIES += boost LIBFTDI_CONF_OPTS += --enable-libftdipp else
The option name BR2_PACKAGE_LIBTFDI_CPP obviously had a typo: it should have been named BR2_PACKAGE_LIBFTDI_CPP, and add the necessary Config.in.legacy handling. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> --- Config.in.legacy | 9 +++++++++ package/libftdi/Config.in | 2 +- package/libftdi/libftdi.mk | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-)