| Message ID | 20180104183659.4169-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/1] daq: libpcap is optional not mandatory | expand |
Hi Fabrice, On Thu, Jan 04, 2018 at 07:36:59PM +0100, Fabrice Fontaine wrote: > daq can be compiled without libpcap thanks to --enable-pcap-module and > --disable-pcap-module options. > libpcap is just a mandadory dependency of snort. > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > package/daq/Config.in | 1 - > package/daq/daq.mk | 10 +++++++++- > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/package/daq/Config.in b/package/daq/Config.in > index 7800061642..1d24c6d11a 100644 > --- a/package/daq/Config.in > +++ b/package/daq/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_DAQ > bool "daq" > depends on !BR2_STATIC_LIBS # dlfcn.h > - select BR2_PACKAGE_LIBPCAP > select BR2_PACKAGE_LIBDNET > help > DAQ is a Data Acquisition library for packet I/O from the > diff --git a/package/daq/daq.mk b/package/daq/daq.mk > index c4b4c881f1..a3bf3ac2d6 100644 > --- a/package/daq/daq.mk > +++ b/package/daq/daq.mk > @@ -10,16 +10,24 @@ DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz > DAQ_LICENSE = GPL-2.0 > DAQ_LICENSE_FILES = COPYING > DAQ_INSTALL_STAGING = YES > -DAQ_DEPENDENCIES = libpcap libdnet > +DAQ_DEPENDENCIES = libdnet > > # package does not build in parallel due to improper make rules > # related to the generation of the tokdefs.h header file > DAQ_MAKE = $(MAKE1) > > +ifeq ($(BR2_PACKAGE_LIBPCAP),y) > +DAQ_DEPENDENCIES += libpcap > + > # assume these flags are available to prevent configure from running > # test programs while cross compiling > DAQ_CONF_ENV = \ > ac_cv_lib_pcap_pcap_lib_version=yes \ > daq_cv_libpcap_version_1x=yes As this assignment is now under condition, I think += would be more appropriate. This would prevent surprises when someone adds another assignment above this one. > +DAQ_CONF_OPTS += --enable-pcap-module > +else > +DAQ_CONF_OPTS += --disable-pcap-module > +endif > + > $(eval $(autotools-package)) baruch
Dear Baruch, 2018-01-04 19:42 GMT+01:00 Baruch Siach <baruch@tkos.co.il>: > Hi Fabrice, > > On Thu, Jan 04, 2018 at 07:36:59PM +0100, Fabrice Fontaine wrote: > > daq can be compiled without libpcap thanks to --enable-pcap-module and > > --disable-pcap-module options. > > libpcap is just a mandadory dependency of snort. > > > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > > --- > > package/daq/Config.in | 1 - > > package/daq/daq.mk | 10 +++++++++- > > 2 files changed, 9 insertions(+), 2 deletions(-) > > > > diff --git a/package/daq/Config.in b/package/daq/Config.in > > index 7800061642..1d24c6d11a 100644 > > --- a/package/daq/Config.in > > +++ b/package/daq/Config.in > > @@ -1,7 +1,6 @@ > > config BR2_PACKAGE_DAQ > > bool "daq" > > depends on !BR2_STATIC_LIBS # dlfcn.h > > - select BR2_PACKAGE_LIBPCAP > > select BR2_PACKAGE_LIBDNET > > help > > DAQ is a Data Acquisition library for packet I/O from the > > diff --git a/package/daq/daq.mk b/package/daq/daq.mk > > index c4b4c881f1..a3bf3ac2d6 100644 > > --- a/package/daq/daq.mk > > +++ b/package/daq/daq.mk > > @@ -10,16 +10,24 @@ DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz > > DAQ_LICENSE = GPL-2.0 > > DAQ_LICENSE_FILES = COPYING > > DAQ_INSTALL_STAGING = YES > > -DAQ_DEPENDENCIES = libpcap libdnet > > +DAQ_DEPENDENCIES = libdnet > > > > # package does not build in parallel due to improper make rules > > # related to the generation of the tokdefs.h header file > > DAQ_MAKE = $(MAKE1) > > > > +ifeq ($(BR2_PACKAGE_LIBPCAP),y) > > +DAQ_DEPENDENCIES += libpcap > > + > > # assume these flags are available to prevent configure from running > > # test programs while cross compiling > > DAQ_CONF_ENV = \ > > ac_cv_lib_pcap_pcap_lib_version=yes \ > > daq_cv_libpcap_version_1x=yes > > As this assignment is now under condition, I think += would be more > appropriate. This would prevent surprises when someone adds another > assignment > above this one. > You're perfectly right, I hesitated to make this change as it wasn't absolutely needed but indeed it can cause issues later. I will send a v2. > > > +DAQ_CONF_OPTS += --enable-pcap-module > > +else > > +DAQ_CONF_OPTS += --disable-pcap-module > > +endif > > + > > $(eval $(autotools-package)) > > baruch > > -- > http://baruch.siach.name/blog/ ~. .~ Tk Open > Systems > =}------------------------------------------------ooO--U-- > Ooo------------{= > - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - > Best Regards and Happy new year, Fabrice <div dir="ltr"><div><div><div>Dear Baruch,<br></div></div></div><div class="gmail_extra"><br><div class="gmail_quote">2018-01-04 19:42 GMT+01:00 Baruch Siach <span dir="ltr"><<a href="mailto:baruch@tkos.co.il" target="_blank">baruch@tkos.co.il</a>></span>:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hi Fabrice,<br> <div><div class="gmail-h5"><br> On Thu, Jan 04, 2018 at 07:36:59PM +0100, Fabrice Fontaine wrote:<br> > daq can be compiled without libpcap thanks to --enable-pcap-module and<br> > --disable-pcap-module options.<br> > libpcap is just a mandadory dependency of snort.<br> ><br> > Signed-off-by: Fabrice Fontaine <<a href="mailto:fontaine.fabrice@gmail.com">fontaine.fabrice@gmail.com</a>><br> > ---<br> > package/daq/Config.in | 1 -<br> > package/daq/<a href="http://daq.mk" rel="noreferrer" target="_blank">daq.mk</a> | 10 +++++++++-<br> > 2 files changed, 9 insertions(+), 2 deletions(-)<br> ><br> > diff --git a/package/daq/Config.in b/package/daq/Config.in<br> > index 7800061642..1d24c6d11a 100644<br> > --- a/package/daq/Config.in<br> > +++ b/package/daq/Config.in<br> > @@ -1,7 +1,6 @@<br> > config BR2_PACKAGE_DAQ<br> > bool "daq"<br> > depends on !BR2_STATIC_LIBS # dlfcn.h<br> > - select BR2_PACKAGE_LIBPCAP<br> > select BR2_PACKAGE_LIBDNET<br> > help<br> > DAQ is a Data Acquisition library for packet I/O from the<br> > diff --git a/package/daq/<a href="http://daq.mk" rel="noreferrer" target="_blank">daq.mk</a> b/package/daq/<a href="http://daq.mk" rel="noreferrer" target="_blank">daq.mk</a><br> > index c4b4c881f1..a3bf3ac2d6 100644<br> > --- a/package/daq/<a href="http://daq.mk" rel="noreferrer" target="_blank">daq.mk</a><br> > +++ b/package/daq/<a href="http://daq.mk" rel="noreferrer" target="_blank">daq.mk</a><br> > @@ -10,16 +10,24 @@ DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz<br> > DAQ_LICENSE = GPL-2.0<br> > DAQ_LICENSE_FILES = COPYING<br> > DAQ_INSTALL_STAGING = YES<br> > -DAQ_DEPENDENCIES = libpcap libdnet<br> > +DAQ_DEPENDENCIES = libdnet<br> ><br> > # package does not build in parallel due to improper make rules<br> > # related to the generation of the tokdefs.h header file<br> > DAQ_MAKE = $(MAKE1)<br> ><br> > +ifeq ($(BR2_PACKAGE_LIBPCAP),y)<br> > +DAQ_DEPENDENCIES += libpcap<br> > +<br> > # assume these flags are available to prevent configure from running<br> > # test programs while cross compiling<br> > DAQ_CONF_ENV = \<br> > ac_cv_lib_pcap_pcap_lib_<wbr>version=yes \<br> > daq_cv_libpcap_version_1x=yes<br> <br> </div></div>As this assignment is now under condition, I think += would be more<br> appropriate. This would prevent surprises when someone adds another assignment<br> above this one.<br></blockquote><div>You're perfectly right, I hesitated to make this change as it wasn't absolutely needed but indeed it can cause issues later. I will send a v2. <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> <div class="gmail-HOEnZb"><div class="gmail-h5"><br> > +DAQ_CONF_OPTS += --enable-pcap-module<br> > +else<br> > +DAQ_CONF_OPTS += --disable-pcap-module<br> > +endif<br> > +<br> > $(eval $(autotools-package))<br> <br> </div></div><span class="gmail-HOEnZb"><font color="#888888">baruch<br> <br> --<br> <a href="http://baruch.siach.name/blog/" rel="noreferrer" target="_blank">http://baruch.siach.name/blog/</a> ~. .~ Tk Open Systems<br> =}----------------------------<wbr>--------------------ooO--U--<wbr>Ooo------------{=<br> - <a href="mailto:baruch@tkos.co.il">baruch@tkos.co.il</a> - tel: <a href="tel:%2B972.52.368.4656" value="+972523684656">+972.52.368.4656</a>, <a href="http://www.tkos.co.il" rel="noreferrer" target="_blank">http://www.tkos.co.il</a> -<br> </font></span></blockquote></div>Best Regards and Happy new year,<br><br>Fabrice</div></div>
diff --git a/package/daq/Config.in b/package/daq/Config.in index 7800061642..1d24c6d11a 100644 --- a/package/daq/Config.in +++ b/package/daq/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_DAQ bool "daq" depends on !BR2_STATIC_LIBS # dlfcn.h - select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBDNET help DAQ is a Data Acquisition library for packet I/O from the diff --git a/package/daq/daq.mk b/package/daq/daq.mk index c4b4c881f1..a3bf3ac2d6 100644 --- a/package/daq/daq.mk +++ b/package/daq/daq.mk @@ -10,16 +10,24 @@ DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz DAQ_LICENSE = GPL-2.0 DAQ_LICENSE_FILES = COPYING DAQ_INSTALL_STAGING = YES -DAQ_DEPENDENCIES = libpcap libdnet +DAQ_DEPENDENCIES = libdnet # package does not build in parallel due to improper make rules # related to the generation of the tokdefs.h header file DAQ_MAKE = $(MAKE1) +ifeq ($(BR2_PACKAGE_LIBPCAP),y) +DAQ_DEPENDENCIES += libpcap + # assume these flags are available to prevent configure from running # test programs while cross compiling DAQ_CONF_ENV = \ ac_cv_lib_pcap_pcap_lib_version=yes \ daq_cv_libpcap_version_1x=yes +DAQ_CONF_OPTS += --enable-pcap-module +else +DAQ_CONF_OPTS += --disable-pcap-module +endif + $(eval $(autotools-package))
daq can be compiled without libpcap thanks to --enable-pcap-module and --disable-pcap-module options. libpcap is just a mandadory dependency of snort. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/daq/Config.in | 1 - package/daq/daq.mk | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-)