From b75a3ec0cbab411d96ada03443d6f7f52b9b576f Mon Sep 17 00:00:00 2001 From: Jean Baptiste Favre Date: Fri, 25 Nov 2016 17:49:34 +0100 Subject: [PATCH] Use system luajit or liblua Gbp-Pq: Name 0004-force-use-luajit-system-cmd.patch --- cmd/Makefile.in | 6 +++--- cmd/traffic_cop/Makefile.in | 6 +++--- cmd/traffic_crashlog/Makefile.in | 6 +++--- cmd/traffic_ctl/Makefile.in | 6 +++--- cmd/traffic_layout/Makefile.in | 6 +++--- cmd/traffic_manager/Makefile.am | 13 ++++++------- cmd/traffic_manager/Makefile.in | 25 ++++++++++--------------- cmd/traffic_top/Makefile.in | 6 +++--- cmd/traffic_via/Makefile.in | 6 +++--- cmd/traffic_wccp/Makefile.in | 6 +++--- 10 files changed, 40 insertions(+), 46 deletions(-) diff --git a/cmd/Makefile.in b/cmd/Makefile.in index ce40da5f..603d4114 100644 --- 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 466a7f88..6a795db7 100644 --- 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 13eefb8c..f5f29e6a 100644 --- 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 d30777dd..54b62441 100644 --- 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 ca5df98a..a97eeec5 100644 --- 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 117a0e46..0bbe5616 100644 --- 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 37e09032..c82a0e28 100644 --- 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 16810a13..aef14e04 100644 --- 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 f4b849ea..f349ac05 100644 --- 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 1852adfc..4f7d2c92 100644 --- 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@ -- 2.30.2