Use system luajit or liblua

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4c522791cd4516b06c6b2d5bf224c4f7f854b0e6..45055da87f370239863b4b019250d2180728d6d5 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -25,32 +25,3 @@ endif
 if BUILD_WCCP
 SUBDIRS += wccp
 endif
-
-# Support verbose LuaJIT builds with "make V=1".
-luajit__v_ = $(luajit__v_$(AM_DEFAULT_VERBOSITY))
-luajit__v_0 = @
-luajit__v_1 =
-
-# Some special hacks around building the luajit.
-#
-#  - Copy the luajit source tree if we're doing out-of-source builds
-#  - Upon clean, remove the luajit tree from the out-of-source build tree
-#
-# Note: The LUAJIT_LDFLAGS is a bit of a hack, since LuaJIT on OmniOS needs
-#       the -m64 flag. See configure.ac.
-#
-all-local:
-       @echo "Making all in luajit"
-       test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/"
-       cd luajit && $(MAKE) $(AM_MAKEFLAGS) \
-               BUILDMODE="static" \
-               PREFIX="$(prefix)" \
-               CC="$(CC)" \
-               CFLAGS="$(LUAJIT_CFLAGS)" \
-               XCFLAGS="" \
-               LDFLAGS="$(LUAJIT_LDFLAGS)" \
-               Q=$(luajit__v_$(V))
-
-clean-local:
-       test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && $(MAKE) clean)
-       test "$(top_srcdir)" = "$(top_builddir)" || rm -rf "$(top_builddir)/$(subdir)/luajit"

diff --git a/lib/Makefile.in b/lib/Makefile.in
index f7172e745e06775ecbeb225b3cd7271cd0af3000..c1a98b776546fc7fed91241c0bdd72e29273b9c0 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -307,9 +307,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@
@@ -915,29 +915,6 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 
-# Some special hacks around building the luajit.
-#
-#  - Copy the luajit source tree if we're doing out-of-source builds
-#  - Upon clean, remove the luajit tree from the out-of-source build tree
-#
-# Note: The LUAJIT_LDFLAGS is a bit of a hack, since LuaJIT on OmniOS needs
-#       the -m64 flag. See configure.ac.
-#
-all-local:
-       @echo "Making all in luajit"
-       test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/"
-       cd luajit && $(MAKE) $(AM_MAKEFLAGS) \
-               BUILDMODE="static" \
-               PREFIX="$(prefix)" \
-               CC="$(CC)" \
-               CFLAGS="$(LUAJIT_CFLAGS)" \
-               XCFLAGS="" \
-               LDFLAGS="$(LUAJIT_LDFLAGS)" \
-               Q=$(luajit__v_$(V))
-
-clean-local:
-       test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && $(MAKE) clean)
-       test "$(top_srcdir)" = "$(top_builddir)" || rm -rf "$(top_builddir)/$(subdir)/luajit"
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/lib/bindings/Makefile.am b/lib/bindings/Makefile.am
index b4a4737cec5f830d5e3e563b8fab9f1226b0af32..b4a320fa7ac7be7ebdebdf0dcec1b17447daf41d 100644 (file)
--- a/lib/bindings/Makefile.am
+++ b/lib/bindings/Makefile.am
@@ -19,9 +19,10 @@
 include $(top_srcdir)/build/tidy.mk
 
 AM_CPPFLAGS += \
-  $(LUAJIT_CPPFLAGS) \
+  $(LUA_CPPFLAGS) \
   -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records
+  -I$(abs_top_srcdir)/lib/records \
+  $(LUA_CPPFLAGS)
 
 noinst_LTLIBRARIES = libbindings.la
 

diff --git a/lib/bindings/Makefile.in b/lib/bindings/Makefile.in
index 7e3c9505e2a5d3bf44ce91b0cfb38df641ad3423..0314c3e771d8c59ddd9530ff28b37820834485b0 100644 (file)
--- a/lib/bindings/Makefile.in
+++ b/lib/bindings/Makefile.in
@@ -244,7 +244,7 @@ pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ $(LUAJIT_CPPFLAGS) -I$(abs_top_srcdir)/lib \
+AM_CPPFLAGS = @AM_CPPFLAGS@ $(LUA_CPPFLAGS) -I$(abs_top_srcdir)/lib \
        -I$(abs_top_srcdir)/lib/records
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -329,9 +329,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/lib/perl/Makefile.in b/lib/perl/Makefile.in
index 9ef2cd0603074de76fe54edea4adbc7508780ac9..915b885778b46b0bde9528dd2647a1aeccb352ac 100644 (file)
--- a/lib/perl/Makefile.in
+++ b/lib/perl/Makefile.in
@@ -244,9 +244,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/lib/records/Makefile.in b/lib/records/Makefile.in
index 6ad977cba4ede6a9e1c5270868ce98465dc1ce2d..8c0a883fb91963d5213c17a389964dc04aadf894 100644 (file)
--- a/lib/records/Makefile.in
+++ b/lib/records/Makefile.in
@@ -352,9 +352,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/lib/ts/Makefile.in b/lib/ts/Makefile.in
index f28bec2480220aea763e0128ea7367fc4879af09..f4942fe7df94c48803f18d653fab239c32d865ad 100644 (file)
--- a/lib/ts/Makefile.in
+++ b/lib/ts/Makefile.in
@@ -624,9 +624,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/lib/tsconfig/Makefile.in b/lib/tsconfig/Makefile.in
index 372f783f3323517c2d18e8a13504e8b292c70ebc..b368c3c6ba227e665dafd35bc3abaf5115b998f3 100644 (file)
--- a/lib/tsconfig/Makefile.in
+++ b/lib/tsconfig/Makefile.in
@@ -401,9 +401,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/lib/wccp/Makefile.in b/lib/wccp/Makefile.in
index 6600175b481873645cf9ae6418b9b24d4f5b99cc..62435820d5771d0a5ded4223fb22f8297129e84d 100644 (file)
--- a/lib/wccp/Makefile.in
+++ b/lib/wccp/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@