Use system luajit or liblua

Gbp-Pq: Name 0004-force-use-luajit-system-iocore.patch

diff --git a/iocore/Makefile.in b/iocore/Makefile.in
index 7d01177574886ef272dfc7e2469d2b8b4f523b77..c90f516f98c536babe8052a90bd5778467dd536c 100644 (file)
--- a/iocore/Makefile.in
+++ b/iocore/Makefile.in
@@ -318,9 +318,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/iocore/aio/Makefile.in b/iocore/aio/Makefile.in
index f9abd2b6eff7b698d10c9968cf730a1d5231db32..3dd18683a29cf11e77034b6944369c04100f859f 100644 (file)
--- a/iocore/aio/Makefile.in
+++ b/iocore/aio/Makefile.in
@@ -551,9 +551,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/iocore/cache/Makefile.in b/iocore/cache/Makefile.in
index b3ebccfe81d284abb2db3b08afe1e2271aaec71e..e754fea63ffab12ae8531a940fe26ecdac88476e 100644 (file)
--- a/iocore/cache/Makefile.in
+++ b/iocore/cache/Makefile.in
@@ -355,9 +355,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/iocore/cluster/Makefile.in b/iocore/cluster/Makefile.in
index 3e16b8b1e443af86f9084028e4f17ab38b9c7284..e5a2a2ce0336032d9a84515d6085ffd9a34cefa4 100644 (file)
--- a/iocore/cluster/Makefile.in
+++ b/iocore/cluster/Makefile.in
@@ -342,9 +342,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/iocore/dns/Makefile.in b/iocore/dns/Makefile.in
index 4e076573212241f079eebe001624c2c4af2a1836..86337541a459b8a39ddae82d564cc9f80806c5d1 100644 (file)
--- a/iocore/dns/Makefile.in
+++ b/iocore/dns/Makefile.in
@@ -337,9 +337,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/iocore/eventsystem/Makefile.in b/iocore/eventsystem/Makefile.in
index 42fea58d4579054ff242d00aad50f8d3bb6a4528..4736d87629d1d2d3161a75ff33faa62790139945 100644 (file)
--- a/iocore/eventsystem/Makefile.in
+++ b/iocore/eventsystem/Makefile.in
@@ -565,9 +565,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/iocore/hostdb/Makefile.in b/iocore/hostdb/Makefile.in
index a7c8ddb63f322684c7961eb69a33c395fe4b495e..9413fddd047c01d23ea5cb6e39bb7977dc7474e6 100644 (file)
--- a/iocore/hostdb/Makefile.in
+++ b/iocore/hostdb/Makefile.in
@@ -557,9 +557,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/iocore/net/Makefile.in b/iocore/net/Makefile.in
index b2498c816c6e2e18cf76edd3ad1a2d81127f880b..75e5056760f87ab7b194f0feb65d2dc4e59afacb 100644 (file)
--- a/iocore/net/Makefile.in
+++ b/iocore/net/Makefile.in
@@ -602,9 +602,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/iocore/utils/Makefile.in b/iocore/utils/Makefile.in
index ac698b9d61afd2281c3400938b6841b861450cca..e467a5d1329c177f91b27999a1b545c01711f3ee 100644 (file)
--- a/iocore/utils/Makefile.in
+++ b/iocore/utils/Makefile.in
@@ -335,9 +335,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@