summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Wiles <keith.wiles@intel.com>2019-02-15 08:01:01 -0600
committerKeith Wiles <keith.wiles@intel.com>2019-02-15 08:01:01 -0600
commit4199555481cd08fe08e32986c94e59836ca1cd4f (patch)
tree7a430c97bfd844a85f14f5c8440cdf23c1abe0b1
parent5e29e43416adb33839bf84ed1e52962fcec330d9 (diff)
parent3942af7912f244c3e5f9e70b761851c9662019eb (diff)
downloadpktgen-dpdk-4199555481cd08fe08e32986c94e59836ca1cd4f.zip
pktgen-dpdk-4199555481cd08fe08e32986c94e59836ca1cd4f.tar.gz
pktgen-dpdk-4199555481cd08fe08e32986c94e59836ca1cd4f.tar.xz
Merge branch 'bug-fix'
-rw-r--r--app/pktgen.h2
-rw-r--r--changelog.txt1
-rw-r--r--lib/lua/Makefile4
3 files changed, 4 insertions, 3 deletions
diff --git a/app/pktgen.h b/app/pktgen.h
index 2d51684..3b79848 100644
--- a/app/pktgen.h
+++ b/app/pktgen.h
@@ -92,7 +92,7 @@
extern "C" {
#endif
-#define PKTGEN_VERSION "3.6.4"
+#define PKTGEN_VERSION "3.6.5"
#define PKTGEN_APP_NAME "Pktgen"
#define PKTGEN_CREATED_BY "Keith Wiles"
diff --git a/changelog.txt b/changelog.txt
index 1b6209b..9ef6547 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -6,6 +6,7 @@ Pktgen-DPDK - Traffic Generator powered by DPDK
** (Pktgen) Sounds like 'Packet-Gen'**
**=== Modifications ===**
+ - 3.6.5 - Fix ldflags order for RHEL, CentOS and other systems to include lua in build
- 3.6.4 - Add a new page stats screen to dump out info
Updated the readme to give better info on .cfg files
Fixed the port <N> to include only valid ports
diff --git a/lib/lua/Makefile b/lib/lua/Makefile
index 4ba3f9e..6925d72 100644
--- a/lib/lua/Makefile
+++ b/lib/lua/Makefile
@@ -63,7 +63,7 @@ LUA_PKG_LIBS = $(shell pkg-config --silence-errors --libs lua)
endif
ifeq ($(LUA_PKG_LIBS),)
-$(info "Lua pkg-config was not found")
+$(info "Lua pkg-config file was not found")
$(info "Get lua-5.3 from lua.org and build it on your system")
$(info "Also install lua 5.3 into /usr/local/include and /usr/local/lib")
$(info "Make sure the library in /usr/local/lib is called liblua.a")
@@ -75,7 +75,7 @@ endif
endif
# Pktgen Lua support code locations
-CFLAGS += -I$(RTE_SRCDIR)/../lua/$(RTE_TARGET)/include $(LUA_PKG_CFLAGS)
+CFLAGS += -I$(RTE_SRCDIR)/../lua/$(RTE_TARGET)/include $(LUA_PKG_CFLAGS)
LDLIBS += $(LUA_PKG_LIBS)
endif