patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Shreyansh Jain <shreyansh.jain@nxp.com>,
	Alejandro Lucero <alejandro.lucero@netronome.com>,
	Anatoly Burakov <anatoly.burakov@intel.com>,
	stable@dpdk.org, Maxime Coquelin <maxime.coquelin@redhat.com>,
	Zhihong Wang <zhihong.wang@intel.com>,
	Luca Boccassi <bluca@debian.org>,
	Zhang XuemingX <xuemingx.zhang@intel.com>,
	Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-stable] [PATCH v2 3/5] build: remove unnecessary large file support defines
Date: Tue, 28 May 2019 12:07:46 +0100	[thread overview]
Message-ID: <20190528110748.10772-4-bruce.richardson@intel.com> (raw)
In-Reply-To: <20190528110748.10772-1-bruce.richardson@intel.com>

Since we now always use _FILE_OFFSET_BITS=64 flag when building
DPDK, we can remove the Makefile and C-file #defines setting it
individually for parts of the build.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
---
 examples/vhost_crypto/meson.build       | 1 -
 examples/vhost_scsi/meson.build         | 1 -
 lib/librte_eal/linux/eal/eal_memalloc.c | 1 -
 lib/librte_eal/linux/eal/eal_memory.c   | 1 -
 lib/librte_vhost/Makefile               | 2 +-
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/examples/vhost_crypto/meson.build b/examples/vhost_crypto/meson.build
index 8e9860f..2485f3b 100644
--- a/examples/vhost_crypto/meson.build
+++ b/examples/vhost_crypto/meson.build
@@ -9,7 +9,6 @@
 build = dpdk_conf.has('RTE_LIBRTE_VHOST')
 allow_experimental_apis = true
 deps += ['vhost', 'cryptodev']
-cflags += ['-D_FILE_OFFSET_BITS=64']
 sources = files(
 	'main.c'
 )
diff --git a/examples/vhost_scsi/meson.build b/examples/vhost_scsi/meson.build
index 2972e4d..77e5201 100644
--- a/examples/vhost_scsi/meson.build
+++ b/examples/vhost_scsi/meson.build
@@ -15,7 +15,6 @@ if not cc.has_header('linux/virtio_scsi.h')
 endif
 
 deps += 'vhost'
-cflags += ['-D_FILE_OFFSET_BITS=64']
 sources = files(
 	'scsi.c', 'vhost_scsi.c'
 )
diff --git a/lib/librte_eal/linux/eal/eal_memalloc.c b/lib/librte_eal/linux/eal/eal_memalloc.c
index 1e9ebb8..b1849a2 100644
--- a/lib/librte_eal/linux/eal/eal_memalloc.c
+++ b/lib/librte_eal/linux/eal/eal_memalloc.c
@@ -2,7 +2,6 @@
  * Copyright(c) 2017-2018 Intel Corporation
  */
 
-#define _FILE_OFFSET_BITS 64
 #include <errno.h>
 #include <stdarg.h>
 #include <stdbool.h>
diff --git a/lib/librte_eal/linux/eal/eal_memory.c b/lib/librte_eal/linux/eal/eal_memory.c
index 416dad8..40a0f68 100644
--- a/lib/librte_eal/linux/eal/eal_memory.c
+++ b/lib/librte_eal/linux/eal/eal_memory.c
@@ -3,7 +3,6 @@
  * Copyright(c) 2013 6WIND S.A.
  */
 
-#define _FILE_OFFSET_BITS 64
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile
index 5dd3189..8623e91 100644
--- a/lib/librte_vhost/Makefile
+++ b/lib/librte_vhost/Makefile
@@ -11,7 +11,7 @@ EXPORT_MAP := rte_vhost_version.map
 LIBABIVER := 4
 
 CFLAGS += -DALLOW_EXPERIMENTAL_API
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -D_FILE_OFFSET_BITS=64
+CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
 CFLAGS += -I vhost_user
 CFLAGS += -fno-strict-aliasing
 LDLIBS += -lpthread
-- 
2.7.4


  parent reply	other threads:[~2019-05-28 11:08 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-27 16:15 [dpdk-stable] [PATCH 0/3] fix 32-bit meson builds Bruce Richardson
2019-05-27 16:15 ` [dpdk-stable] [PATCH 1/3] net/nfp: disable nfp for " Bruce Richardson
2019-05-27 16:15 ` [dpdk-stable] [PATCH 2/3] build: enable large file support on 32-bit Bruce Richardson
2019-05-27 16:15 ` [dpdk-stable] [PATCH 3/3] build: remove unnecessary large file support defines Bruce Richardson
2019-05-28 11:07 ` [dpdk-stable] [PATCH v2 0/5] fix 32-bit meson builds Bruce Richardson
2019-05-28 11:07   ` [dpdk-stable] [PATCH v2 1/5] net/nfp: disable nfp for " Bruce Richardson
2019-05-28 11:07   ` [dpdk-stable] [PATCH v2 2/5] build: enable large file support on 32-bit Bruce Richardson
2019-05-30  6:45     ` Shreyansh Jain
2019-06-04 14:49     ` Ferruh Yigit
2019-05-28 11:07   ` Bruce Richardson [this message]
2019-05-28 11:07   ` [dpdk-stable] [PATCH v2 4/5] eal: mark unused function in 32-bit builds Bruce Richardson
2019-05-28 11:07   ` [dpdk-stable] [PATCH v2 5/5] build: add libatomic dependency for 32-bit clang compile Bruce Richardson
2019-06-03 22:00   ` [dpdk-stable] [dpdk-dev] [PATCH v2 0/5] fix 32-bit meson builds Thomas Monjalon
2019-10-02 15:11   ` Kevin Traynor
2019-10-03  8:28     ` Bruce Richardson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190528110748.10772-4-bruce.richardson@intel.com \
    --to=bruce.richardson@intel.com \
    --cc=alejandro.lucero@netronome.com \
    --cc=anatoly.burakov@intel.com \
    --cc=bluca@debian.org \
    --cc=dev@dpdk.org \
    --cc=maxime.coquelin@redhat.com \
    --cc=shreyansh.jain@nxp.com \
    --cc=stable@dpdk.org \
    --cc=xuemingx.zhang@intel.com \
    --cc=zhihong.wang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).