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 ce40da5fb8d0807f98911cddcd780b7c05613fd2..603d4114594e4908f4eb04dd44342268a82339e8 100644 (file)
--- a/cmd/Makefile.in
+++ b/cmd/Makefile.in
@@ -508,9 +508,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 466a7f8829e0de437fe80d23ba07b62860f03426..6a795db7463e31a14c0274e45fd514d224261a6f 100644 (file)
--- a/cmd/traffic_cop/Makefile.in
+++ b/cmd/traffic_cop/Makefile.in
@@ -319,9 +319,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 13eefb8c5c2265ee01d0506621814f6ba4a46236..f5f29e6aad4eab95fd8ab95e81c15adf7a52b9c3 100644 (file)
--- a/cmd/traffic_crashlog/Makefile.in
+++ b/cmd/traffic_crashlog/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/cmd/traffic_ctl/Makefile.in b/cmd/traffic_ctl/Makefile.in
index d30777dd47150ef2fcae946fb409acfaa3ada7aa..54b624413cdf5b0466543bfb2994e1e95adb1544 100644 (file)
--- a/cmd/traffic_ctl/Makefile.in
+++ b/cmd/traffic_ctl/Makefile.in
@@ -322,9 +322,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 ca5df98a51e6badd6c14651e346b4bd63f82e5ce..a97eeec5e711596ee38fb20acec4ecf2c5db1bea 100644 (file)
--- a/cmd/traffic_layout/Makefile.in
+++ b/cmd/traffic_layout/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/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 37e09032a93e6d413530af591bb29362d48a3ccb..c82a0e284330ea85a242f7cbac135b7407c0c088 100644 (file)
--- a/cmd/traffic_manager/Makefile.in
+++ b/cmd/traffic_manager/Makefile.in
@@ -172,7 +172,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)
@@ -194,7 +193,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@)
@@ -490,17 +488,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@
@@ -581,9 +578,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@
@@ -859,18 +856,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 16810a135a0d99da6c3f4fad86b38423c1679de1..aef14e04d0b6844210fb540b44a0bdb79559c155 100644 (file)
--- a/cmd/traffic_top/Makefile.in
+++ b/cmd/traffic_top/Makefile.in
@@ -333,9 +333,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 f4b849ea31a30529ca2fa6ed77570f4ab6c18c67..f349ac059ca185849fa5cf20b8a52414057de887 100644 (file)
--- a/cmd/traffic_via/Makefile.in
+++ b/cmd/traffic_via/Makefile.in
@@ -520,9 +520,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 1852adfc404da8e7695a10b2f270400b2e09361c..4f7d2c92e815a246d9fd8d8cdb2d2732cf027b99 100644 (file)
--- a/cmd/traffic_wccp/Makefile.in
+++ b/cmd/traffic_wccp/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@