* [Buildroot] [PATCH 1/2] Update for 2015.11.1 @ 2016-01-22 17:44 David Picard 2016-01-22 17:44 ` [Buildroot] [PATCH 2/2] Qwt package : added dependency to Qt5 besides Qt David Picard 2016-01-22 17:50 ` [Buildroot] [PATCH 1/2] Update for 2015.11.1 Yann E. MORIN 0 siblings, 2 replies; 10+ messages in thread From: David Picard @ 2016-01-22 17:44 UTC (permalink / raw) To: buildroot From: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: David Picard <davepiq@yahoo.fr> --- CHANGES | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGES b/CHANGES index 336b195..7b7797c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,13 @@ +2015.11.1, Released December 5th, 2015 + + Fix for issue with the host package RPATH check when a custom host + directory (BR2_HOST_DIR=/path/to/somewhere) is used. + + Important (and/or security related) bugfixes for busybox, + dropbear, libpng and openssl. + + Updated/fixed packages: busybox, dropbear, gawk, libpng, openssl + 2015.11, Released November 30th, 2015 Minor fixes. -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/2] Qwt package : added dependency to Qt5 besides Qt. 2016-01-22 17:44 [Buildroot] [PATCH 1/2] Update for 2015.11.1 David Picard @ 2016-01-22 17:44 ` David Picard 2016-01-22 18:19 ` Yann E. MORIN 2016-01-22 17:50 ` [Buildroot] [PATCH 1/2] Update for 2015.11.1 Yann E. MORIN 1 sibling, 1 reply; 10+ messages in thread From: David Picard @ 2016-01-22 17:44 UTC (permalink / raw) To: buildroot Replaced the original select by depends on, due to recursive dependencies involving qt5base. Qwt optional modules not tested. Signed-off-by: David Picard <davepiq@yahoo.fr> --- package/qwt/Config.in | 20 +++++++++++++------- package/qwt/qwt.mk | 16 +++++++++++++++- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/package/qwt/Config.in b/package/qwt/Config.in index 8c7bc56..40b382b 100644 --- a/package/qwt/Config.in +++ b/package/qwt/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_QWT bool "qwt" - depends on BR2_PACKAGE_QT - depends on BR2_PACKAGE_QT_GUI_MODULE + depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5BASE + depends on BR2_PACKAGE_QT_GUI_MODULE || BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5BASE help Qwt is a graphics extension to the Qt GUI application framework. It provides a 2D plotting widget and more. @@ -12,7 +13,8 @@ if BR2_PACKAGE_QWT config BR2_PACKAGE_QWT_SVG bool "SVG support" - select BR2_PACKAGE_QT_SVG + depends on BR2_PACKAGE_QT_SVG || BR2_PACKAGE_QT5SVG + config BR2_PACKAGE_QWT_MATHML bool "MathML support" @@ -21,10 +23,14 @@ config BR2_PACKAGE_QWT_OPENGL bool "OpenGL support" depends on BR2_PACKAGE_HAS_LIBGLES depends on BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_QT_OPENGL_ES + select BR2_PACKAGE_QT_OPENGL_ES if BR2_PACKAGE_QT + select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5BASE + +comment "SVG support depends on Qt or Qt5 SVG module" + depends on !BR2_PACKAGE_QT_SVG && !BR2_PACKAGE_QT5SVG endif -comment "qwt depends on QT gui module" - depends on BR2_PACKAGE_QT - depends on !BR2_PACKAGE_QT_GUI_MODULE +comment "qwt depends on Qt or Qt5 gui module" + depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5BASE + depends on !BR2_PACKAGE_QT_GUI_MODULE && !BR2_PACKAGE_QT5BASE_GUI diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index 8a46c25..cdb3008 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -8,7 +8,14 @@ QWT_VERSION = 6.1.2 QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2 QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION) QWT_INSTALL_STAGING = YES -QWT_DEPENDENCIES = qt +ifeq ($(BR2_PACKAGE_QT),y) +QWT_DEPENDENCIES += qt +endif +ifeq ($(BR2_PACKAGE_QT5BASE),y) +QWT_DEPENDENCIES += qt5base +QT5_MAKE = $(HOST_DIR)/usr/bin/qmake -spec $(HOST_DIR)/mkspecs/devices/linux-buildroot-g++ +endif + QWT_LICENSE = LGPLv2.1 with exceptions QWT_LICENSE_FILES = COPYING @@ -35,10 +42,17 @@ else QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtOpenGL.*$$/\# QWT_CONFIG += QwtOpenGL/' endif +ifeq ($(BR2_PACKAGE_QT),y) define QWT_CONFIGURE_CMDS $(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri (cd $(@D); $(TARGET_MAKE_ENV) $(QT_QMAKE)) endef +else +define QWT_CONFIGURE_CMDS + $(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) +endef +endif define QWT_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/2] Qwt package : added dependency to Qt5 besides Qt. 2016-01-22 17:44 ` [Buildroot] [PATCH 2/2] Qwt package : added dependency to Qt5 besides Qt David Picard @ 2016-01-22 18:19 ` Yann E. MORIN [not found] ` <56A34AFC.7070908@yahoo.fr> 2016-01-24 1:09 ` Arnout Vandecappelle 0 siblings, 2 replies; 10+ messages in thread From: Yann E. MORIN @ 2016-01-22 18:19 UTC (permalink / raw) To: buildroot David, All, On 2016-01-22 18:44 +0100, David Picard spake thusly: > Replaced the original select by depends on, due to recursive dependencies > involving qt5base. Qwt optional modules not tested. > > Signed-off-by: David Picard <davepiq@yahoo.fr> > --- > package/qwt/Config.in | 20 +++++++++++++------- > package/qwt/qwt.mk | 16 +++++++++++++++- > 2 files changed, 28 insertions(+), 8 deletions(-) > > diff --git a/package/qwt/Config.in b/package/qwt/Config.in > index 8c7bc56..40b382b 100644 > --- a/package/qwt/Config.in > +++ b/package/qwt/Config.in > @@ -1,7 +1,8 @@ > config BR2_PACKAGE_QWT > bool "qwt" > - depends on BR2_PACKAGE_QT > - depends on BR2_PACKAGE_QT_GUI_MODULE > + depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5BASE You may want to use the top-level Qt5 option; depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5 It will be more "symetric". (Note that BR2_PACKAGE_QT5BASE is forcibly enabled when BR2_PACKAGE_QT5 is enabled.) > + depends on BR2_PACKAGE_QT_GUI_MODULE || BR2_PACKAGE_QT5BASE_GUI I don't know why we had that as a depends, it probably should be a select (the GUI modules, whether qt4 or Qt5) have no dependency (except for rep. Qt and Qt5, of course), so we can select them: select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 > + select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5BASE OK. > help > Qwt is a graphics extension to the Qt GUI application > framework. It provides a 2D plotting widget and more. > @@ -12,7 +13,8 @@ if BR2_PACKAGE_QWT > > config BR2_PACKAGE_QWT_SVG > bool "SVG support" > - select BR2_PACKAGE_QT_SVG > + depends on BR2_PACKAGE_QT_SVG || BR2_PACKAGE_QT5SVG You could probably do something a bit better, usign a select like it was done previously: select BR2_PACKAGE_QT_SVG if BR2_PACKAGE_QT select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5 (QT_SVG needs QT_GUI_MODULE, but it's already accounted for in the main QWT symbol; QT5SVG had no dependency.) > config BR2_PACKAGE_QWT_MATHML > bool "MathML support" > @@ -21,10 +23,14 @@ config BR2_PACKAGE_QWT_OPENGL > bool "OpenGL support" > depends on BR2_PACKAGE_HAS_LIBGLES > depends on BR2_PACKAGE_HAS_LIBEGL > - select BR2_PACKAGE_QT_OPENGL_ES > + select BR2_PACKAGE_QT_OPENGL_ES if BR2_PACKAGE_QT > + select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5BASE BR2_PACKAGE_QT5BASE_OPENGL_LIB depends on BR2_PACKAGE_QT5BASE_OPENGL, so it should have been selected too. However, I'm a bit worried about the complexity here, and I'd rather that we depend on such support rather than select it. So I'd prefer to see: depends on BR2_PACKAGE_QT_OPENGL_ES || BR2_PACKAGE_QT5BASE_OPENGL_LIB > +comment "SVG support depends on Qt or Qt5 SVG module" > + depends on !BR2_PACKAGE_QT_SVG && !BR2_PACKAGE_QT5SVG This comment should be right below the SVG option. But if you use a select, there's no longer any need for a comment. > endif > > -comment "qwt depends on QT gui module" > - depends on BR2_PACKAGE_QT > - depends on !BR2_PACKAGE_QT_GUI_MODULE Please leave a separating line between the two comments. > +comment "qwt depends on Qt or Qt5 gui module" > + depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5BASE > + depends on !BR2_PACKAGE_QT_GUI_MODULE && !BR2_PACKAGE_QT5BASE_GUI Well, we normally do not add such comments, except: comment "qwt needs Qt or Qt5" depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 > diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk > index 8a46c25..cdb3008 100644 > --- a/package/qwt/qwt.mk > +++ b/package/qwt/qwt.mk > @@ -8,7 +8,14 @@ QWT_VERSION = 6.1.2 > QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2 > QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION) > QWT_INSTALL_STAGING = YES > -QWT_DEPENDENCIES = qt Please add an empty line here, the conditional block will more clearly stand-out and will be either to (re)view. > +ifeq ($(BR2_PACKAGE_QT),y) > +QWT_DEPENDENCIES += qt > +endif > +ifeq ($(BR2_PACKAGE_QT5BASE),y) > +QWT_DEPENDENCIES += qt5base > +QT5_MAKE = $(HOST_DIR)/usr/bin/qmake -spec $(HOST_DIR)/mkspecs/devices/linux-buildroot-g++ Do not override QT5_MAKE, it's already set in the main Qt5 .mk and can be re-used as-is. > +endif > + > > QWT_LICENSE = LGPLv2.1 with exceptions > QWT_LICENSE_FILES = COPYING > @@ -35,10 +42,17 @@ else > QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtOpenGL.*$$/\# QWT_CONFIG += QwtOpenGL/' > endif > > +ifeq ($(BR2_PACKAGE_QT),y) > define QWT_CONFIGURE_CMDS > $(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri > (cd $(@D); $(TARGET_MAKE_ENV) $(QT_QMAKE)) > endef > +else > +define QWT_CONFIGURE_CMDS > + $(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri > + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) I know the Qt4 case use () around the second command, but that's not necessary; pleas use: cd $(@D) && $(TARGET_MAKE_ENV) $(QT5_QMAKE) (and please fix the Qt4 case similarly, will you? ;-) ) Otherwise, the overall idea is OK. For a first patch, this is pretty good. :-) Regards, Yann E. MORIN. > +endef > +endif > > define QWT_BUILD_CMDS > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) > -- > 1.9.1 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 10+ messages in thread
[parent not found: <56A34AFC.7070908@yahoo.fr>]
* [Buildroot] [PATCH 2/2] Qwt package : added dependency to Qt5 besides Qt. [not found] ` <56A34AFC.7070908@yahoo.fr> @ 2016-01-23 13:32 ` Yann E. MORIN 0 siblings, 0 replies; 10+ messages in thread From: Yann E. MORIN @ 2016-01-23 13:32 UTC (permalink / raw) To: buildroot David, Please, keep the list in cc when you reply. On 2016-01-23 10:42 +0100, David Picard spake thusly: > OK, I'll try to fix this on Monday. I guess that replacing > BR2_PACKAGE_QT5BASE by BR2_PACKAGE_QT5 will fix the recursive dependency > issue and will allow the select. Great, thanks! :-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/2] Qwt package : added dependency to Qt5 besides Qt. 2016-01-22 18:19 ` Yann E. MORIN [not found] ` <56A34AFC.7070908@yahoo.fr> @ 2016-01-24 1:09 ` Arnout Vandecappelle 2016-01-24 16:20 ` Yann E. MORIN 2016-01-25 9:13 ` David Picard 1 sibling, 2 replies; 10+ messages in thread From: Arnout Vandecappelle @ 2016-01-24 1:09 UTC (permalink / raw) To: buildroot On 22-01-16 19:19, Yann E. MORIN wrote: > David, All, > > On 2016-01-22 18:44 +0100, David Picard spake thusly: [snip] >> @@ -21,10 +23,14 @@ config BR2_PACKAGE_QWT_OPENGL >> bool "OpenGL support" >> depends on BR2_PACKAGE_HAS_LIBGLES >> depends on BR2_PACKAGE_HAS_LIBEGL >> - select BR2_PACKAGE_QT_OPENGL_ES >> + select BR2_PACKAGE_QT_OPENGL_ES if BR2_PACKAGE_QT >> + select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5BASE > > BR2_PACKAGE_QT5BASE_OPENGL_LIB depends on BR2_PACKAGE_QT5BASE_OPENGL, so > it should have been selected too. > > However, I'm a bit worried about the complexity here, and I'd rather > that we depend on such support rather than select it. So I'd prefer to > see: > > depends on BR2_PACKAGE_QT_OPENGL_ES || BR2_PACKAGE_QT5BASE_OPENGL_LIB In that case, it can probably be removed completely and turned into an automatic dependency (i.e. just in the .mk file). I also wouldn't bother with legacy handling when this symbol is removed. The legacy .config file will already contain BR2_PACKAGE_QT_OPENGL_ES, so once the handling is automatic, you just have to run 'make oldconfig' and it will Just Work (TM). Regards, Arnout [snip] -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/2] Qwt package : added dependency to Qt5 besides Qt. 2016-01-24 1:09 ` Arnout Vandecappelle @ 2016-01-24 16:20 ` Yann E. MORIN 2016-01-25 9:13 ` David Picard 1 sibling, 0 replies; 10+ messages in thread From: Yann E. MORIN @ 2016-01-24 16:20 UTC (permalink / raw) To: buildroot David, Arnout, All, On 2016-01-24 02:09 +0100, Arnout Vandecappelle spake thusly: > On 22-01-16 19:19, Yann E. MORIN wrote: > > David, All, > > > > On 2016-01-22 18:44 +0100, David Picard spake thusly: > [snip] > >> @@ -21,10 +23,14 @@ config BR2_PACKAGE_QWT_OPENGL > >> bool "OpenGL support" > >> depends on BR2_PACKAGE_HAS_LIBGLES > >> depends on BR2_PACKAGE_HAS_LIBEGL > >> - select BR2_PACKAGE_QT_OPENGL_ES > >> + select BR2_PACKAGE_QT_OPENGL_ES if BR2_PACKAGE_QT > >> + select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5BASE > > > > BR2_PACKAGE_QT5BASE_OPENGL_LIB depends on BR2_PACKAGE_QT5BASE_OPENGL, so > > it should have been selected too. > > > > However, I'm a bit worried about the complexity here, and I'd rather > > that we depend on such support rather than select it. So I'd prefer to > > see: > > > > depends on BR2_PACKAGE_QT_OPENGL_ES || BR2_PACKAGE_QT5BASE_OPENGL_LIB > > In that case, it can probably be removed completely and turned into an > automatic dependency (i.e. just in the .mk file). > > I also wouldn't bother with legacy handling when this symbol is removed. The > legacy .config file will already contain BR2_PACKAGE_QT_OPENGL_ES, so once the > handling is automatic, you just have to run 'make oldconfig' and it will Just > Work (TM). Yes, an automatic dependency in the .mk would be perfectly enough, I guess. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/2] Qwt package : added dependency to Qt5 besides Qt. 2016-01-24 1:09 ` Arnout Vandecappelle 2016-01-24 16:20 ` Yann E. MORIN @ 2016-01-25 9:13 ` David Picard 2016-01-25 9:25 ` David Picard 2016-01-25 14:40 ` David Picard 1 sibling, 2 replies; 10+ messages in thread From: David Picard @ 2016-01-25 9:13 UTC (permalink / raw) To: buildroot Hi, I could implement Yann's suggestions. The Config.in is more symetric, and I dropped the comment about SVG (no more recursive deps). In the OpenGL section, I can understand : depends on BR2_PACKAGE_QT_OPENGL_ES || BR2_PACKAGE_QT5BASE_OPENGL_LIB But I am afraid that I won't be able to make the automatic dependency in the .mk file, as Arnout suggests, because I have no idea of how to do it. Would you have an example in mind that I could have a look at ? Or will it do it as is ? When I am done, should I submit the patch as a new patch ? Or do you have a different procedure for revised patches ? Thanks, David. Le 24/01/2016 02:09, Arnout Vandecappelle a ?crit : > On 22-01-16 19:19, Yann E. MORIN wrote: >> David, All, >> >> On 2016-01-22 18:44 +0100, David Picard spake thusly: > [snip] >>> @@ -21,10 +23,14 @@ config BR2_PACKAGE_QWT_OPENGL >>> bool "OpenGL support" >>> depends on BR2_PACKAGE_HAS_LIBGLES >>> depends on BR2_PACKAGE_HAS_LIBEGL >>> - select BR2_PACKAGE_QT_OPENGL_ES >>> + select BR2_PACKAGE_QT_OPENGL_ES if BR2_PACKAGE_QT >>> + select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5BASE >> >> BR2_PACKAGE_QT5BASE_OPENGL_LIB depends on BR2_PACKAGE_QT5BASE_OPENGL, so >> it should have been selected too. >> >> However, I'm a bit worried about the complexity here, and I'd rather >> that we depend on such support rather than select it. So I'd prefer to >> see: >> >> depends on BR2_PACKAGE_QT_OPENGL_ES || BR2_PACKAGE_QT5BASE_OPENGL_LIB > > In that case, it can probably be removed completely and turned into an > automatic dependency (i.e. just in the .mk file). > > I also wouldn't bother with legacy handling when this symbol is removed. The > legacy .config file will already contain BR2_PACKAGE_QT_OPENGL_ES, so once the > handling is automatic, you just have to run 'make oldconfig' and it will Just > Work (TM). > > > Regards, > Arnout > > [snip] > > ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/2] Qwt package : added dependency to Qt5 besides Qt. 2016-01-25 9:13 ` David Picard @ 2016-01-25 9:25 ` David Picard 2016-01-25 14:40 ` David Picard 1 sibling, 0 replies; 10+ messages in thread From: David Picard @ 2016-01-25 9:25 UTC (permalink / raw) To: buildroot Is that what you mean ? qwt.mk ------ ifeq ($(BR2_PACKAGE_QT),y) QWT_DEPENDENCIES += qt libgles libegl endif ifeq ($(BR2_PACKAGE_QT5BASE),y) QWT_DEPENDENCIES += qt5base libgles QT5_MAKE = $(HOST_DIR)/usr/bin/qmake -spec $(HOST_DIR)/mkspecs/devices/linux-buildroot-g++ endif Config.in --------- config BR2_PACKAGE_QWT_OPENGL bool "OpenGL support" depends on BR2_PACKAGE_HAS_LIBGLES depends on BR2_PACKAGE_HAS_LIBEGL Le 25/01/2016 10:13, David Picard a ?crit : > Hi, > > I could implement Yann's suggestions. The Config.in is more symetric, > and I dropped the comment about SVG (no more recursive deps). > > In the OpenGL section, I can understand : > depends on BR2_PACKAGE_QT_OPENGL_ES || BR2_PACKAGE_QT5BASE_OPENGL_LIB > > But I am afraid that I won't be able to make the automatic dependency in > the .mk file, as Arnout suggests, because I have no idea of how to do > it. Would you have an example in mind that I could have a look at ? Or > will it do it as is ? > > When I am done, should I submit the patch as a new patch ? Or do you > have a different procedure for revised patches ? > > Thanks, > David. > > > > Le 24/01/2016 02:09, Arnout Vandecappelle a ?crit : >> On 22-01-16 19:19, Yann E. MORIN wrote: >>> David, All, >>> >>> On 2016-01-22 18:44 +0100, David Picard spake thusly: >> [snip] >>>> @@ -21,10 +23,14 @@ config BR2_PACKAGE_QWT_OPENGL >>>> bool "OpenGL support" >>>> depends on BR2_PACKAGE_HAS_LIBGLES >>>> depends on BR2_PACKAGE_HAS_LIBEGL >>>> - select BR2_PACKAGE_QT_OPENGL_ES >>>> + select BR2_PACKAGE_QT_OPENGL_ES if BR2_PACKAGE_QT >>>> + select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5BASE >>> >>> BR2_PACKAGE_QT5BASE_OPENGL_LIB depends on BR2_PACKAGE_QT5BASE_OPENGL, so >>> it should have been selected too. >>> >>> However, I'm a bit worried about the complexity here, and I'd rather >>> that we depend on such support rather than select it. So I'd prefer to >>> see: >>> >>> depends on BR2_PACKAGE_QT_OPENGL_ES || >>> BR2_PACKAGE_QT5BASE_OPENGL_LIB >> >> In that case, it can probably be removed completely and turned into an >> automatic dependency (i.e. just in the .mk file). >> >> I also wouldn't bother with legacy handling when this symbol is >> removed. The >> legacy .config file will already contain BR2_PACKAGE_QT_OPENGL_ES, so >> once the >> handling is automatic, you just have to run 'make oldconfig' and it >> will Just >> Work (TM). >> >> >> Regards, >> Arnout >> >> [snip] >> >> ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/2] Qwt package : added dependency to Qt5 besides Qt. 2016-01-25 9:13 ` David Picard 2016-01-25 9:25 ` David Picard @ 2016-01-25 14:40 ` David Picard 1 sibling, 0 replies; 10+ messages in thread From: David Picard @ 2016-01-25 14:40 UTC (permalink / raw) To: buildroot Arnout, is that what you mean by "automatic dependency" ? qwt.mk ------ ifeq ($(BR2_PACKAGE_QT),y) QWT_DEPENDENCIES += qt libgles libegl endif ifeq ($(BR2_PACKAGE_QT5BASE),y) QWT_DEPENDENCIES += qt5base libgles QT5_MAKE = $(HOST_DIR)/usr/bin/qmake -spec $(HOST_DIR)/mkspecs/devices/linux-buildroot-g++ endif Config.in --------- config BR2_PACKAGE_QWT_OPENGL bool "OpenGL support" depends on BR2_PACKAGE_HAS_LIBGLES depends on BR2_PACKAGE_HAS_LIBEGL Le 25/01/2016 10:13, David Picard a ?crit : > Hi, > > I could implement Yann's suggestions. The Config.in is more symetric, > and I dropped the comment about SVG (no more recursive deps). > > In the OpenGL section, I can understand : > depends on BR2_PACKAGE_QT_OPENGL_ES || BR2_PACKAGE_QT5BASE_OPENGL_LIB > > But I am afraid that I won't be able to make the automatic dependency in > the .mk file, as Arnout suggests, because I have no idea of how to do > it. Would you have an example in mind that I could have a look at ? Or > will it do it as is ? > > When I am done, should I submit the patch as a new patch ? Or do you > have a different procedure for revised patches ? > > Thanks, > David. > > > > Le 24/01/2016 02:09, Arnout Vandecappelle a ?crit : >> On 22-01-16 19:19, Yann E. MORIN wrote: >>> David, All, >>> >>> On 2016-01-22 18:44 +0100, David Picard spake thusly: >> [snip] >>>> @@ -21,10 +23,14 @@ config BR2_PACKAGE_QWT_OPENGL >>>> bool "OpenGL support" >>>> depends on BR2_PACKAGE_HAS_LIBGLES >>>> depends on BR2_PACKAGE_HAS_LIBEGL >>>> - select BR2_PACKAGE_QT_OPENGL_ES >>>> + select BR2_PACKAGE_QT_OPENGL_ES if BR2_PACKAGE_QT >>>> + select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5BASE >>> >>> BR2_PACKAGE_QT5BASE_OPENGL_LIB depends on BR2_PACKAGE_QT5BASE_OPENGL, so >>> it should have been selected too. >>> >>> However, I'm a bit worried about the complexity here, and I'd rather >>> that we depend on such support rather than select it. So I'd prefer to >>> see: >>> >>> depends on BR2_PACKAGE_QT_OPENGL_ES || >>> BR2_PACKAGE_QT5BASE_OPENGL_LIB >> >> In that case, it can probably be removed completely and turned into an >> automatic dependency (i.e. just in the .mk file). >> >> I also wouldn't bother with legacy handling when this symbol is >> removed. The >> legacy .config file will already contain BR2_PACKAGE_QT_OPENGL_ES, so >> once the >> handling is automatic, you just have to run 'make oldconfig' and it >> will Just >> Work (TM). >> >> >> Regards, >> Arnout >> >> [snip] >> >> _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/2] Update for 2015.11.1 2016-01-22 17:44 [Buildroot] [PATCH 1/2] Update for 2015.11.1 David Picard 2016-01-22 17:44 ` [Buildroot] [PATCH 2/2] Qwt package : added dependency to Qt5 besides Qt David Picard @ 2016-01-22 17:50 ` Yann E. MORIN 1 sibling, 0 replies; 10+ messages in thread From: Yann E. MORIN @ 2016-01-22 17:50 UTC (permalink / raw) To: buildroot David, All, On 2016-01-22 18:44 +0100, David Picard spake thusly: > From: Peter Korsgaard <peter@korsgaard.com> > > Signed-off-by: Peter Korsgaard <peter@korsgaard.com> > Signed-off-by: David Picard <davepiq@yahoo.fr> > --- > CHANGES | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/CHANGES b/CHANGES > index 336b195..7b7797c 100644 > --- a/CHANGES > +++ b/CHANGES > @@ -1,3 +1,13 @@ > +2015.11.1, Released December 5th, 2015 > + > + Fix for issue with the host package RPATH check when a custom host > + directory (BR2_HOST_DIR=/path/to/somewhere) is used. > + > + Important (and/or security related) bugfixes for busybox, > + dropbear, libpng and openssl. > + > + Updated/fixed packages: busybox, dropbear, gawk, libpng, openssl I guess you did not really want to send that one, did you? ;-) Regards, Yann E. MORIN. > 2015.11, Released November 30th, 2015 > > Minor fixes. > -- > 1.9.1 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-01-25 14:40 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-22 17:44 [Buildroot] [PATCH 1/2] Update for 2015.11.1 David Picard
2016-01-22 17:44 ` [Buildroot] [PATCH 2/2] Qwt package : added dependency to Qt5 besides Qt David Picard
2016-01-22 18:19 ` Yann E. MORIN
[not found] ` <56A34AFC.7070908@yahoo.fr>
2016-01-23 13:32 ` Yann E. MORIN
2016-01-24 1:09 ` Arnout Vandecappelle
2016-01-24 16:20 ` Yann E. MORIN
2016-01-25 9:13 ` David Picard
2016-01-25 9:25 ` David Picard
2016-01-25 14:40 ` David Picard
2016-01-22 17:50 ` [Buildroot] [PATCH 1/2] Update for 2015.11.1 Yann E. MORIN
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox