From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 67E6DA0471 for ; Mon, 17 Jun 2019 14:36:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 632D01BF03; Mon, 17 Jun 2019 14:36:51 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 46E8E1BEFC for ; Mon, 17 Jun 2019 14:36:50 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jun 2019 05:36:49 -0700 X-ExtLoop1: 1 Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by FMSMGA003.fm.intel.com with ESMTP; 17 Jun 2019 05:36:49 -0700 Received: from fmsmsx157.amr.corp.intel.com (10.18.116.73) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 17 Jun 2019 05:36:48 -0700 Received: from hasmsx114.ger.corp.intel.com (10.184.198.65) by FMSMSX157.amr.corp.intel.com (10.18.116.73) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 17 Jun 2019 05:36:48 -0700 Received: from lcsmsx153.ger.corp.intel.com ([169.254.8.163]) by HASMSX114.ger.corp.intel.com ([169.254.14.118]) with mapi id 14.03.0439.000; Mon, 17 Jun 2019 15:36:46 +0300 From: "Smoczynski, MarcinX" To: "Ananyev, Konstantin" , "Richardson, Bruce" , "thomas@monjalon.net" CC: "dev@dpdk.org" , "adrien.mazarguil@6wind.com" Thread-Topic: [PATCH v2 1/1] build: enable BSD features visibility for FreeBSD Thread-Index: AQHVCl44fjw//NqwAkCYQbXobbtarqaMyDIAgBM1BUA= Date: Mon, 17 Jun 2019 12:36:45 +0000 Message-ID: <2F25558C1648FA498380EAC12A861262CE51E1@LCSMSX153.ger.corp.intel.com> References: <20190514140416.4192-1-marcinx.smoczynski@intel.com> <20190514140416.4192-2-marcinx.smoczynski@intel.com> <2601191342CEEE43887BDE71AB9772580161FE75AF@irsmsx105.ger.corp.intel.com> In-Reply-To: <2601191342CEEE43887BDE71AB9772580161FE75AF@irsmsx105.ger.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZWU5NGNkM2MtZWJkNC00OWMxLTgwNjAtMmE5ZDhmYTRmMzNhIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiNkdTQjkzVklna3JZOWVHbDJBNmRDQnBJS1A0SFQreU5BSkJcL2ZJdElka0poR2JDdzJWWUQwSk5KcnNONjI0VEcifQ== x-originating-ip: [10.184.70.10] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v2 1/1] build: enable BSD features visibility for FreeBSD X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Is my action required to merge patches? e.g. do I need to send rebased patc= hes (however there are no conflicts at the moment)? > -----Original Message----- > From: Ananyev, Konstantin > Sent: Wednesday, June 5, 2019 12:16 PM > To: Smoczynski, MarcinX ; Richardson, > Bruce ; thomas@monjalon.net > Cc: dev@dpdk.org; adrien.mazarguil@6wind.com > Subject: RE: [PATCH v2 1/1] build: enable BSD features visibility for Fre= eBSD >=20 >=20 > > > > When a component uses either XOPEN_SOURCE or POSIX_C_SOURCE > macro > > explicitly in its build recipe, it restricts visibility of a non POSIX > > features subset, such as IANA protocol numbers (IPPROTO_* macros). > > Non standard features are enabled by default for DPDK both for Linux > > thanks to _GNU_SOURCE and for FreeBSD thanks to __BSD_VISIBLE. > However > > using XOPEN_SOURCE or POSIX_(C_)SOURCE in a component causes > > __BSD_VISIBLE to be defined to 0 for FreeBSD, causing different > > feature sets visibility for Linux and FreeBSD. It restricts from using > > IPPROTO macros in public headers, such as rte_ip.h, despite the fact > > they are already widely used in sources. > > > > Add __BSD_VISIBLE macro specified unconditionally for FreeBSD targets > > which enforces feature sets visibility unification between Linux and > > FreeBSD. > > > > Add single -D_GNU_SOURCE to config/meson.build as a project argument > > instead of adding separate directive for each project subtree. > > > > This patch solves the problem of build breaks for [1] on FreeBSD [2] > > following the discussion [3]. > > > > [1] https://mails.dpdk.org/archives/dev/2019-May/131885.html > > [2] http://mails.dpdk.org/archives/test-report/2019-May/082263.html > > [3] https://mails.dpdk.org/archives/dev/2019-May/132110.html > > > > Signed-off-by: Marcin Smoczynski > > --- > > app/meson.build | 3 --- > > config/meson.build | 8 ++++++++ > > drivers/meson.build | 3 --- > > examples/meson.build | 3 --- > > lib/meson.build | 3 --- > > meson.build | 6 +++++- > > mk/target/generic/rte.vars.mk | 5 +++++ > > 7 files changed, 18 insertions(+), 13 deletions(-) > > > > diff --git a/app/meson.build b/app/meson.build index > > 2b9fdef74..b0e6afbbe 100644 > > --- a/app/meson.build > > +++ b/app/meson.build > > @@ -22,9 +22,6 @@ lib_execinfo =3D cc.find_library('execinfo', required= : > > false) > > > > default_cflags =3D machine_args > > > > -# specify -D_GNU_SOURCE unconditionally -default_cflags +=3D > > '-D_GNU_SOURCE' > > - > > foreach app:apps > > build =3D true > > name =3D app > > diff --git a/config/meson.build b/config/meson.build index > > 0d25646f5..b77c87811 100644 > > --- a/config/meson.build > > +++ b/config/meson.build > > @@ -187,3 +187,11 @@ install_headers('rte_config.h', subdir: > > get_option('include_subdir_arch')) > > > > # enable VFIO only if it is linux OS > > dpdk_conf.set('RTE_EAL_VFIO', is_linux) > > + > > +# specify -D_GNU_SOURCE unconditionally > > +add_project_arguments('-D_GNU_SOURCE', language: 'c') > > + > > +# specify -D__BSD_VISIBLE for FreeBSD if is_freebsd > > + add_project_arguments('-D__BSD_VISIBLE', language: 'c') endif > > diff --git a/drivers/meson.build b/drivers/meson.build index > > 4c444f495..dc47b45ec 100644 > > --- a/drivers/meson.build > > +++ b/drivers/meson.build > > @@ -21,9 +21,6 @@ if cc.has_argument('-Wno-format-truncation') > > default_cflags +=3D '-Wno-format-truncation' > > endif > > > > -# specify -D_GNU_SOURCE unconditionally -default_cflags +=3D > > '-D_GNU_SOURCE' > > - > > foreach class:dpdk_driver_classes > > drivers =3D [] > > std_deps =3D [] > > diff --git a/examples/meson.build b/examples/meson.build index > > 1a6134f12..6e18ca8ec 100644 > > --- a/examples/meson.build > > +++ b/examples/meson.build > > @@ -31,9 +31,6 @@ if cc.has_argument('-Wno-format-truncation') > > default_cflags +=3D '-Wno-format-truncation' > > endif > > > > -# specify -D_GNU_SOURCE unconditionally -default_cflags +=3D > > '-D_GNU_SOURCE' > > - > > foreach example: examples > > name =3D example > > build =3D true > > diff --git a/lib/meson.build b/lib/meson.build index > > e067ce5ea..dd7c94c03 100644 > > --- a/lib/meson.build > > +++ b/lib/meson.build > > @@ -41,9 +41,6 @@ endif > > > > enabled_libs =3D [] # used to print summary at the end > > > > -# -D_GNU_SOURCE unconditionally > > -default_cflags +=3D '-D_GNU_SOURCE' > > - > > foreach l:libraries > > build =3D true > > name =3D l > > diff --git a/meson.build b/meson.build index 46f9c5683..05c816a9e > > 100644 > > --- a/meson.build > > +++ b/meson.build > > @@ -64,6 +64,10 @@ configure_file(output: build_cfg, dpdk_drivers =3D > > ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive'] > > > > pkg =3D import('pkgconfig') > > +pkg_extra_cflags =3D ['-include', 'rte_config.h'] + machine_args if > > +is_freebsd > > + pkg_extra_cflags +=3D ['-D__BSD_VISIBLE'] endif > > pkg.generate(name: meson.project_name(), > > filebase: 'lib' + meson.project_name().to_lower(), > > version: meson.project_version(), > > @@ -76,7 +80,7 @@ pkg.generate(name: meson.project_name(), Note > that > > CFLAGS might contain an -march flag higher than typical baseline. > > This is required for a number of static inline functions in the public > headers.''', > > subdirs: [get_option('include_subdir_arch'), '.'], > > - extra_cflags: ['-include', 'rte_config.h'] + machine_args > > + extra_cflags: pkg_extra_cflags > > ) > > > > # final output, list all the libs and drivers to be built diff --git > > a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk index > > 25a578ad7..5f00a0bfa 100644 > > --- a/mk/target/generic/rte.vars.mk > > +++ b/mk/target/generic/rte.vars.mk > > @@ -111,6 +111,11 @@ endif > > # always define _GNU_SOURCE > > CFLAGS +=3D -D_GNU_SOURCE > > > > +# define __BSD_VISIBLE when building for FreeBSD ifeq > > +($(CONFIG_RTE_EXEC_ENV_FREEBSD),y) > > +CFLAGS +=3D -D__BSD_VISIBLE > > +endif > > + > > export CFLAGS > > export LDFLAGS > > > > -- >=20 > Acked-by: Konstantin Ananyev >=20 > > 2.17.1