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 d96948548a932f12a9272d2ba7cf11866a46aedc..589e756ce8a0effe6144239d32cf38042e8e976a 100644 (file)
--- a/iocore/Makefile.in
+++ b/iocore/Makefile.in
@@ -320,9 +320,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 27bf1f8fe1477546b4f609f288f54e21a0ce1e38..b719e1ae586798548a4e10a09c6858224de33e31 100644 (file)
--- a/iocore/aio/Makefile.in
+++ b/iocore/aio/Makefile.in
@@ -553,9 +553,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 d05c0b0809753f15bfb064633f0aaf7329c59daf..fed742dfb3da97e2786621f52eb36213dc9c48fc 100644 (file)
--- a/iocore/cache/Makefile.in
+++ b/iocore/cache/Makefile.in
@@ -357,9 +357,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 1cf5965a32c387a450dd7161cc730925787a9635..080dac87b86bcdd783cc23231a182e2085139bb3 100644 (file)
--- a/iocore/cluster/Makefile.in
+++ b/iocore/cluster/Makefile.in
@@ -344,9 +344,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 2e6384f2e55dffb26cd7b721e5d6d3289599d8f5..7f069e65ccc28cc9e1ee54da396666f90f92640a 100644 (file)
--- a/iocore/dns/Makefile.in
+++ b/iocore/dns/Makefile.in
@@ -339,9 +339,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 777601655d6dbc7391d866a4f1bc64778e4e2068..524189eca36d8ad6b58f634ef3af52fb7de8296a 100644 (file)
--- a/iocore/eventsystem/Makefile.in
+++ b/iocore/eventsystem/Makefile.in
@@ -567,9 +567,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 71c476e2658ab4328429e35bf124413008e0a544..1fe159d83466db69a101c86340a16f39d6f654e8 100644 (file)
--- a/iocore/hostdb/Makefile.in
+++ b/iocore/hostdb/Makefile.in
@@ -559,9 +559,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 8f68b2e24d23c4334db175a63bffc0198c5cdfab..b87a4241a84665ae4e5cb2ac7ef33239c26df9ad 100644 (file)
--- a/iocore/net/Makefile.in
+++ b/iocore/net/Makefile.in
@@ -604,9 +604,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 ba0a5aecd66f5e098f038a678dc91e09363ddefd..2c05b1d31cf4ba3a20efc8f1969b71b43f7f1ed2 100644 (file)
--- a/iocore/utils/Makefile.in
+++ b/iocore/utils/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@