| Message ID | e167e72120f50500b3d572cc39894e2a80ad51dd.1483650983.git.yann.morin.1998@free.fr |
|---|---|
| State | Accepted |
| Headers | show |
Hi, On 05/01/2017 22:16, Yann E. MORIN wrote: > There are a bunch of options that are left unspecified; explicitly > disable them. > > The epoll case is special: the configure script is broken, and will > enable it whether we pass --enable-epoll or --disable-epoll. But that's > OK because we prefer epoll over the alternative (select). So we do not > need to fix it. Which is nice becasue the configure.ac is named > aconfigure.ac (yes, with a leading 'a'), so it does not autoreconf > nicely... :-/ > > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> > Cc: Luca Ceresoli <luca@lucaceresoli.net> > > --- > Changes v1 -> v2; > - fix and comment the epoll mess (Luca) > --- > package/libpjsip/libpjsip.mk | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > > diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk > index cb0d866..70dd4aa 100644 > --- a/package/libpjsip/libpjsip.mk > +++ b/package/libpjsip/libpjsip.mk > @@ -36,8 +36,29 @@ LIBPJSIP_CONF_OPTS = \ > --disable-ilbc-codec \ > --disable-webrtc \ > --disable-opus \ > + --disable-oss \ > + --disable-ext-sound \ > + --disable-small-filter \ > + --disable-large-filter \ > + --disable-g711-codec \ > + --disable-l16-codec \ > + --disable-g722-codec \ > + --disable-libsamplerate \ > + --disable-sdl \ > + --disable-ffmpeg \ > + --disable-v4l2 \ > + --disable-openh264 \ > + --disable-libyuv \ > + --disable-ipp \ > + --disable-ssl \ > + --disable-silk \ Some of these added lines actually disable something that was previously enabled, as I detailed in [0], and the other ones don't hurt anyway. > +# Note: aconfigure.ac is broken: --enable-epoll or --disable-epoll will > +# both enable it. But that's OK, epoll is better than the alternative, > +# so we want to use it. > +LIBPJSIP_CONF_OPTS += --enable-epoll And epoll is in Linux since way over a decade now, that's enough! Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net> [0] http://lists.busybox.net/pipermail/buildroot/2017-January/180926.html
Luca, All, On 2017-01-06 00:05 +0100, Luca Ceresoli spake thusly: > On 05/01/2017 22:16, Yann E. MORIN wrote: > > There are a bunch of options that are left unspecified; explicitly > > disable them. > > > > The epoll case is special: the configure script is broken, and will > > enable it whether we pass --enable-epoll or --disable-epoll. But that's > > OK because we prefer epoll over the alternative (select). So we do not > > need to fix it. Which is nice becasue the configure.ac is named > > aconfigure.ac (yes, with a leading 'a'), so it does not autoreconf > > nicely... :-/ > > > > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> > > Cc: Luca Ceresoli <luca@lucaceresoli.net> > > > > --- > > Changes v1 -> v2; > > - fix and comment the epoll mess (Luca) > > --- > > package/libpjsip/libpjsip.mk | 21 +++++++++++++++++++++ > > 1 file changed, 21 insertions(+) > > > > diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk > > index cb0d866..70dd4aa 100644 > > --- a/package/libpjsip/libpjsip.mk > > +++ b/package/libpjsip/libpjsip.mk > > @@ -36,8 +36,29 @@ LIBPJSIP_CONF_OPTS = \ > > --disable-ilbc-codec \ > > --disable-webrtc \ > > --disable-opus \ > > + --disable-oss \ > > + --disable-ext-sound \ > > + --disable-small-filter \ > > + --disable-large-filter \ > > + --disable-g711-codec \ > > + --disable-l16-codec \ > > + --disable-g722-codec \ > > + --disable-libsamplerate \ > > + --disable-sdl \ > > + --disable-ffmpeg \ > > + --disable-v4l2 \ > > + --disable-openh264 \ > > + --disable-libyuv \ > > + --disable-ipp \ > > + --disable-ssl \ > > + --disable-silk \ > > Some of these added lines actually disable something that was previously > enabled, as I detailed in [0], and the other ones don't hurt anyway. Well, it does disable stuff, but most if not all of it is due to build ordering and there is no explicit dependency, like samplerate, ssl etc... It is better to explicitly disable stuff rather than depend on build ordering. If people are interested in re-enabling those features, they'll have to send some patches to account for the dependencies. Something that I already did in the biggish asterisk series, for example: https://patchwork.ozlabs.org/patch/709763/ https://patchwork.ozlabs.org/patch/709756/ ;-) > > +# Note: aconfigure.ac is broken: --enable-epoll or --disable-epoll will > > +# both enable it. But that's OK, epoll is better than the alternative, > > +# so we want to use it. > > +LIBPJSIP_CONF_OPTS += --enable-epoll > > And epoll is in Linux since way over a decade now, that's enough! > > Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net> Thanks! :-) Regards, Yann E. MORIN. > [0] http://lists.busybox.net/pipermail/buildroot/2017-January/180926.html > > -- > Luca
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index cb0d866..70dd4aa 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -36,8 +36,29 @@ LIBPJSIP_CONF_OPTS = \ --disable-ilbc-codec \ --disable-webrtc \ --disable-opus \ + --disable-oss \ + --disable-ext-sound \ + --disable-small-filter \ + --disable-large-filter \ + --disable-g711-codec \ + --disable-l16-codec \ + --disable-g722-codec \ + --disable-libsamplerate \ + --disable-sdl \ + --disable-ffmpeg \ + --disable-v4l2 \ + --disable-openh264 \ + --disable-libyuv \ + --disable-ipp \ + --disable-ssl \ + --disable-silk \ --with-external-srtp=$(STAGING_DIR)/usr +# Note: aconfigure.ac is broken: --enable-epoll or --disable-epoll will +# both enable it. But that's OK, epoll is better than the alternative, +# so we want to use it. +LIBPJSIP_CONF_OPTS += --enable-epoll + ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBPJSIP_DEPENDENCIES += openssl LIBPJSIP_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
There are a bunch of options that are left unspecified; explicitly disable them. The epoll case is special: the configure script is broken, and will enable it whether we pass --enable-epoll or --disable-epoll. But that's OK because we prefer epoll over the alternative (select). So we do not need to fix it. Which is nice becasue the configure.ac is named aconfigure.ac (yes, with a leading 'a'), so it does not autoreconf nicely... :-/ Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Luca Ceresoli <luca@lucaceresoli.net> --- Changes v1 -> v2; - fix and comment the epoll mess (Luca) --- package/libpjsip/libpjsip.mk | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)