Use system luajit or liblua

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

diff --git a/cmd/Makefile.in b/cmd/Makefile.in
index 25b854433f8ba8bd0b309b46078a94e962879942..ffa00b650c6013e37cb441cdb9c6369ff621f7d7 100644 (file)
--- a/cmd/Makefile.in
+++ b/cmd/Makefile.in
@@ -506,9 +506,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/cmd/traffic_cop/Makefile.in b/cmd/traffic_cop/Makefile.in
index 5c8d8e50ff6fa62e0fdac8a8956e681d1aea4bc7..08598ce58c56102f07ea448ca8857ddcd8826074 100644 (file)
--- a/cmd/traffic_cop/Makefile.in
+++ b/cmd/traffic_cop/Makefile.in
@@ -317,9 +317,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/cmd/traffic_crashlog/Makefile.in b/cmd/traffic_crashlog/Makefile.in
index ced1b46584ba52bcfc26a85652b88694e8828675..c62e51de31cfecb9301976a0233d26e1810ea749 100644 (file)
--- a/cmd/traffic_crashlog/Makefile.in
+++ b/cmd/traffic_crashlog/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/cmd/traffic_ctl/Makefile.in b/cmd/traffic_ctl/Makefile.in
index 0fb581224298042c3098357aa6b837402af4c28c..b2bece31e3fe4e6d42db2936133a7ac7da4b0655 100644 (file)
--- a/cmd/traffic_ctl/Makefile.in
+++ b/cmd/traffic_ctl/Makefile.in
@@ -316,9 +316,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/cmd/traffic_layout/Makefile.in b/cmd/traffic_layout/Makefile.in
index 3487fba578fd068d198ea5918d7931a2eb60c380..ef95e454dbe27b7f9128601294bfa428bdbf98a4 100644 (file)
--- a/cmd/traffic_layout/Makefile.in
+++ b/cmd/traffic_layout/Makefile.in
@@ -316,9 +316,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/cmd/traffic_manager/Makefile.am b/cmd/traffic_manager/Makefile.am
index 117a0e464c6eaa0acaff5b6a9b3901d72f24b33b..0bbe5616f661747b95dec4095bd6199beaab7abf 100644 (file)
--- a/cmd/traffic_manager/Makefile.am
+++ b/cmd/traffic_manager/Makefile.am
@@ -21,7 +21,7 @@ check_PROGRAMS = test_metrics
 TESTS = $(check_PROGRAMS)
 
 AM_CPPFLAGS += \
-  $(LUAJIT_CPPFLAGS) \
+  $(LUA_CPPFLAGS) \
   $(iocore_include_dirs) \
   -I$(abs_top_srcdir)/lib/records \
   -I$(abs_top_srcdir)/proxy/hdrs \
@@ -32,7 +32,7 @@ AM_CPPFLAGS += \
   -I$(abs_top_srcdir)/mgmt/cluster \
   -I$(abs_top_srcdir)/mgmt/utils \
   -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/luajit/src
+  $(LUA_CPPFLAGS)
 
 AM_LDFLAGS += \
   @OPENSSL_LDFLAGS@
@@ -56,17 +56,16 @@ traffic_manager_LDADD = \
   $(top_builddir)/proxy/shared/libdiagsconfig.a
 
 AM_LDFLAGS += \
-  $(LUAJIT_LDFLAGS)
+  $(LUA_LDFLAGS)
 
 traffic_manager_SOURCES += \
   metrics.cc
 
 traffic_manager_LDADD += \
-  $(top_builddir)/lib/bindings/libbindings.la \
-  $(top_builddir)/lib/luajit/src/libluajit.a
+  $(top_builddir)/lib/bindings/libbindings.la
 
 traffic_manager_LDADD +=\
-  $(LIBUNWIND_LIBS) \
+  $(LIBUNWIND_LIBS) $(LUA_LIBS) \
   @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ @HWLOC_LIBS@ \
   -lm
 
@@ -75,9 +74,9 @@ test_metrics_LDADD = \
   $(top_builddir)/mgmt/libmgmt_lm.la \
   $(top_builddir)/lib/records/librecords_lm.a \
   $(top_builddir)/lib/bindings/libbindings.la \
-  $(top_builddir)/lib/luajit/src/libluajit.a \
   $(top_builddir)/lib/ts/libtsutil.la \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
+  $(LUA_LIBS) \
   @LIBTCL@ @LIBPCRE@
 
 # Must do it this way or the dependencies aren't detected.

diff --git a/cmd/traffic_manager/Makefile.in b/cmd/traffic_manager/Makefile.in
index ce46cda2bbbb37ed942e6d62e93f8271a0a9c35e..9b6c1aa066d85a47d70be31f51d3d4adfdcd57a5 100644 (file)
--- a/cmd/traffic_manager/Makefile.in
+++ b/cmd/traffic_manager/Makefile.in
@@ -171,7 +171,6 @@ test_metrics_OBJECTS = $(am_test_metrics_OBJECTS)
 test_metrics_DEPENDENCIES = $(top_builddir)/mgmt/libmgmt_lm.la \
        $(top_builddir)/lib/records/librecords_lm.a \
        $(top_builddir)/lib/bindings/libbindings.la \
-       $(top_builddir)/lib/luajit/src/libluajit.a \
        $(top_builddir)/lib/ts/libtsutil.la \
        $(top_builddir)/iocore/eventsystem/libinkevent.a \
        $(am__DEPENDENCIES_1)
@@ -193,7 +192,6 @@ traffic_manager_DEPENDENCIES =  \
        $(top_builddir)/lib/records/librecords_lm.a \
        $(top_builddir)/proxy/shared/libdiagsconfig.a \
        $(top_builddir)/lib/bindings/libbindings.la \
-       $(top_builddir)/lib/luajit/src/libluajit.a \
        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -489,17 +487,16 @@ pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ $(LUAJIT_CPPFLAGS) $(iocore_include_dirs) \
+AM_CPPFLAGS = @AM_CPPFLAGS@ $(LUA_CPPFLAGS) $(iocore_include_dirs) \
        -I$(abs_top_srcdir)/lib/records -I$(abs_top_srcdir)/proxy/hdrs \
        -I$(abs_top_srcdir)/proxy/shared -I$(abs_top_srcdir)/mgmt \
        -I$(abs_top_srcdir)/mgmt/api \
        -I$(abs_top_srcdir)/mgmt/api/include \
        -I$(abs_top_srcdir)/mgmt/cluster \
-       -I$(abs_top_srcdir)/mgmt/utils -I$(abs_top_srcdir)/lib \
-       -I$(abs_top_srcdir)/lib/luajit/src
+       -I$(abs_top_srcdir)/mgmt/utils -I$(abs_top_srcdir)/lib
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@ @OPENSSL_LDFLAGS@ $(LUAJIT_LDFLAGS)
+AM_LDFLAGS = @AM_LDFLAGS@ @OPENSSL_LDFLAGS@ $(LUA_LDFLAGS)
 AR = @AR@
 ASCPP = @ASCPP@
 AUTOCONF = @AUTOCONF@
@@ -579,9 +576,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@
@@ -856,18 +853,16 @@ traffic_manager_LDADD = $(top_builddir)/mgmt/api/libmgmtapilocal.la \
        $(top_builddir)/iocore/eventsystem/libinkevent.a \
        $(top_builddir)/lib/records/librecords_lm.a \
        $(top_builddir)/proxy/shared/libdiagsconfig.a \
-       $(top_builddir)/lib/bindings/libbindings.la \
-       $(top_builddir)/lib/luajit/src/libluajit.a $(LIBUNWIND_LIBS) \
-       @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ @HWLOC_LIBS@ -lm \
+       $(top_builddir)/lib/bindings/libbindings.la $(LIBUNWIND_LIBS) \
+       @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ @HWLOC_LIBS@ $(LUA_LIBS) -lm \
        $(am__append_1)
 test_metrics_SOURCES = test_metrics.cc metrics.cc WebOverview.cc
 test_metrics_LDADD = $(top_builddir)/mgmt/libmgmt_lm.la \
        $(top_builddir)/lib/records/librecords_lm.a \
        $(top_builddir)/lib/bindings/libbindings.la \
-       $(top_builddir)/lib/luajit/src/libluajit.a \
        $(top_builddir)/lib/ts/libtsutil.la \
-       $(top_builddir)/iocore/eventsystem/libinkevent.a @LIBTCL@ \
-       @LIBPCRE@ $(am__append_2)
+       $(top_builddir)/iocore/eventsystem/libinkevent.a $(LUA_CPPFLAGS) \
+       @LIBTCL@ @LIBPCRE@ $(am__append_2)
 Clang_Tidy_Options = -fix -fix-errors
 
 # Sort the filenames to remove duplicates, then filter to retain

diff --git a/cmd/traffic_top/Makefile.in b/cmd/traffic_top/Makefile.in
index 2a77d678af9e748d99aa1f531e2076e1b64915b2..69b573c0da2dfca9614241a228baf2d22347137d 100644 (file)
--- a/cmd/traffic_top/Makefile.in
+++ b/cmd/traffic_top/Makefile.in
@@ -326,9 +326,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/cmd/traffic_via/Makefile.in b/cmd/traffic_via/Makefile.in
index 7972231f14f958a2513787ba265bce94aa5e1c8d..e682337e8ade2caa09af2ad27edbcb1b4ce5018a 100644 (file)
--- a/cmd/traffic_via/Makefile.in
+++ b/cmd/traffic_via/Makefile.in
@@ -518,9 +518,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/cmd/traffic_wccp/Makefile.in b/cmd/traffic_wccp/Makefile.in
index 180a275664b41a56b1e7556c20d5b3f0cb509855..f53e559a040293b21aeccbc6f477d5d413c8d176 100644 (file)
--- a/cmd/traffic_wccp/Makefile.in
+++ b/cmd/traffic_wccp/Makefile.in
@@ -316,9 +316,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@